CSTACKEX-50: Fixed some issues seen while testing

Author: Locharla, Sandeep

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

@@ -42,6 +42,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -287,14 +288,15 @@ public String getNetworkInterface() {
         // Feign call to get network interfaces
         String authHeader = Utility.generateAuthHeader(storage.getUsername(), storage.getPassword());
         try {
-            Map<String, Object> queryParams = Map.of(Constants.SVMNAME, storage.getSvmName());
+            Map<String, Object> queryParams = new HashMap<>();
+            queryParams.put(Constants.SVMDOTNAME, storage.getSvmName());
             if (storage.getProtocol() != null) {
                 switch (storage.getProtocol()) {
                     case NFS3:
-                        queryParams = Map.of(Constants.SERVICES, Constants.DATA_NFS);
+                        queryParams .put(Constants.SERVICES, Constants.DATA_NFS);
                         break;
                     case ISCSI:
-                        queryParams = Map.of(Constants.SERVICES, Constants.DATA_ISCSI);
+                        queryParams.put(Constants.SERVICES, Constants.DATA_ISCSI);
                         break;
                     default:
                         s_logger.error("Unsupported protocol: " + storage.getProtocol());

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

@@ -19,7 +19,6 @@
 
 package org.apache.cloudstack.storage.utils;
 
-import org.opensaml.xml.encryption.Public;
 
 public class Constants {
 
@@ -53,7 +52,7 @@ public class Constants {
     public static final String FIELDS = "fields";
     public static final String AGGREGATES = "aggregates";
     public static final String STATE = "state";
-    public static final String SVMNAME = "svm.name";
+    public static final String SVMDOTNAME = "svm.name";
     public static final String DATA_NFS = "data_nfs";
     public static final String DATA_ISCSI = "data_iscsi";
     public static final String IP_ADDRESS = "ip.address";