Skip to content

Commit 3d82bff

Browse files
Gupta, SuryaGupta, Surya
authored andcommitted
CSTACKEX-98 Checking Map value
1 parent 421666c commit 3d82bff

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ 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());
9092
String url = (String) dsInfos.get("url");
9193
Long zoneId = (Long) dsInfos.get("zoneId");
9294
Long podId = (Long) dsInfos.get("podId");
@@ -103,8 +105,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
103105
s_logger.debug("Received capacityBytes from UI: " + capacityBytes);
104106

105107
// Additional details requested for ONTAP primary storage pool creation
106-
@SuppressWarnings("unchecked")
107-
Map<String, String> details = (Map<String, String>) dsInfos.get("details");
108+
//Map<String, String> details = (Map<String, String>) dsInfos.get("details");
108109

109110
// Validate and set capacity
110111
if (capacityBytes == null || capacityBytes <= 0) {

ui/src/views/infra/AddPrimaryStorage.vue

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,12 @@ export default {
931931
params['details[0].api_username'] = values.flashArrayUsername
932932
params['details[0].api_password'] = values.flashArrayPassword
933933
url = values.flashArrayURL
934+
} 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
938+
values.managed = true
939+
url = this.ontapURL(values.ontapIP)
934940
}
935941
936942
if (values.provider === 'Linstor' || values.protocol === 'Linstor') {
@@ -941,12 +947,7 @@ export default {
941947
params.capacityIops = values.capacityIops.split(',').join('')
942948
}
943949
}
944-
console.log('URL value is ::: ', url)
945-
if (values.provider === 'ONTAP') {
946-
console.log('URL value is getting set ::: ', url)
947-
url = this.ontapURL(values.ontapIP)
948-
}
949-
console.log('URL value is now ::: ', url)
950+
950951
params.url = url
951952
if (values.provider !== 'DefaultPrimary' && values.provider !== 'PowerFlex') {
952953
if (values.managed) {
@@ -970,10 +971,6 @@ export default {
970971
values.powerflexGatewayPassword, values.powerflexStoragePool)
971972
}
972973
973-
if (values.provider === 'ONTAP') {
974-
params.url = this.ontapURL(values.ontapIP)
975-
}
976-
977974
if (this.selectedTags.length > 0) {
978975
params.tags = this.selectedTags.join()
979976
}

0 commit comments

Comments
 (0)