Merge branch 'fix-npe-on-list-disk-offering-with-vmid' into '4.20.0.0-scclouds'

Correção de NPE ao listar _disk offerings_ utilizando o parâmetro `virtualmachineid`

Closes #3226

See merge request scclouds/scclouds!1345

Author: Daniel Augusto Veronezi Salvador

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java

@@ -32,6 +32,8 @@
 import com.cloud.exception.StorageUnavailableException;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.StoragePoolStatus;
+import com.cloud.storage.VolumeVO;
+import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
@@ -412,4 +414,20 @@ protected void logEndOfSearch(List<StoragePool> storagePoolList) {
                 Arrays.toString(storagePoolList.toArray()));
     }
 
+    protected long getAccountIdFromProfile(DiskProfile diskProfile, VirtualMachineProfile virtualMachineProfile) {
+        long volumeId = diskProfile.getVolumeId();
+        VolumeVO volumeVo = volumeDao.findById(volumeId);
+
+        if (volumeVo != null) {
+            return volumeVo.getAccountId();
+        }
+
+        logger.debug("Volume [{}] not found. We will try to get the account ID from the virtual machine profile.", volumeId, virtualMachineProfile.getUuid());
+        if (virtualMachineProfile.getVirtualMachine() != null) {
+            return virtualMachineProfile.getVirtualMachine().getAccountId();
+        }
+
+        logger.debug("No virtual machine or volume were found. The calling account will be inferred as the volume owner.");
+        return CallContext.current().getCallingAccountId();
+    }
 }

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java

@@ -25,7 +25,6 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.storage.VolumeApiServiceImpl;
-import com.cloud.storage.VolumeVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.springframework.stereotype.Component;
 
@@ -78,10 +77,7 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
             logDisabledStoragePools(dcId, podId, clusterId, ScopeType.CLUSTER);
         }
 
-        long volumeId = dskCh.getVolumeId();
-        VolumeVO volumeVo = volumeDao.findById(volumeId);
-
-        long accountId = volumeVo.getAccountId();
+        long accountId = getAccountIdFromProfile(dskCh, vmProfile);
 
         List<StoragePoolVO> pools = storagePoolDao.findPoolsByTags(dcId, podId, clusterId, dskCh.getTags(), true, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value());
         pools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(dcId, podId, clusterId, ScopeType.CLUSTER, List.of(dskCh.getTags()), accountId));

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java

@@ -24,7 +24,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.storage.VolumeVO;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.springframework.stereotype.Component;
@@ -100,10 +99,7 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
                 return null;
             }
 
-            long volumeId = dskCh.getVolumeId();
-            VolumeVO volumeVo = volumeDao.findById(volumeId);
-
-            long accountId = volumeVo.getAccountId();
+            long accountId = getAccountIdFromProfile(dskCh, vmProfile);
 
             List<StoragePoolVO> availablePools =
                 storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), dskCh.getTags(), true, keyword);

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java

@@ -24,7 +24,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.storage.VolumeVO;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -61,10 +60,7 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
             logDisabledStoragePools(plan.getDataCenterId(), null, null, ScopeType.ZONE);
         }
 
-        long volumeId = dskCh.getVolumeId();
-        VolumeVO volumeVo = volumeDao.findById(volumeId);
-
-        long accountId = volumeVo.getAccountId();
+        long accountId = getAccountIdFromProfile(dskCh, vmProfile);
 
         List<StoragePool> suitablePools = new ArrayList<>();
         List<StoragePoolVO> storagePools = storagePoolDao.findZoneWideStoragePoolsByTags(plan.getDataCenterId(), dskCh.getTags(), true);