[CSTACKEX-129] NFS3 Primary storage-pool is not failing even if NFS3 protocol is not enabled at the storage VM

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Svm.java

@@ -36,14 +36,14 @@ public class Svm {
     @JsonProperty("name")
     private String name = null;
 
-    @JsonProperty("iscsi.enabled")
-    private Boolean iscsiEnabled = null;
+    @JsonProperty("iscsi")
+    private ProtocolStatus iscsi = null;
 
-    @JsonProperty("fcp.enabled")
-    private Boolean fcpEnabled = null;
+    @JsonProperty("fcp")
+    private ProtocolStatus fcp = null;
 
-    @JsonProperty("nfs.enabled")
-    private Boolean nfsEnabled = null;
+    @JsonProperty("nfs")
+    private ProtocolStatus nfs = null;
 
     @JsonProperty("aggregates")
     private List<Aggregate> aggregates = null;
@@ -73,28 +73,16 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Boolean getIscsiEnabled() {
-        return iscsiEnabled;
+    public Boolean getNfsEnabled() {
+        return nfs == null ? false : nfs.getEnabled();
     }
 
-    public void setIscsiEnabled(Boolean iscsiEnabled) {
-        this.iscsiEnabled = iscsiEnabled;
+    public Boolean getIscsiEnabled() {
+        return iscsi == null ? false : iscsi.getEnabled();
     }
 
     public Boolean getFcpEnabled() {
-        return fcpEnabled;
-    }
-
-    public void setFcpEnabled(Boolean fcpEnabled) {
-        this.fcpEnabled = fcpEnabled;
-    }
-
-    public Boolean getNfsEnabled() {
-        return nfsEnabled;
-    }
-
-    public void setNfsEnabled(Boolean nfsEnabled) {
-        this.nfsEnabled = nfsEnabled;
+        return fcp == null ? false : fcp.getEnabled();
     }
 
     public List<Aggregate> getAggregates() {
@@ -141,6 +129,15 @@ public int hashCode() {
         return Objects.hashCode(getUuid());
     }
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class ProtocolStatus {
+        @JsonProperty("enabled")
+        private Boolean enabled;
+        public Boolean getEnabled() { return enabled; }
+        public void setEnabled(Boolean enabled) { this.enabled = enabled; }
+    }
+
     @JsonInclude(JsonInclude.Include.NON_NULL)
     public static class Links { }
 }

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

@@ -108,7 +108,8 @@ public boolean connect() {
             Svm svm = new Svm();
             logger.info("Fetching the SVM details...");
             Map<String, Object> queryParams = Map.of(OntapStorageConstants.NAME, svmName, OntapStorageConstants.FIELDS, OntapStorageConstants.AGGREGATES +
-                    OntapStorageConstants.COMMA + OntapStorageConstants.STATE);
+                    OntapStorageConstants.COMMA + OntapStorageConstants.STATE +
+                    OntapStorageConstants.COMMA +  OntapStorageConstants.NFS + OntapStorageConstants.COMMA + OntapStorageConstants.ISCSI);
             OntapResponse<Svm> svms = svmFeignClient.getSvmResponse(queryParams, authHeader);
             if (svms != null && svms.getRecords() != null && !svms.getRecords().isEmpty()) {
                 svm = svms.getRecords().get(0);
@@ -118,16 +119,15 @@ public boolean connect() {
             }
 
             logger.info("Validating SVM state and protocol settings...");
-            logger.info("Protocol storage.getProtocol() = " + storage.getProtocol() + "Objects.equals(storage.getProtocol(), ProtocolType.ISCSI)" + Objects.equals(storage.getProtocol(), ProtocolType.ISCSI));
-            logger.info("svm.getIscsiEnabled() : " + svm.getIscsiEnabled());
+            logger.info("Protocol storage.getProtocol() = " + storage.getProtocol() + " Objects.equals(storage.getProtocol(), ProtocolType.ISCSI) " + Objects.equals(storage.getProtocol(), ProtocolType.ISCSI));
+            logger.info("svm.getIscsiEnabled() : " + svm.getIscsiEnabled() + "svm.getNfsEnabled() : " + svm.getNfsEnabled());
             if (!Objects.equals(svm.getState(), OntapStorageConstants.RUNNING)) {
                 logger.error("SVM " + svmName + " is not in running state.");
                 return false;
             }
             if (Objects.equals(storage.getProtocol(), ProtocolType.NFS3) && !svm.getNfsEnabled()) {
                 logger.error("NFS protocol is not enabled on SVM " + svmName);
                 return false;
-
             } else if (Objects.equals(storage.getProtocol(), ProtocolType.ISCSI) && !svm.getIscsiEnabled()) {
                 logger.error("iSCSI protocol is not enabled on SVM " + svmName);
                 return false;