Honor migrate.vm.across.clusters when migrate vm without destination

Author: ustcweizhou

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java

@@ -26,15 +26,18 @@
 
 import com.cloud.agent.api.to.NicTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
 import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.deploy.DeploymentPlanner.ExcludeList;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.host.Host;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network;
 import com.cloud.offering.DiskOffering;
@@ -257,4 +260,6 @@ static String getHypervisorHostname(String name) {
     UserVm restoreVirtualMachine(long vmId, Long newTemplateId) throws ResourceUnavailableException, InsufficientCapacityException;
 
     boolean checkIfVmHasClusterWideVolumes(Long vmId);
+
+    DataCenterDeployment getMigrationDeployment(Long vmId, Host host, Long poolId, ExcludeList excludes);
 }

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3226,7 +3226,8 @@ public boolean checkIfVmHasClusterWideVolumes(Long vmId) {
 
     }
 
-    private DataCenterDeployment getMigrationDeployment(final Long vmId, final Host host, final Long poolId, final ExcludeList excludes) {
+    @Override
+    public DataCenterDeployment getMigrationDeployment(final Long vmId, final Host host, final Long poolId, final ExcludeList excludes) {
         if (MIGRATE_VM_ACROSS_CLUSTERS.value() && !checkIfVmHasClusterWideVolumes(vmId)) {
             s_logger.info("Searching for hosts in the zone for vm migration");
             List<Long> clustersToExcluded = _clusterDao.listAllClusters(host.getDataCenterId());

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -5796,9 +5796,9 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr
             final ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
             final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offering, null, null);
             final Host host = _hostDao.findById(srcHostId);
-            final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), null, null, null);
             ExcludeList excludes = new ExcludeList();
             excludes.addHost(srcHostId);
+            final DataCenterDeployment plan = _itMgr.getMigrationDeployment(vm.getId(), host, null, excludes);
             try {
                 dest = _planningMgr.planDeployment(profile, plan, excludes, null);
             } catch (final AffinityConflictException e2) {