<fix>[compute]: release sdn nics first

Release SDN NICs before removing VmNicVO.
Keep NIC deletion on release failure.

Resolves: ZCF-2047

Change-Id: I83f534ea19849467a728e3b6fb9ee2f6bb43bb7e
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: ruansteve

compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java

@@ -29,7 +29,6 @@
 import org.zstack.header.message.MessageReply;
 import org.zstack.header.network.l2.L2NetworkConstant;
 import org.zstack.header.network.l2.L2NetworkDetachStruct;
-import org.zstack.header.network.l2.L2NetworkVO;
 import org.zstack.header.network.l3.*;
 import org.zstack.header.vm.*;
 import org.zstack.header.vm.cdrom.VmCdRomInventory;
@@ -325,6 +324,7 @@ protected List<DetachNicFromVmMsg> handleDeletionForIpRange(List<VmDeletionStruc
             }
         }
 
+
         return msgs;
     }
 
@@ -529,7 +529,6 @@ public List<String> getEdgeNames() {
                 L3NetworkVO.class.getSimpleName(),
                 IpRangeVO.class.getSimpleName(),
                 PrimaryStorageVO.class.getSimpleName(),
-                L2NetworkVO.class.getSimpleName(),
                 InstanceOfferingVO.class.getSimpleName(),
                 AccountVO.class.getSimpleName());
     }

compute/src/main/java/org/zstack/compute/vm/VmDetachNicFlow.java

@@ -98,18 +98,18 @@ public void run(MessageReply reply) {
         }).run(new WhileDoneCompletion(trigger){
             @Override
             public void done(ErrorCodeList errorCodeList) {
-                dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
-
                 callReleaseSdnNics(java.util.Collections.singletonList(nic), new Completion(trigger) {
                     @Override
                     public void success() {
+                        dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
                         trigger.next();
                     }
 
                     @Override
                     public void fail(ErrorCode errorCode) {
                         logger.warn(String.format("releaseSdnNics failed for nic[uuid:%s]: %s, continue",
                                 nic.getUuid(), errorCode));
+                        dbf.removeByPrimaryKey(nic.getUuid(), VmNicVO.class);
                         trigger.next();
                     }
                 });

compute/src/main/java/org/zstack/compute/vm/VmReturnReleaseNicFlow.java

@@ -79,12 +79,13 @@ public void run(MessageReply reply) {
             @Override
             public void done(ErrorCodeList errorCodeList) {
                 List<VmNicInventory> releasedNics = new ArrayList<>();
+                List<VmNicVO> nicsToDelete = new ArrayList<>();
                 for (VmNicInventory nic : spec.getVmInventory().getVmNics()) {
                     VmNicVO vo = dbf.findByUuid(nic.getUuid(), VmNicVO.class);
                     if (VmInstanceConstant.USER_VM_TYPE.equals(spec.getVmInventory().getType())) {
                         VmInstanceDeletionPolicy deletionPolicy = getDeletionPolicy(spec, data);
                         if (deletionPolicy == VmInstanceDeletionPolicy.Direct) {
-                            dbf.remove(vo);
+                            nicsToDelete.add(vo);
                         } else {
                             vo.setUsedIpUuid(null);
                             vo.setIp(null);
@@ -93,20 +94,22 @@ public void done(ErrorCodeList errorCodeList) {
                             dbf.update(vo);
                         }
                     } else {
-                        dbf.remove(vo);
+                        nicsToDelete.add(vo);
                     }
                     releasedNics.add(nic);
                 }
 
                 callReleaseSdnNics(releasedNics, new Completion(chain) {
                     @Override
                     public void success() {
+                        nicsToDelete.forEach(dbf::remove);
                         chain.next();
                     }
 
                     @Override
                     public void fail(ErrorCode errorCode) {
                         logger.warn(String.format("releaseSdnNics failed: %s, continue anyway", errorCode));
+                        nicsToDelete.forEach(dbf::remove);
                         chain.next();
                     }
                 });