Skip to content

Commit 342506d

Browse files
Gupta, SuryaGupta, Surya
authored andcommitted
CSTACKEX-98 Checking Map value for protocol
1 parent 3d82bff commit 342506d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ public DataStore initialize(Map<String, Object> dsInfos) {
8787
throw new CloudRuntimeException("Datastore info map is null, cannot create primary storage");
8888
}
8989
s_logger.info("initialize::::::::::::::: dsInfos " + dsInfos.toString());
90-
Map<String, String> details = (Map<String, String>) dsInfos.get("details");
91-
s_logger.info("initialize details::::::::::::::: details " + details.toString());
9290
String url = (String) dsInfos.get("url");
9391
Long zoneId = (Long) dsInfos.get("zoneId");
9492
Long podId = (Long) dsInfos.get("podId");
@@ -105,7 +103,8 @@ public DataStore initialize(Map<String, Object> dsInfos) {
105103
s_logger.debug("Received capacityBytes from UI: " + capacityBytes);
106104

107105
// Additional details requested for ONTAP primary storage pool creation
108-
//Map<String, String> details = (Map<String, String>) dsInfos.get("details");
106+
Map<String, String> details = (Map<String, String>) dsInfos.get("details");
107+
s_logger.info("initialize details::::::::::::::: details " + details.toString());
109108

110109
// Validate and set capacity
111110
if (capacityBytes == null || capacityBytes <= 0) {

ui/src/views/infra/AddPrimaryStorage.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,11 @@ export default {
932932
params['details[0].api_password'] = values.flashArrayPassword
933933
url = values.flashArrayURL
934934
} else if (values.provider === 'ONTAP') {
935-
params['details[0].username'] = values.ontapUsername
936-
params['details[0].password'] = values.ontapPassword
937-
params['details[0].svm_name'] = values.ontapSvmName
935+
params['details[0].ontap_storageArrayIP'] = values.ontapIP
936+
params['details[0].ontap_username'] = values.ontapUsername
937+
params['details[0].ontap_password'] = values.ontapPassword
938+
params['details[0].ontap_svmName'] = values.ontapSvmName
939+
params['details[0].ontap_protocol'] = values.protocol
938940
values.managed = true
939941
url = this.ontapURL(values.ontapIP)
940942
}

0 commit comments

Comments
 (0)