CSTACKEX-98 Made those fields as mandatory

Gupta, Surya · Gupta, Surya · commit adcab7116344 · 2026-02-06T14:42:51.000+05:30
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/OntapStorage.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/OntapStorage.java
@@ -24,20 +24,18 @@
 public class OntapStorage {
     private final String username;
     private final String password;
-    private final String managementLIF;
+    private final String storageIP;
     private final String svmName;
     private final Long size;
     private final ProtocolType protocolType;
-    private final Boolean isDisaggregated;
 
-    public OntapStorage(String username, String password, String managementLIF, String svmName, Long size, ProtocolType protocolType, Boolean isDisaggregated) {
+    public OntapStorage(String username, String password, String storageIP, String svmName, Long size, ProtocolType protocolType) {
         this.username = username;
         this.password = password;
-        this.managementLIF = managementLIF;
+        this.storageIP = storageIP;
         this.svmName = svmName;
         this.size = size;
         this.protocolType = protocolType;
-        this.isDisaggregated = isDisaggregated;
     }
 
     public String getUsername() {
@@ -48,8 +46,8 @@ public String getPassword() {
         return password;
     }
 
-    public String getManagementLIF() {
-        return managementLIF;
+    public String getStorageIP() {
+        return storageIP;
     }
 
     public String getSvmName() {
@@ -63,8 +61,4 @@ public Long getSize() {
     public ProtocolType getProtocol() {
         return protocolType;
     }
-
-    public Boolean getIsDisaggregated() {
-        return isDisaggregated;
-    }
 }
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
@@ -87,7 +87,6 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             throw new CloudRuntimeException("Datastore info map is null, cannot create primary storage");
         }
         s_logger.info("initialize::::::::::::::: dsInfos " + dsInfos.toString());
-        String url = (String) dsInfos.get("url");
         Long zoneId = (Long) dsInfos.get("zoneId");
         Long podId = (Long) dsInfos.get("podId");
         Long clusterId = (Long) dsInfos.get("clusterId");
@@ -157,23 +156,9 @@ public DataStore initialize(Map<String, Object> dsInfos) {
                 Constants.PASSWORD,
                 Constants.SVM_NAME,
                 Constants.PROTOCOL,
-                Constants.MANAGEMENT_LIF,
-                Constants.IS_DISAGGREGATED
+                Constants.STORAGE_IP
         );
 
-        // Parse key=value pairs from URL into details (skip empty segments)
-        if (url != null && !url.isEmpty()) {
-            for (String segment : url.split(Constants.SEMICOLON)) {
-                if (segment.isEmpty()) {
-                    continue;
-                }
-                String[] kv = segment.split(Constants.EQUALS, 2);
-                if (kv.length == 2) {
-                    details.put(kv[0].trim(), kv[1].trim());
-                }
-            }
-        }
-
         // Validate existing entries (reject unexpected keys, empty values)
         for (Map.Entry<String, String> e : details.entrySet()) {
             String key = e.getKey();
@@ -196,21 +181,17 @@ public DataStore initialize(Map<String, Object> dsInfos) {
 
         details.put(Constants.SIZE, capacityBytes.toString());
 
-        // Default for IS_DISAGGREGATED if needed
-        details.putIfAbsent(Constants.IS_DISAGGREGATED, "false");
-
         ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
 
         // Connect to ONTAP and create volume
         long volumeSize = Long.parseLong(details.get(Constants.SIZE));
         OntapStorage ontapStorage = new OntapStorage(
                 details.get(Constants.USERNAME),
                 details.get(Constants.PASSWORD),
-                details.get(Constants.MANAGEMENT_LIF),
+                details.get(Constants.STORAGE_IP),
                 details.get(Constants.SVM_NAME),
                 volumeSize,
-                protocol,
-                Boolean.parseBoolean(details.get(Constants.IS_DISAGGREGATED).toLowerCase()));
+                protocol);
 
         StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
@@ -79,7 +79,7 @@ public abstract class StorageStrategy {
 
     public StorageStrategy(OntapStorage ontapStorage) {
         storage = ontapStorage;
-        String baseURL = Constants.HTTPS + storage.getManagementLIF();
+        String baseURL = Constants.HTTPS + storage.getStorageIP();
         s_logger.info("Initializing StorageStrategy with base URL: " + baseURL);
         // Initialize FeignClientFactory and create clients
         this.feignClientFactory = new FeignClientFactory();
@@ -93,7 +93,7 @@ public StorageStrategy(OntapStorage ontapStorage) {
 
     // Connect method to validate ONTAP cluster, credentials, protocol, and SVM
     public boolean connect() {
-        s_logger.info("Attempting to connect to ONTAP cluster at " + storage.getManagementLIF() + " and validate SVM " +
+        s_logger.info("Attempting to connect to ONTAP cluster at " + storage.getStorageIP() + " and validate SVM " +
                 storage.getSvmName() + ", protocol " + storage.getProtocol());
         //Get AuthHeader
         String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Constants.java
@@ -30,7 +30,7 @@ public class Constants {
     public static final String USERNAME = "username";
     public static final String PASSWORD = "password";
     public static final String DATA_LIF = "dataLIF";
-    public static final String MANAGEMENT_LIF = "managementLIF";
+    public static final String STORAGE_IP = "storage_ip";
     public static final String VOLUME_NAME = "volumeName";
     public static final String VOLUME_UUID = "volumeUUID";
     public static final String EXPORT_POLICY_ID = "exportPolicyId";
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java
@@ -121,9 +121,8 @@ public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String
         }
         String protocol = details.get(Constants.PROTOCOL);
         OntapStorage ontapStorage = new OntapStorage(details.get(Constants.USERNAME), details.get(Constants.PASSWORD),
-                details.get(Constants.MANAGEMENT_LIF), details.get(Constants.SVM_NAME), Long.parseLong(details.get(Constants.SIZE)),
-                ProtocolType.valueOf(protocol),
-                Boolean.parseBoolean(details.get(Constants.IS_DISAGGREGATED)));
+                details.get(Constants.STORAGE_IP), details.get(Constants.SVM_NAME), Long.parseLong(details.get(Constants.SIZE)),
+                ProtocolType.valueOf(protocol));
         StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
         if (isValid) {
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -4067,9 +4067,10 @@
 "message.action.unregister.extension.resource": "Please confirm that you want to unregister extension with this resource",
 "message.bgp.peers.null": "Please note, if no BGP peers are selected, the VR will connect to <br> (1) dedicated BGP peers the owner can access, if the owner has dedicated BGP peers and account setting use.system.bgp.peers is set to false; <br> (2) all BGP peers the owner can access, otherwise.<br>",
 "message.bucket.delete": "Please confirm that you want to delete this Bucket",
-"label.ontap.username.tooltip": "The username for the ONTAP storage array",
-"label.ontap.password": "The password for the ONTAP storage array",
-"label.ontap.ip.tooltip": "ONTAP storage array IP",
+"label.ontap.username.tooltip": "The username for the NetApp ONTAP storage array",
+"label.ontap.password.tooltip": "The password for the NetApp ONTAP storage array",
+"label.ontap.ip.tooltip": "NetApp ONTAP storage array IP",
+"label.ontap.svm.name.tooltip": "NetApp SVM Name",
 "label.ontap.ip": "Storage Array IP",
 "label.ontap.svm.name": "SVM Name",
 "migrate.from": "Migrate from",
diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue
@@ -285,15 +285,15 @@
           </a-form-item>
           <a-form-item name="ontapPassword" ref="ontapPassword">
             <template #label>
-              <tooltip-label :title="$t('label.password')" :tooltip="$t('label.ontap.password')"/>
+              <tooltip-label :title="$t('label.password')" :tooltip="$t('label.ontap.password.tooltip')"/>
             </template>
-            <a-input-password v-model:value="form.ontapPassword" :placeholder="$t('label.ontap.password')"/>
+            <a-input-password v-model:value="form.ontapPassword" :placeholder="$t('label.ontap.password.tooltip')"/>
           </a-form-item>
           <a-form-item name="ontapSvmName" ref="ontapSvmName">
             <template #label>
-              <tooltip-label :title="$t('label.ontap.svm.name')" :tooltip="$t('label.ontap.svm.name')"/>
+              <tooltip-label :title="$t('label.ontap.svm.name')" :tooltip="$t('label.ontap.svm.name.tooltip')"/>
             </template>
-            <a-input v-model:value="form.ontapSvmName" :placeholder="$t('label.ontap.svm.name')"/>
+            <a-input v-model:value="form.ontapSvmName" :placeholder="$t('label.ontap.svm.name.tooltip')"/>
           </a-form-item>
           <a-form-item name="capacityBytes" ref="capacityBytes">
             <template #label>
@@ -548,7 +548,11 @@ export default {
         primeraPassword: [{ required: true, message: this.$t('label.password') }],
         flashArrayURL: [{ required: true, message: this.$t('label.url') }],
         flashArrayUsername: [{ required: true, message: this.$t('label.username') }],
-        flashArrayPassword: [{ required: true, message: this.$t('label.password') }]
+        flashArrayPassword: [{ required: true, message: this.$t('label.password') }],
+        ontapIP: [{ required: true, message: this.$t('label.required') }],
+        ontapUsername: [{ required: true, message: this.$t('label.required') }],
+        ontapPassword: [{ required: true, message: this.$t('label.required') }],
+        ontapSvmName: [{ required: true, message: this.$t('label.required') }],
       })
     },
     fetchData () {
@@ -807,7 +811,7 @@ export default {
         this.protocols = ['FiberChannel']
         this.form.protocol = 'FiberChannel'
       } else if (value === 'ONTAP') {
-        this.protocols = ['NFS3', 'iSCSI']
+        this.protocols = ['NFS3', 'ISCSI']
         this.form.protocol = 'NFS3'
       } else {
         this.fetchHypervisor(value)
@@ -932,11 +936,11 @@ export default {
           params['details[0].api_password'] = values.flashArrayPassword
           url = values.flashArrayURL
         } else if (values.provider === 'ONTAP') {
-          params['details[0].ontap_ip'] = values.ontapIP
-          params['details[0].ontap_username'] = values.ontapUsername
-          params['details[0].ontap_password'] = values.ontapPassword
-          params['details[0].ontap_svmName'] = values.ontapSvmName
-          params['details[0].ontap_protocol'] = values.protocol
+          params['details[0].storage_ip'] = values.ontapIP
+          params['details[0].username'] = values.ontapUsername
+          params['details[0].password'] = values.ontapPassword
+          params['details[0].svmName'] = values.ontapSvmName
+          params['details[0].protocol'] = values.protocol
           values.managed = true
           url = this.ontapURL(values.ontapIP)
         }
