Feature/cstackex 33

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NASFeignClient.java

@@ -43,17 +43,17 @@ public interface NASFeignClient {
     //File Operations
 
     @RequestMapping(method = RequestMethod.GET, value="/{volume.uuid}/files/{path}")
-    OntapResponse<FileInfo> getFileResponse(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid", required = true) String volumeUUID,
-                                            @PathVariable(name = "path", required = true) String filePath);
+    OntapResponse<FileInfo> getFileResponse(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid") String volumeUUID,
+                                            @PathVariable(name = "path") String filePath);
     @RequestMapping(method = RequestMethod.DELETE, value="/{volume.uuid}/files/{path}")
-    void deleteFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid", required = true) String volumeUUID,
-                    @PathVariable(name = "path", required = true) String filePath);
+    void deleteFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid") String volumeUUID,
+                    @PathVariable(name = "path") String filePath);
     @RequestMapping(method = RequestMethod.PATCH, value="/{volume.uuid}/files/{path}")
-    void updateFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid", required = true) String volumeUUID,
-                    @PathVariable(name = "path", required = true) String filePath, @RequestBody FileInfo fileInfo);
+    void updateFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid") String volumeUUID,
+                    @PathVariable(name = "path") String filePath, @RequestBody FileInfo fileInfo);
     @RequestMapping(method = RequestMethod.POST, value="/{volume.uuid}/files/{path}")
-    void createFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid", required = true) String volumeUUID,
-                    @PathVariable(name = "path", required = true) String filePath, @RequestBody FileInfo file);
+    void createFile(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "volume.uuid") String volumeUUID,
+                    @PathVariable(name = "path") String filePath, @RequestBody FileInfo file);
 
 
 
@@ -68,12 +68,12 @@ ExportPolicy createExportPolicy(URI uri, @RequestHeader("Authorization") String
     OntapResponse<ExportPolicy> getExportPolicyResponse(URI baseURL, @RequestHeader("Authorization") String header);
 
     @RequestMapping(method = RequestMethod.GET, value="/{id}")
-    OntapResponse<ExportPolicy> getExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id);
+    OntapResponse<ExportPolicy> getExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id") String id);
 
     @RequestMapping(method = RequestMethod.DELETE, value="/{id}")
-    void deleteExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id);
+    void deleteExportPolicyById(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id") String id);
 
     @RequestMapping(method = RequestMethod.PATCH, value="/{id}")
-    OntapResponse<ExportPolicy> updateExportPolicy(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id", required = true) String id,
+    OntapResponse<ExportPolicy> updateExportPolicy(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "id") String id,
                                                    @RequestBody ExportPolicy request);
 }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SANFeignClient.java

@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cloudstack.storage.feign.client;
+
+import org.apache.cloudstack.storage.feign.model.Igroup;
+import org.apache.cloudstack.storage.feign.model.Lun;
+import org.apache.cloudstack.storage.feign.FeignConfiguration;
+import org.apache.cloudstack.storage.feign.model.LunMap;
+import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.net.URI;
+
+@Lazy
+@FeignClient(name = "SANClient", url = "", configuration = FeignConfiguration.class )
+public interface SANFeignClient {
+
+    //Lun Operation APIs
+    @RequestMapping(method = RequestMethod.POST)
+    OntapResponse<Lun> createLun(URI baseURL, @RequestHeader("Authorization") String authHeader, @RequestHeader("return_records") boolean value,
+                                 @RequestBody Lun lun);
+
+    //this method to get all luns and also filtered luns based on query params as a part of URL
+    @RequestMapping(method = RequestMethod.GET)
+    OntapResponse<Lun> getLunResponse(URI baseURL, @RequestHeader("Authorization") String authHeader);
+
+    @RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
+    Lun getLunByUUID(URI baseURL, @RequestHeader("Authorization") String authHeader, @PathVariable(name="uuid", required=true) String uuid);
+
+    @RequestMapping(method = RequestMethod.PATCH, value = "/{uuid}")
+    void updateLun(URI uri, @RequestHeader("Authorization") String authHeader, @PathVariable(name="uuid", required=true) String uuid,
+                     @RequestBody Lun lun);
+
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{uuid}")
+    void deleteLun(URI baseURL, @RequestHeader("Authorization") String authHeader, @PathVariable(name="uuid", required=true) String uuid);
+
+
+    //iGroup Operation APIs
+
+    @RequestMapping(method = RequestMethod.POST)
+    OntapResponse<Igroup> createIgroup(URI uri, @RequestHeader("Authorization") String header, @RequestHeader("return_records") boolean value,
+                               @RequestBody Igroup igroupRequest);
+
+    //this method to get all igroups and also filtered igroups based on query params as a part of URL
+    @RequestMapping(method = RequestMethod.GET)
+    OntapResponse<Igroup> getIgroupResponse(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid);
+    @RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
+    Igroup getIgroupByUUID(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid);
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{uuid}")
+    void deleteIgroup(URI baseUri, @RequestHeader("Authorization") String authHeader, @PathVariable(name = "uuid", required = true) String uuid);
+
+    @RequestMapping(method = RequestMethod.POST, value = "/{uuid}/igroups")
+    OntapResponse<Igroup> addNestedIgroups(URI uri, @RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid,
+                                                 @RequestBody Igroup igroupNestedRequest, @RequestHeader(value="return_records", defaultValue = "true") boolean value);
+
+
+    //Lun Maps Operation APIs
+
+    @RequestMapping(method = RequestMethod.POST)
+    OntapResponse<LunMap> createLunMap(URI baseURL, @RequestHeader("Authorization") String authHeader, @RequestBody LunMap lunMap);
+
+    @RequestMapping(method = RequestMethod.GET)
+    OntapResponse<LunMap> getLunMapResponse(URI baseURL, @RequestHeader("Authorization") String authHeader);
+
+    @RequestMapping(method = RequestMethod.GET, value = "/{lun.uuid}/{igroup.uuid}")
+    void deleteLunMap(URI baseURL, @RequestHeader("Authorization") String authHeader, @PathVariable(name="lun.uuid", required=true) String uuid,
+                        @PathVariable(name="igroup.uuid", required=true) String igroupUUID);
+
+}

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java

