Skip to content

Commit 3a7d2f8

Browse files
Gupta, SuryaGupta, Surya
authored andcommitted
CSTACKEX-46 Testing: Resolve fetch Storage details issue
1 parent 65fa626 commit 3a7d2f8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
270270
// TODO- need to check if no host to connect then throw exception or just continue
271271
logger.debug("attachCluster: Eligible Up and Enabled hosts: {} in cluster {}", hostsToConnect, primaryStore.getClusterId());
272272

273-
Map<String, String> details = primaryStore.getDetails();
273+
Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(storagePool.getId());
274274
StorageStrategy strategy = Utility.getStrategyByStoragePoolDetails(details);
275275
ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
276276
//TODO- Check if we have to handle heterogeneous host within the cluster

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public Volume getStorageVolume(Volume volume)
310310

311311
/**
312312
* Method encapsulates the behavior based on the opted protocol in subclasses
313-
@@ -306,22 +306,22 @@ public Volume getStorageVolume(Volume volume)
313+
@@ -306,22 +306,22 @@ public AccessGroup getAccessGroup(Map<String, String> values)
314314
* getNameSpace for Nvme/TCP and Nvme/FC protocols
315315
* @param values
316316
*/

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public CloudStackVolume getCloudStackVolume(Map<String, String> values) {
106106
String svmName = values.get(Constants.SVM_DOT_NAME);
107107
String lunName = values.get(Constants.NAME);
108108
if(svmName == null || lunName == null || svmName.isEmpty() || lunName.isEmpty()) {
109-
s_logger.error("getCloudStackVolume: get Lun failed. Invalid svm:{} or igroup name: {}", svmName, lunName);
109+
s_logger.error("getCloudStackVolume: get Lun failed. Invalid svm:{} or Lun name: {}", svmName, lunName);
110110
throw new CloudRuntimeException("getCloudStackVolume : Failed to get Lun, invalid request");
111111
}
112112
try {

0 commit comments

Comments
 (0)