[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/service/StorageStrategy.java

@@ -109,33 +109,31 @@ public boolean connect() {
             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.NFS + OntapStorageConstants.COMMA + OntapStorageConstants.ISCSI);
+                    OntapStorageConstants.COMMA +  OntapStorageConstants.NFS_ENABLED + OntapStorageConstants.COMMA + OntapStorageConstants.ISCSI_ENABLED);
             OntapResponse<Svm> svms = svmFeignClient.getSvmResponse(queryParams, authHeader);
             if (svms != null && svms.getRecords() != null && !svms.getRecords().isEmpty()) {
                 svm = svms.getRecords().get(0);
             } else {
-                logger.error("No SVM found on the ONTAP cluster by the name" + svmName + ".");
-                return false;
+                logger.error("No SVM found on the ONTAP cluster by the name" + svmName);
+                throw new CloudRuntimeException("No SVM found on the ONTAP cluster by the name " + svmName);
             }
 
             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() + "svm.getNfsEnabled() : " + svm.getNfsEnabled());
             if (!Objects.equals(svm.getState(), OntapStorageConstants.RUNNING)) {
-                logger.error("SVM " + svmName + " is not in running state.");
-                return false;
+                logger.error("SVM " + svmName + " is not in running state");
+                throw new CloudRuntimeException("SVM " + svmName + " is not in running state");
             }
             if (Objects.equals(storage.getProtocol(), ProtocolType.NFS3) && !svm.getNfsEnabled()) {
                 logger.error("NFS protocol is not enabled on SVM " + svmName);
-                return false;
+                throw new CloudRuntimeException("NFS protocol is not enabled on SVM " + svmName);
             } else if (Objects.equals(storage.getProtocol(), ProtocolType.ISCSI) && !svm.getIscsiEnabled()) {
                 logger.error("iSCSI protocol is not enabled on SVM " + svmName);
-                return false;
+                throw new CloudRuntimeException("iSCSI protocol is not enabled on SVM " + svmName);
             }
             List<Aggregate> aggrs = svm.getAggregates();
             if (aggrs == null || aggrs.isEmpty()) {
                 logger.error("No aggregates are assigned to SVM " + svmName);
-                return false;
+                throw new CloudRuntimeException("No aggregates are assigned to SVM " + svmName);
             }
             for (Aggregate aggr : aggrs) {
                 logger.debug("Found aggregate: " + aggr.getName() + " with UUID: " + aggr.getUuid());

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

@@ -30,6 +30,9 @@ public class OntapStorageConstants {
 
     public static final String NFS = "nfs";
     public static final String ISCSI = "iscsi";
+
+    public static final String NFS_ENABLED = "nfs.enabled";
+    public static final String ISCSI_ENABLED = "iscsi.enabled";
     public static final String SIZE = "size";
     public static final String PROTOCOL = "protocol";
     public static final String SVM_NAME = "svmName";