More ideas for PR 2761

Author: Mike Tutkowski

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

@@ -2320,7 +2320,7 @@ private void buildMapUsingUserInformation(VirtualMachineProfile profile, Host ta
             StoragePoolVO targetPool = _storagePoolDao.findById(poolId);
             StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId());
 
-            executeManagedStorageChecksWhenTargetStoragePoolProvided(currentPool, targetPool, volume);
+            executeManagedStorageChecks(currentPool, targetPool, volume);
             if (_poolHostDao.findByPoolHost(targetPool.getId(), targetHost.getId()) == null) {
                 throw new CloudRuntimeException(
                         String.format("Cannot migrate the volume [%s] to the storage pool [%s] while migrating VM [%s] to target host [%s]. The host does not have access to the storage pool entered.",
@@ -2341,12 +2341,22 @@ private void createStoragePoolMappingsForVolumes(VirtualMachineProfile profile,
         for (Volume volume : allVolumes) {
             StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId());
 
-            executeManagedStorageChecksWhenTargetStoragePoolNotProvided(targetHost, currentPool, volume);
-            if (ScopeType.HOST.equals(currentPool.getScope()) || isStorageCrossClusterMigration(targetHost, currentPool)) {
-                createVolumeToStoragePoolMappingIfPossible(profile, targetHost, volumeToPoolObjectMap, volume, currentPool);
-            } else {
+            if (currentPool.isManaged()) {
+                if (_poolHostDao.findByPoolHost(currentPool.getId(), targetHost.getId()) == null) {
+                    throw new CloudRuntimeException(
+                            String.format("Cannot migrate the volume [%s] to the storage pool [%s] while migrating VM [%s] to target host [%s]. The host does not have access " +
+                                    "to the storage pool entered.", volume.getUuid(), currentPool.getUuid(), profile.getUuid(), targetHost.getUuid()));
+                }
+
                 volumeToPoolObjectMap.put(volume, currentPool);
             }
+            else {
+                if (ScopeType.HOST.equals(currentPool.getScope()) || isStorageCrossClusterMigration(targetHost, currentPool)) {
+                    createVolumeToStoragePoolMappingIfPossible(profile, targetHost, volumeToPoolObjectMap, volume, currentPool);
+                } else {
+                    volumeToPoolObjectMap.put(volume, currentPool);
+                }
+            }
         }
     }
 
@@ -2357,7 +2367,7 @@ private void createStoragePoolMappingsForVolumes(VirtualMachineProfile profile,
      *      <li> Cross cluster migration with cluster-wide storage pool. Volumes in managed storage cannot be migrated out of their current pool. Therefore, an exception is thrown.
      *  </ul>
      */
-    protected void executeManagedStorageChecksWhenTargetStoragePoolProvided(StoragePoolVO currentPool, StoragePoolVO targetPool, Volume volume) {
+    protected void executeManagedStorageChecks(StoragePoolVO currentPool, StoragePoolVO targetPool, Volume volume) {
         if (!currentPool.isManaged()) {
             return;
         }
@@ -2368,17 +2378,6 @@ protected void executeManagedStorageChecksWhenTargetStoragePoolProvided(StorageP
                 "[volumeId=%s, currentStoragePoolId=%s, targetStoragePoolId=%s].", volume.getUuid(), currentPool.getUuid(), targetPool.getUuid()));
     }
 
-    protected void executeManagedStorageChecksWhenTargetStoragePoolNotProvided(Host targetHost, StoragePoolVO currentPool, Volume volume) {
-        if (!currentPool.isManaged()) {
-            return;
-        }
-        if (ScopeType.ZONE.equals(currentPool.getScope())) {
-            return;
-        }
-        throw new CloudRuntimeException(String.format("Currently, you can only 'migrate' a volume on managed storage if its storage pool is zone wide " +
-                "[volumeId=%s, storageId=%s, targetHostId=%s].", volume.getUuid(), currentPool.getUuid(), targetHost.getUuid()));
-    }
-
     /**
      *  Return true if the VM migration is a cross cluster migration. To execute that, we check if the volume current storage pool cluster is different from the target host cluster.
      */