@@ -23,9 +23,7 @@
 import org.apache.cloudstack.storage.feign.model.Svm;
 import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 
 import java.net.URI;
 
@@ -34,9 +32,12 @@ public interface SvmFeignClient {
 
     //this method to get all svms and also filtered svms based on query params as a part of URL
     @RequestMapping(method = RequestMethod.GET)
-    OntapResponse<Svm> getSvmResponse(URI baseURL, @RequestHeader("Authorization") String header);
+    OntapResponse<Svm> getSvms(URI baseURL, @RequestHeader("Authorization") String header);
 
     @RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
-    Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header);
+    Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header, @PathVariable("uuid") String uuid);
+
+    @RequestMapping(method = RequestMethod.PATCH, value = "/{uuid}")
+    Svm updateSVM(URI baseURL, @RequestHeader("Authorization") String header, @RequestBody Svm svm);
 
 }

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java

@@ -30,21 +30,23 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.net.URI;
+
 
 @Lazy
 @FeignClient(name = "VolumeClient", url = "https://{clusterIP}/api/storage/volumes", configuration = FeignConfiguration.class)
 public interface VolumeFeignClient {
 
     @RequestMapping(method = RequestMethod.DELETE, value="/{uuid}")
-    void deleteVolume(@RequestHeader("Authorization") String authHeader, @PathVariable("uuid") String uuid);
+    void deleteVolume(URI baseURL, @RequestHeader("Authorization") String authHeader, @PathVariable("uuid") String uuid);
 
     @RequestMapping(method = RequestMethod.POST)
-    JobResponse createVolumeWithJob(@RequestHeader("Authorization") String authHeader, @RequestBody Volume volumeRequest);
+    JobResponse createVolumeWithJob(URI baseURL, @RequestHeader("Authorization") String authHeader, @RequestBody Volume volumeRequest);
 
     @RequestMapping(method = RequestMethod.GET, value="/{uuid}")
-    Volume getVolumeByUUID(@RequestHeader("Authorization") String authHeader, @PathVariable("uuid") String uuid);
+    Volume getVolumeByUUID(URI baseURL, @RequestHeader("Authorization") String authHeader, @PathVariable("uuid") String uuid);
 
     @RequestMapping(method = RequestMethod.PATCH)
-    JobResponse updateVolumeRebalancing(@RequestHeader("accept") String acceptHeader, @PathVariable("uuid") String uuid, @RequestBody Volume volumeRequest);
+    JobResponse updateVolumeRebalancing(URI baseURL, @RequestHeader("accept") String acceptHeader, @PathVariable("uuid") String uuid, @RequestBody Volume volumeRequest);
 
 }

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

@@ -96,7 +96,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash( id, name, rules, svm);
+    return Objects.hash( id, name);
   }
 
 

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

@@ -255,7 +255,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(bytesUsed, creationTime, fillEnabled, isEmpty, isSnapshot, isVmAligned, modifiedTime, name, overwriteEnabled, path, size, target, type, uniqueBytes, unixPermissions);
+    return Objects.hash(name, path);
   }