Merge branch 'shixin-ZCF-1365@@2' into 'feature-5.5.12-zns'

<fix>[zns]: add ZnsUuidHelper utility for UUID format conversion

See merge request zstackio/zstack!9467

Author: ruansteve

build/pom.xml

@@ -636,6 +636,11 @@
                     <artifactId>ovn</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.zstack</groupId>
+                    <artifactId>zns</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.zstack</groupId>
                     <artifactId>observabilityServer</artifactId>

plugin/sdnController/src/main/java/org/zstack/sdnController/SdnControllerManagerImpl.java

@@ -921,7 +921,7 @@ public void beforeAllocateVmNic(VmNicInventory nic, VmInstanceSpec spec, Complet
         String controllerUuid = L2NetworkSystemTags.L2_NETWORK_SDN_CONTROLLER_UUID.getTokenByResourceUuid(
                 l2VO.getUuid(), L2NetworkSystemTags.L2_NETWORK_SDN_CONTROLLER_UUID_TOKEN);
         if (controllerUuid == null) {
-            completion.success();
+            completion.fail(operr(ORG_ZSTACK_SDNCONTROLLER_10006, "sdn l2 network[uuid:%s] is not attached controller", l2VO.getUuid()));
             return;
         }
 
@@ -947,7 +947,7 @@ public void afterReleaseVmNic(VmNicInventory nic, Completion completion) {
         String controllerUuid = L2NetworkSystemTags.L2_NETWORK_SDN_CONTROLLER_UUID.getTokenByResourceUuid(
                 l2VO.getUuid(), L2NetworkSystemTags.L2_NETWORK_SDN_CONTROLLER_UUID_TOKEN);
         if (controllerUuid == null) {
-            completion.success();
+            completion.fail(operr(ORG_ZSTACK_SDNCONTROLLER_10006, "sdn l2 network[uuid:%s] is not attached controller", l2VO.getUuid()));
             return;
         }