Cluster, SVM and Aggr Feign Client #6
Next
Next commit
CSTACKEX-29 Cluster, SVM and Aggr Feign Client
- Loading branch information
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.apache.cloudstack.storage.feign.client; | ||
|
|
||
| import org.apache.cloudstack.storage.feign.model.AggregateResponse; | ||
| import org.apache.cloudstack.storage.feign.model.Aggregate; | ||
| import org.apache.cloudstack.storage.feign.FeignConfiguration; | ||
| 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.RequestHeader; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestMethod; | ||
|
|
||
| import java.net.URI; | ||
|
|
||
| @Lazy | ||
| @FeignClient(name="AggregateClient", url="https://{clusterIP}/api/storage/aggregates", configuration = FeignConfiguration.class) | ||
| public interface AggregateFeignClient { | ||
| @RequestMapping(method=RequestMethod.GET) | ||
| AggregateResponse getAllAggregates(URI baseURL,@RequestHeader("Authorization") String header); | ||
|
|
||
| @RequestMapping(method=RequestMethod.GET, value="/{uuid}") | ||
| Aggregate getAggregateByUUID(URI baseURL,@RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid); | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.apache.cloudstack.storage.feign.client; | ||
|
|
||
| import org.apache.cloudstack.storage.feign.FeignConfiguration; | ||
| import org.apache.cloudstack.storage.feign.model.Cluster; | ||
| 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 java.net.URI; | ||
|
|
||
| @FeignClient(name="ClusterClient", url="https://{clusterIP}/api/cluster", configuration = FeignConfiguration.class) | ||
| public interface ClusterFeignClient { | ||
| @RequestMapping(method= RequestMethod.GET) | ||
| Cluster getCluster(URI baseURL, @RequestHeader("Authorization") String header, @RequestHeader("return_records") boolean value); | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package org.apache.cloudstack.storage.feign.client; | ||
|
|
||
| import org.apache.cloudstack.storage.feign.FeignConfiguration; | ||
| import org.apache.cloudstack.storage.feign.model.SvmResponse; | ||
| import org.apache.cloudstack.storage.feign.model.Svm; | ||
| 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 java.net.URI; | ||
|
|
||
| @FeignClient(name = "SvmClient", url = "https://{clusterIP}/api/svm/svms", configuration = FeignConfiguration.class) | ||
| public interface SvmFeignClient { | ||
| @RequestMapping(method = RequestMethod.GET) | ||
| SvmResponse getAllSvms(URI baseURL, @RequestHeader("Authorization") String header); | ||
| @RequestMapping(method = RequestMethod.GET, value = "/{uuid}") | ||
| Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header); | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. Can't we reuse this in VolumeRequestDTO, instead of AggregateDTO?
Author
There was a problem hiding this comment. As discussed, will remove the request DTOs and use the same ontap model with null annotation |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. This file can be shifted to model/response
Author
There was a problem hiding this comment. As discussed, will create one generic ontap response class |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * ONTAP REST API | ||
| * ONTAP adds support for an expansive RESTful API. The documentation below provides information about the types of API calls available to you, as well as details about using each API endpoint. You can learn more about the ONTAP REST API and ONTAP in the ONTAP 9 Documentation Center: http://docs.netapp.com/ontap-9/topic/com.netapp.doc.dot-rest-api/home.html. NetApp welcomes your comments and suggestions about the ONTAP REST API and the documentation for its use.</br> **Using the ONTAP REST API online documentation** Each API method includes usage examples, as well as a model that displays all the required and optional properties supported by the method. Click the _Model_ link, available with each API method, to see all the required and optional properties supported by each method. | ||
| * | ||
| * OpenAPI spec version: v1 | ||
| * | ||
| * | ||
| * NOTE: This class is auto generated by the swagger code generator program. | ||
| * https://github.com/swagger-api/swagger-codegen.git | ||
| * Do not edit the class manually. | ||
| */ | ||
|
|
||
|
|
||
| package org.apache.cloudstack.storage.feign.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.google.gson.annotations.SerializedName; | ||
| import io.swagger.annotations.ApiModelProperty; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * AggregateResponse | ||
| */ | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class AggregateResponse { | ||
| @JsonProperty("error") | ||
| private Error error = null; | ||
| @JsonProperty("num_records") | ||
| private Integer numRecords = null; | ||
| @JsonProperty("records") | ||
| private List<Aggregate> records = null; | ||
|
|
||
| public AggregateResponse error(Error error) { | ||
| this.error = error; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Get error | ||
| * @return error | ||
| **/ | ||
| @ApiModelProperty(value = "") | ||
| public Error getError() { | ||
| return error; | ||
| } | ||
|
|
||
| public void setError(Error error) { | ||
| this.error = error; | ||
| } | ||
|
|
||
| public AggregateResponse numRecords(Integer numRecords) { | ||
| this.numRecords = numRecords; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Number of records | ||
| * @return numRecords | ||
| **/ | ||
| @ApiModelProperty(value = "Number of records") | ||
| public Integer getNumRecords() { | ||
| return numRecords; | ||
| } | ||
|
|
||
| public void setNumRecords(Integer numRecords) { | ||
| this.numRecords = numRecords; | ||
| } | ||
|
|
||
| public AggregateResponse records(List<Aggregate> records) { | ||
| this.records = records; | ||
| return this; | ||
| } | ||
|
|
||
| public AggregateResponse addRecordsItem(Aggregate recordsItem) { | ||
| if (this.records == null) { | ||
| this.records = new ArrayList<Aggregate>(); | ||
| } | ||
| this.records.add(recordsItem); | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Get records | ||
| * @return records | ||
| **/ | ||
| @ApiModelProperty(value = "") | ||
| public List<Aggregate> getRecords() { | ||
| return records; | ||
| } | ||
|
|
||
| public void setRecords(List<Aggregate> records) { | ||
| this.records = records; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
|
There was a problem hiding this comment. for response object classes, we need not to have equals, hashcode and testing methods.
Author
There was a problem hiding this comment. removed all responses and created one generic OnTapResponse for all object which has numRecord or records |
||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| AggregateResponse aggregateResponse = (AggregateResponse) o; | ||
| return | ||
| Objects.equals(this.error, aggregateResponse.error) && | ||
| Objects.equals(this.numRecords, aggregateResponse.numRecords) && | ||
| Objects.equals(this.records, aggregateResponse.records); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(error, numRecords, records); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("class AggregateResponse {\n"); | ||
|
|
||
| sb.append(" error: ").append(toIndentedString(error)).append("\n"); | ||
| sb.append(" numRecords: ").append(toIndentedString(numRecords)).append("\n"); | ||
| sb.append(" records: ").append(toIndentedString(records)).append("\n"); | ||
| sb.append("}"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given object to string with each line indented by 4 spaces | ||
| * (except the first line). | ||
| */ | ||
| private String toIndentedString(Object o) { | ||
| if (o == null) { | ||
| return "null"; | ||
| } | ||
| return o.toString().replace("\n", "\n "); | ||
| } | ||
|
|
||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To instantiate only when required, we can use this across all the feign clients?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some feign client we need upfront like Cluster, SVM for others we will use @lazy