CSTACKEX-7: Addressed few more comments

Author: Locharla, Sandeep

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

@@ -112,7 +112,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             ClusterVO clusterVO = _clusterDao.findById(clusterId);
             Preconditions.checkNotNull(clusterVO, "Unable to locate the specified cluster");
             if (clusterVO.getHypervisorType() != Hypervisor.HypervisorType.KVM) {
-                throw new CloudRuntimeException("ONTAP primary storage is not supported for KVM hypervisor");
+                throw new CloudRuntimeException("ONTAP primary storage is supported only for KVM hypervisor");
             }
             parameters.setHypervisorType(clusterVO.getHypervisorType());
         }
@@ -141,8 +141,7 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         OntapStorage ontapStorage = new OntapStorage(details.get(Constants.USERNAME), details.get(Constants.PASSWORD),
                 details.get(Constants.MANAGEMENT_LIF), details.get(Constants.SVM_NAME), protocol,
                 Boolean.parseBoolean(details.get(Constants.IS_DISAGGREGATED)));
-        StorageProviderFactory storageProviderManager = new StorageProviderFactory(ontapStorage);
-        StorageStrategy storageStrategy = storageProviderManager.getStrategy();
+        StorageStrategy storageStrategy = StorageProviderFactory.getStrategy(ontapStorage);
         boolean isValid = storageStrategy.connect();
         if (isValid) {
 //            String volumeName = storagePoolName + "_vol"; //TODO: Figure out a better naming convention

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java

@@ -25,6 +25,7 @@
 import org.apache.cloudstack.storage.service.UnifiedNASStrategy;
 import org.apache.cloudstack.storage.service.UnifiedSANStrategy;
 import org.apache.cloudstack.storage.utils.Constants;
+import org.apache.cloudstack.storage.utils.Constants.ProtocolType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
@@ -34,18 +35,18 @@ public class StorageProviderFactory {
     private final StorageStrategy storageStrategy;
     private static final Logger s_logger = (Logger) LogManager.getLogger(StorageProviderFactory.class);
 
-    public StorageProviderFactory(OntapStorage ontapStorage) {
-        String protocol = ontapStorage.getProtocol();
+    private StorageProviderFactory(OntapStorage ontapStorage) {
+        ProtocolType protocol = ontapStorage.getProtocol();
         s_logger.info("Initializing StorageProviderFactory with protocol: " + protocol);
-        switch (protocol.toLowerCase()) {
-            case Constants.NFS:
+        switch (protocol) {
+            case NFS:
                 if(!ontapStorage.getIsDisaggregated()) {
                     this.storageStrategy = new UnifiedNASStrategy(ontapStorage);
                 } else {
                     throw new CloudRuntimeException("Unsupported configuration: Disaggregated ONTAP is not supported.");
                 }
                 break;
-            case Constants.ISCSI:
+            case ISCSI:
                 if (!ontapStorage.getIsDisaggregated()) {
                     this.storageStrategy = new UnifiedSANStrategy(ontapStorage);
                 } else {
@@ -58,7 +59,7 @@ public StorageProviderFactory(OntapStorage ontapStorage) {
         }
     }
 
-    public StorageStrategy getStrategy() {
-        return storageStrategy;
+    public static StorageStrategy getStrategy(OntapStorage ontapStorage) {
+        return new StorageProviderFactory(ontapStorage).storageStrategy;
     }
 }