CSTACKEX-46: Added some code that was added to community PR for PrimaryStoragePool

Author: Locharla, Sandeep

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

@@ -184,7 +184,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         for (Map.Entry<String, String> e : details.entrySet()) {
             String key = e.getKey();
             String val = e.getValue();
-            if (!requiredKeys.contains(key)) {
+            if (!allowedKeys.contains(key)) {
                 throw new CloudRuntimeException("Unexpected ONTAP detail key in URL: " + key);
             }
             if (val == null || val.isEmpty()) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java

@@ -20,7 +20,6 @@
 package org.apache.cloudstack.storage.utils;
 
 import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.storage.ScopeType;
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java

@@ -78,6 +78,30 @@ void setUp() {
     @Test
     public void testInitialize_positive() {
 
+        Map<String, Object> dsInfos = new HashMap<>();
+        dsInfos.put("username", "testUser");
+        dsInfos.put("password", "testPassword");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
+        dsInfos.put("zoneId",1L);
+        dsInfos.put("podId",1L);
+        dsInfos.put("clusterId", 1L);
+        dsInfos.put("name", "testStoragePool");
+        dsInfos.put("providerName", "testProvider");
+        dsInfos.put("capacityBytes",200000L);
+        dsInfos.put("managed",true);
+        dsInfos.put("tags", "testTag");
+        dsInfos.put("isTagARule", false);
+        dsInfos.put("details", new HashMap<String, String>());
+
+        try(MockedStatic<StorageProviderFactory> storageProviderFactory = Mockito.mockStatic(StorageProviderFactory.class)) {
+            storageProviderFactory.when(() -> StorageProviderFactory.getStrategy(any())).thenReturn(storageStrategy);
+            ontapPrimaryDatastoreLifecycle.initialize(dsInfos);
+        }
+    }
+
+    @Test
+    public void testInitialize_positiveWithIsDisaggregated() {
+
         Map<String, Object> dsInfos = new HashMap<>();
         dsInfos.put("username", "testUser");
         dsInfos.put("password", "testPassword");
@@ -109,7 +133,7 @@ public void testInitialize_null_Arg() {
     @Test
     public void testInitialize_missingRequiredDetailKey() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);
@@ -131,7 +155,7 @@ public void testInitialize_missingRequiredDetailKey() {
     @Test
     public void testInitialize_invalidCapacityBytes() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);
@@ -152,7 +176,7 @@ public void testInitialize_invalidCapacityBytes() {
     @Test
     public void testInitialize_unmanagedStorage() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);
@@ -176,7 +200,7 @@ public void testInitialize_unmanagedStorage() {
     @Test
     public void testInitialize_nullStoragePoolName() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);
@@ -200,7 +224,7 @@ public void testInitialize_nullStoragePoolName() {
     @Test
     public void testInitialize_nullProviderName() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);
@@ -224,7 +248,7 @@ public void testInitialize_nullProviderName() {
     @Test
     public void testInitialize_nullPodAndClusterAndZone() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",null);
         dsInfos.put("podId",null);
         dsInfos.put("clusterId", null);
@@ -252,7 +276,7 @@ public void testInitialize_clusterNotKVM() {
         when(_clusterDao.findById(2L)).thenReturn(clusterVO);
 
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 2L);
@@ -276,7 +300,7 @@ public void testInitialize_clusterNotKVM() {
     @Test
     public void testInitialize_unexpectedDetailKey() {
         Map<String, Object> dsInfos = new HashMap<>();
-        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;isDisaggregated=false;unexpectedKey=unexpectedValue");
+        dsInfos.put("url", "username=testUser;password=testPassword;svmName=testSVM;protocol=NFS3;managementLIF=192.168.1.1;unexpectedKey=unexpectedValue");
         dsInfos.put("zoneId",1L);
         dsInfos.put("podId",1L);
         dsInfos.put("clusterId", 1L);