feature/CSTACKEX-122: Comments resolution

Author: Srivastava, Piyush

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

@@ -1320,8 +1320,7 @@ private void createManagedVolumeCopyTemplateAsync(VolumeInfo volumeInfo, Primary
             details.put(PrimaryDataStore.STORAGE_HOST, primaryDataStore.getHostAddress());
             details.put(PrimaryDataStore.STORAGE_PORT, String.valueOf(primaryDataStore.getPort()));
             // for managed storage, the storage repository (XenServer) or datastore (ESX) name is based off of the iScsiName property of a volume
-            String managedStoreTarget = volumeInfo.get_iScsiName() != null ? volumeInfo.get_iScsiName() : volumeInfo.getUuid();
-            details.put(PrimaryDataStore.MANAGED_STORE_TARGET, managedStoreTarget);
+            details.put(PrimaryDataStore.MANAGED_STORE_TARGET, volumeInfo.get_iScsiName());
             details.put(PrimaryDataStore.MANAGED_STORE_TARGET_ROOT_VOLUME, volumeInfo.getName());
             details.put(PrimaryDataStore.VOLUME_SIZE, String.valueOf(volumeInfo.getSize()));
             details.put(StorageManager.STORAGE_POOL_DISK_WAIT.toString(), String.valueOf(StorageManager.STORAGE_POOL_DISK_WAIT.valueIn(primaryDataStore.getId())));
@@ -1339,10 +1338,10 @@ private void createManagedVolumeCopyTemplateAsync(VolumeInfo volumeInfo, Primary
 
             grantAccess(volumeInfo, destHost, primaryDataStore);
             volumeInfo = volFactory.getVolume(volumeInfo.getId(), primaryDataStore);
-            managedStoreTarget = volumeInfo.get_iScsiName() != null ? volumeInfo.get_iScsiName() : volumeInfo.getUuid();
+            // For Netapp ONTAP iscsiName or Lun path  is available only after grantAccess
+            String managedStoreTarget = volumeInfo.get_iScsiName() != null ? volumeInfo.get_iScsiName() : volumeInfo.getUuid();
             details.put(PrimaryDataStore.MANAGED_STORE_TARGET, managedStoreTarget);
             primaryDataStore.setDetails(details);
-
             // Update destTemplateInfo with the iSCSI path from volumeInfo
             if (destTemplateInfo instanceof TemplateObject) {
                 ((TemplateObject)destTemplateInfo).setInstallPath(volumeInfo.getPath());

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

@@ -448,7 +448,6 @@ void testRevokeAccess_NFSVolume_SkipsRevoke() {
         when(storagePoolDao.findById(1L)).thenReturn(storagePool);
         when(storagePool.getId()).thenReturn(1L);
         when(storagePool.getScope()).thenReturn(ScopeType.CLUSTER);
-        when(storagePool.getUuid()).thenReturn("pool-uuid-123");
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
         when(host.getName()).thenReturn("host1");
 
@@ -478,7 +477,6 @@ void testRevokeAccess_ISCSIVolume_Success() {
         when(storagePoolDao.findById(1L)).thenReturn(storagePool);
         when(storagePool.getId()).thenReturn(1L);
         when(storagePool.getScope()).thenReturn(ScopeType.CLUSTER);
-        when(storagePool.getUuid()).thenReturn("pool-uuid-123");
         when(storagePoolDetailsDao.listDetailsKeyPairs(1L)).thenReturn(storagePoolDetails);
 
         when(host.getStorageUrl()).thenReturn("iqn.1993-08.org.debian:01:host1");