CSTACKEX-34: incorporating the review comments

Author: rajiv-jain-netapp

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

@@ -31,6 +31,8 @@
 import org.apache.cloudstack.storage.feign.model.Volume;
 import org.apache.cloudstack.storage.feign.model.response.JobResponse;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
+import org.apache.cloudstack.storage.service.model.AccessGroup;
+import org.apache.cloudstack.storage.service.model.CloudStackVolume;
 import org.apache.cloudstack.storage.utils.Constants;
 import org.apache.cloudstack.storage.utils.Utility;
 import org.apache.logging.log4j.LogManager;
@@ -81,6 +83,7 @@ protected enum PROTOCOLS
 
     public StorageStrategy(OntapStorage ontapStorage) {
         storage = ontapStorage;
+
     }
 
     // Connect method to validate ONTAP cluster, credentials, protocol, and SVM
@@ -135,7 +138,7 @@ public boolean connect() {
      * @param volumeName
      * @param size
      */
-    public void createStorageVolume(String volumeName, Long size) {
+    public Volume createStorageVolume(String volumeName, Long size) {
         s_logger.info("Creating volume: " + volumeName + " of size: " + size + " bytes");
 
         String svmName = storage.getSvmName();
@@ -195,6 +198,8 @@ public void createStorageVolume(String volumeName, Long size) {
             throw new CloudRuntimeException("Failed to create volume: " + e.getMessage());
         }
         s_logger.info("Volume created successfully: " + volumeName);
+        //TODO
+        return null;
     }
 
     /**
@@ -204,7 +209,7 @@ public void createStorageVolume(String volumeName, Long size) {
      *
      * @param values
      */
-    public void updateStorageVolume(Map<String,String> values)
+    public Volume updateStorageVolume(Map<String,String> values)
     {
         //TODO
     }
@@ -228,9 +233,10 @@ public void deleteStorageVolume(Map<String,String> values)
      *
      * @param values
      */
-    public void getStorageVolume(Map<String,String> values)
+    public Volume getStorageVolume(Map<String,String> values)
     {
         //TODO
+        return null;
     }
 
     /**
@@ -241,7 +247,7 @@ public void getStorageVolume(Map<String,String> values)
      *     createNameSpace for Nvme/TCP and Nvme/FC protocol
      * @param values
      */
-    abstract public void createCloudStackVolume(Map<String,String> values);
+    abstract public CloudStackVolume createCloudStackVolume(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses.
@@ -251,7 +257,7 @@ public void getStorageVolume(Map<String,String> values)
      *     updateNameSpace for Nvme/TCP and Nvme/FC protocol
      * @param values
      */
-    abstract void updateCloudStackVolume(Map<String,String> values);
+    abstract CloudStackVolume updateCloudStackVolume(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses.
@@ -271,7 +277,7 @@ public void getStorageVolume(Map<String,String> values)
      *     getNameSpace for Nvme/TCP and Nvme/FC protocol
      * @param values
      */
-    abstract void getCloudStackVolume(Map<String,String> values);
+    abstract CloudStackVolume getCloudStackVolume(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses
@@ -280,7 +286,7 @@ public void getStorageVolume(Map<String,String> values)
      *     createSubsystem    for Nvme/TCP and Nvme/FC protocols
      * @param values
      */
-    abstract void enableAccess(Map<String,String> values);
+    abstract AccessGroup createAccessGroup(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses
@@ -289,7 +295,7 @@ public void getStorageVolume(Map<String,String> values)
      *     deleteSubsystem    for Nvme/TCP and Nvme/FC protocols
      * @param values
      */
-    abstract void disableAccess(Map<String,String> values);
+    abstract void deleteAccessGroup(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses
@@ -298,7 +304,7 @@ public void getStorageVolume(Map<String,String> values)
      *     //TODO  for Nvme/TCP and Nvme/FC protocols
      * @param values
      */
-    abstract void updateAccess(Map<String,String> values);
+    abstract AccessGroup updateAccessGroup(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses
@@ -307,7 +313,7 @@ public void getStorageVolume(Map<String,String> values)
      *     getNameSpace    for Nvme/TCP and Nvme/FC protocols
      * @param values
      */
-    abstract void getAccess(Map<String,String> values);
+    abstract AccessGroup getAccessGroup(Map<String,String> values);
 
     /**
      * Method encapsulates the behavior based on the opted protocol in subclasses

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

@@ -0,0 +1,26 @@
+package org.apache.cloudstack.storage.service.model;
+
+import org.apache.cloudstack.storage.feign.model.Igroup;
+import org.apache.cloudstack.storage.feign.model.Policy;
+
+public class AccessGroup {
+
+    Igroup igroup;
+    Policy policy;
+
+    public Igroup getIgroup() {
+        return igroup;
+    }
+
+    public void setIgroup(Igroup igroup) {
+        this.igroup = igroup;
+    }
+
+    public Policy getPolicy() {
+        return policy;
+    }
+
+    public void setPolicy(Policy policy) {
+        this.policy = policy;
+    }
+}

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

@@ -0,0 +1,26 @@
+package org.apache.cloudstack.storage.service.model;
+
+import org.apache.cloudstack.storage.feign.model.FileInfo;
+import org.apache.cloudstack.storage.feign.model.Lun;
+
+public class CloudStackVolume {
+
+    FileInfo file;
+    Lun lun;
+
+    public FileInfo getFile() {
+        return file;
+    }
+
+    public void setFile(FileInfo file) {
+        this.file = file;
+    }
+
+    public Lun getLun() {
+        return lun;
+    }
+
+    public void setLun(Lun lun) {
+        this.lun = lun;
+    }
+}