Skip to content

Commit 98dd578

Browse files
Srivastava, PiyushSrivastava, Piyush
authored andcommitted
Revert "feature/CSTACKEX-211: add provider check for copycommand"
This reverts commit 1e9de6c.
1 parent 1e9de6c commit 98dd578

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
4444
import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService;
4545
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
46-
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
4746
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
4847
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreCapabilities;
4948
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver;
@@ -1342,13 +1341,11 @@ private void createManagedVolumeCopyTemplateAsync(VolumeInfo volumeInfo, Primary
13421341
primaryDataStore.setDetails(details);
13431342

13441343
grantAccess(volumeInfo, destHost, primaryDataStore);
1345-
if (DataStoreProvider.ONTAP_PLUGIN_NAME.equals(primaryDataStore.getStorageProviderName())) {
1346-
volumeInfo = volFactory.getVolume(volumeInfo.getId(), primaryDataStore);
1347-
// For Netapp ONTAP iscsiName or Lun path is available only after grantAccess
1348-
String managedStoreTarget = ObjectUtils.defaultIfNull(volumeInfo.get_iScsiName(), volumeInfo.getUuid());
1349-
details.put(PrimaryDataStore.MANAGED_STORE_TARGET, managedStoreTarget);
1350-
primaryDataStore.setDetails(details);
1351-
}
1344+
volumeInfo = volFactory.getVolume(volumeInfo.getId(), primaryDataStore);
1345+
// For Netapp ONTAP iscsiName or Lun path is available only after grantAccess
1346+
String managedStoreTarget = ObjectUtils.defaultIfNull(volumeInfo.get_iScsiName(), volumeInfo.getUuid());
1347+
details.put(PrimaryDataStore.MANAGED_STORE_TARGET, managedStoreTarget);
1348+
primaryDataStore.setDetails(details);
13521349

13531350
try {
13541351
motionSrv.copyAsync(srcTemplateInfo, destTemplateInfo, destHost, caller);

0 commit comments

Comments
 (0)