[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

@@ -122,10 +122,10 @@ public boolean connect() {
                 logger.error("SVM " + svmName + " is not in running state.");
                 return false;
             }
-            if (Objects.equals(storage.getProtocol(), OntapStorageConstants.NFS) && !svm.getNfsEnabled()) {
+            if (storage.getProtocol().name().equalsIgnoreCase(OntapStorageConstants.NFS3) && !svm.getNfsEnabled()) {
                 logger.error("NFS protocol is not enabled on SVM " + svmName);
                 return false;
-            } else if (Objects.equals(storage.getProtocol(), OntapStorageConstants.ISCSI) && !svm.getIscsiEnabled()) {
+            } else if (storage.getProtocol().name().equalsIgnoreCase(OntapStorageConstants.ISCSI) && !svm.getIscsiEnabled()) {
                 logger.error("iSCSI protocol is not enabled on SVM " + svmName);
                 return false;
             }

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

@@ -28,7 +28,7 @@ public class OntapStorageConstants {
     public static final int NFS3_PORT = 2049;
     public static final int ISCSI_PORT = 3260;
 
-    public static final String NFS = "nfs";
+    public static final String NFS3 = "nfs3";
     public static final String ISCSI = "iscsi";
     public static final String SIZE = "size";
     public static final String PROTOCOL = "protocol";