CSTACKEX-259: downloaded state check is not required

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -35,7 +35,6 @@
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.VMTemplateStoragePoolVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.dao.SnapshotDao;
 import com.cloud.storage.dao.SnapshotDetailsDao;
 import com.cloud.storage.dao.SnapshotDetailsVO;
@@ -950,8 +949,8 @@ public long getBytesRequiredForTemplate(TemplateInfo templateInfo, StoragePool s
         if (templateInfo == null || storagePool == null) {
             return 0;
         }
-        // template_spool_ref is inserted in Allocated/NOT_DOWNLOADED before the cache exists;
-        // only skip reservation when the template is truly cached on this pool.
+        // template_spool_ref is inserted in Allocated before the cache exists;
+        // only skip reservation when the template is Ready and has a backend identity.
         VMTemplateStoragePoolVO templatePoolRef =
                 vmTemplatePoolDao.findByPoolTemplate(storagePool.getId(), templateInfo.getId(), null);
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(storagePool.getId());
@@ -963,15 +962,13 @@ public long getBytesRequiredForTemplate(TemplateInfo templateInfo, StoragePool s
 
     /**
      * Returns true when the primary template cache is present and usable for clone/deploy.
-     * A spool_ref row alone is not enough: CloudStack creates it before the LUN/file exists.
+     * A spool_ref row alone is not enough: CloudStack creates it in Allocated before the LUN/file exists.
+     * Ready is sufficient; downloadState is set alongside Ready on the managed-cache success path.
      */
     private boolean isTemplateCachedOnPool(VMTemplateStoragePoolVO templatePoolRef, Map<String, String> details) {
         if (templatePoolRef == null) {
             return false;
         }
-        if (templatePoolRef.getDownloadState() != VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
-            return false;
-        }
         if (templatePoolRef.getState() != ObjectInDataStoreStateMachine.State.Ready) {
             return false;
         }

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java

@@ -25,7 +25,6 @@
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.Storage;
 import com.cloud.storage.VMTemplateStoragePoolVO;
-import com.cloud.storage.VMTemplateStorageResourceAssoc;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.VolumeDetailVO;
 import com.cloud.storage.dao.VMTemplatePoolDao;
@@ -681,7 +680,6 @@ void testGetBytesRequiredForTemplate_AlreadyCached_ReturnsZero() {
         when(templateInfo.getId()).thenReturn(50L);
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
         when(vmTemplatePoolDao.findByPoolTemplate(1L, 50L, null)).thenReturn(templatePoolRef);
-        when(templatePoolRef.getDownloadState()).thenReturn(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
         when(templatePoolRef.getState()).thenReturn(ObjectInDataStoreStateMachine.State.Ready);
         when(templatePoolRef.getLocalDownloadPath()).thenReturn("template-lun-uuid");
 
@@ -700,25 +698,24 @@ void testGetBytesRequiredForTemplate_NotCached_ReturnsVirtualSize() {
     }
 
     @Test
-    void testGetBytesRequiredForTemplate_SpoolRefNotDownloaded_ReturnsVirtualSize() {
+    void testGetBytesRequiredForTemplate_SpoolRefNotReady_ReturnsVirtualSize() {
         when(storagePool.getId()).thenReturn(1L);
         when(templateInfo.getId()).thenReturn(50L);
         when(templateInfo.getSize()).thenReturn(5368709120L);
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
         when(vmTemplatePoolDao.findByPoolTemplate(1L, 50L, null)).thenReturn(templatePoolRef);
-        when(templatePoolRef.getDownloadState()).thenReturn(VMTemplateStorageResourceAssoc.Status.NOT_DOWNLOADED);
+        when(templatePoolRef.getState()).thenReturn(ObjectInDataStoreStateMachine.State.Allocated);
 
         assertEquals(5368709120L, driver.getBytesRequiredForTemplate(templateInfo, storagePool));
     }
 
     @Test
-    void testGetBytesRequiredForTemplate_DownloadedWithoutBackendIdentity_ReturnsVirtualSize() {
+    void testGetBytesRequiredForTemplate_ReadyWithoutBackendIdentity_ReturnsVirtualSize() {
         when(storagePool.getId()).thenReturn(1L);
         when(templateInfo.getId()).thenReturn(50L);
         when(templateInfo.getSize()).thenReturn(5368709120L);
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
         when(vmTemplatePoolDao.findByPoolTemplate(1L, 50L, null)).thenReturn(templatePoolRef);
-        when(templatePoolRef.getDownloadState()).thenReturn(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
         when(templatePoolRef.getState()).thenReturn(ObjectInDataStoreStateMachine.State.Ready);
         when(templatePoolRef.getLocalDownloadPath()).thenReturn(null);
 
@@ -732,7 +729,6 @@ void testGetBytesRequiredForTemplate_NfsCached_ReturnsZero() {
         when(templateInfo.getId()).thenReturn(50L);
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
         when(vmTemplatePoolDao.findByPoolTemplate(1L, 50L, null)).thenReturn(templatePoolRef);
-        when(templatePoolRef.getDownloadState()).thenReturn(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
         when(templatePoolRef.getState()).thenReturn(ObjectInDataStoreStateMachine.State.Ready);
         when(templatePoolRef.getInstallPath()).thenReturn("/mnt/pool/template-uuid");