<fix>[migration]: precheck qemu/libvirt/cpumodel/hostept for storage migration.

precheck qemu/libvirt/cpumodel/hostept for storage migration.

Resolves/Related: ZSTAC-75332

Change-Id: I6170776d786a787777797078737a68737a636772

Author: shan.wu

compute/src/main/java/org/zstack/compute/allocator/AttachedVolumePrimaryStorageAllocatorFlow.java

@@ -31,7 +31,7 @@ public class AttachedVolumePrimaryStorageAllocatorFlow extends AbstractHostAlloc
     public void allocate() {
         throwExceptionIfIAmTheFirstFlow();
 
-        if (VmOperation.NewCreate.toString().equals(spec.getVmOperation())) {
+        if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) {
             next(candidates);
             return;
         }

compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java

@@ -141,11 +141,11 @@ private List<HostVO> filterHostHavingAccessiblePrimaryStorage(List<String> huuid
     private List<HostVO> allocateFromCandidates() {
         List<String> huuids = getHostUuidsFromCandidates();
         Set<String> requiredPsUuids = spec.getRequiredPrimaryStorageUuids();
-        if (!VmOperation.NewCreate.toString().equals(spec.getVmOperation())) {
-            return filterHostHavingAccessiblePrimaryStorage(huuids, spec);
-        } else {
+        if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) {
             huuids = filterHostHavingAccessiblePrimaryStorage(huuids, spec)
                     .stream().map(ResourceVO::getUuid).collect(Collectors.toList());
+        } else {
+            return filterHostHavingAccessiblePrimaryStorage(huuids, spec);
         }
 
         if (huuids.isEmpty()) {

header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java

@@ -59,6 +59,7 @@ enum VmOperation {
         Reboot,
         Destroy,
         Migrate,
+        MigrateStorage,
         AttachVolume,
         AttachNic,
         ChangeNicNetwork,

plugin/kvm/src/main/java/org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java

@@ -5,6 +5,7 @@
 import org.zstack.header.allocator.HostAllocatorSpec;
 import org.zstack.header.host.HostVO;
 import org.zstack.header.vm.VmInstanceConstant;
+import org.zstack.header.vm.VmInstanceConstant.VmOperation;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
 
@@ -171,7 +172,7 @@ public List<HostVO> filterHostCandidates(List<HostVO> candidates, HostAllocatorS
             return candidates;
         }
 
-        if (!VmInstanceConstant.VmOperation.Migrate.toString().equals(spec.getVmOperation())) {
+        if (!VmOperation.Migrate.toString().equals(spec.getVmOperation()) && !VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) {
             return candidates;
         }
 

plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageAllocatorFactory.java

@@ -107,7 +107,7 @@ public boolean stop() {
     public List<HostVO> filterHostCandidates(List<HostVO> candidates, HostAllocatorSpec spec) {
         long reservedCapacity = SizeUtils.sizeStringToBytes(PrimaryStorageGlobalConfig.RESERVED_CAPACITY.value());
 
-        if (VmOperation.NewCreate.toString().equals(spec.getVmOperation())) {
+        if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) {
             List<String> huuids = getNeedCheckHostLocalStorageList(candidates, spec);
             if (huuids.isEmpty()) {
                 return candidates;

test/src/test/groovy/org/zstack/test/integration/kvm/host/MigrateVmCheckKvmPropertyCase.groovy

@@ -83,6 +83,7 @@ class MigrateVmCheckKvmPropertyCase extends SubCase {
                     }
 
                     attachPrimaryStorage("nfs")
+                    attachPrimaryStorage("nfs2")
                     attachL2Network("l2")
                 }
 
@@ -103,6 +104,7 @@ class MigrateVmCheckKvmPropertyCase extends SubCase {
                     }
 
                     attachPrimaryStorage("nfs")
+                    attachPrimaryStorage("nfs2")
                     attachL2Network("l2")
                 }
 
@@ -111,6 +113,11 @@ class MigrateVmCheckKvmPropertyCase extends SubCase {
                     url = "localhost:/nfs_ps"
                 }
 
+                nfsPrimaryStorage {
+                    name = "nfs2"
+                    url = "127.0.0.6:/nfs_ps"
+                }
+
                 l2NoVlanNetwork {
                     name = "l2"
                     physicalInterface = "eth0"
@@ -199,11 +206,34 @@ class MigrateVmCheckKvmPropertyCase extends SubCase {
         confirmMigrateAvailable(vm1)
         confirmMigrateAvailable(vm2)
 
+        primaryStorageMigrateVm {
+            vmInstanceUuid = vm1.uuid
+            dstPrimaryStorageUuid = env.inventoryByName("nfs2").uuid
+            withSnapshots = false
+        }
+
+        cleanUpTrashOnPrimaryStorage {
+            uuid = env.inventoryByName("nfs").uuid
+        }
+
+        primaryStorageMigrateVm {
+            vmInstanceUuid = vm1.uuid
+            dstPrimaryStorageUuid = env.inventoryByName("nfs").uuid
+            withSnapshots = false
+        }
+
         // change qemu-img version to different value, both vms expected can not be migrated
         KVMSystemTags.QEMU_IMG_VERSION.updateTagByToken(host2.uuid, KVMSystemTags.QEMU_IMG_VERSION_TOKEN, mockWrongValue(qemuImgVersion))
         confirmMigrateUnavailable(vm1)
         confirmMigrateUnavailable(vm2)
 
+        expectError {
+            primaryStorageMigrateVm {
+                vmInstanceUuid = vm1.uuid
+                dstPrimaryStorageUuid = env.inventoryByName("nfs2").uuid
+                withSnapshots = false
+            }
+        }
         // change qemu-img version back confirm can migrate again
         KVMSystemTags.QEMU_IMG_VERSION.updateTagByToken(host2.uuid, KVMSystemTags.QEMU_IMG_VERSION_TOKEN, qemuImgVersion)
         confirmMigrateAvailable(vm1)