forked from apache/cloudstack
-
Notifications
You must be signed in to change notification settings - Fork 0
CSTACKEX-50: Disable, Re-Enable, Delete Storage pool and Enter, Exit Maintenance mode #20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sandeeplocharla
wants to merge
5
commits into
main
Choose a base branch
from
feature/CSTACKEX-050
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
eb35e8c
CSTACKEX-50: Disable, Re-Enable, Delete Storage pool and Enter, Exit …
997d03b
CSTACKEX-50: Changes for selecting aggregate, retrieving ip interface…
04617d3
CSTACKEX-50: Fixed some issues seen while testing
a2258a5
CSTACKEX-50: Fixed few EOF lint issues
5b2c577
CSTACKEX-50: Fixed few lint issues
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
16 changes: 16 additions & 0 deletions
16
...me/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NetworkFeignClient.java
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,16 @@ | ||
| package org.apache.cloudstack.storage.feign.client; | ||
|
||
|
|
||
| import feign.Headers; | ||
| import feign.Param; | ||
| import feign.QueryMap; | ||
| import feign.RequestLine; | ||
| import org.apache.cloudstack.storage.feign.model.IpInterface; | ||
| import org.apache.cloudstack.storage.feign.model.response.OntapResponse; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public interface NetworkFeignClient { | ||
| @RequestLine("GET /api/network/ip/interfaces") | ||
| @Headers({"Authorization: {authHeader}"}) | ||
| OntapResponse<IpInterface> getNetworkIpInterfaces(@Param("authHeader") String authHeader, @QueryMap Map<String, Object> queryParams); | ||
| } | ||
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
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
155 changes: 155 additions & 0 deletions
155
...age/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IpInterface.java
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,155 @@ | ||
| /* | ||
| * 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.model; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class IpInterface { | ||
| @JsonProperty("uuid") | ||
| private String uuid; | ||
|
|
||
| @JsonProperty("name") | ||
| private String name; | ||
|
|
||
| @JsonProperty("ip") | ||
| private IpInfo ip; | ||
|
|
||
| @JsonProperty("svm") | ||
| private Svm svm; | ||
|
|
||
| @JsonProperty("services") | ||
| private List<String> services; | ||
|
|
||
| // Getters and setters | ||
| public String getUuid() { | ||
| return uuid; | ||
| } | ||
|
|
||
| public void setUuid(String uuid) { | ||
| this.uuid = uuid; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public IpInfo getIp() { | ||
| return ip; | ||
| } | ||
|
|
||
| public void setIp(IpInfo ip) { | ||
| this.ip = ip; | ||
| } | ||
|
|
||
| public Svm getSvm() { | ||
| return svm; | ||
| } | ||
|
|
||
| public void setSvm(Svm svm) { | ||
| this.svm = svm; | ||
| } | ||
|
|
||
| public List<String> getServices() { | ||
| return services; | ||
| } | ||
|
|
||
| public void setServices(List<String> services) { | ||
| this.services = services; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| IpInterface that = (IpInterface) o; | ||
| return Objects.equals(uuid, that.uuid) && | ||
| Objects.equals(name, that.name) && | ||
| Objects.equals(ip, that.ip) && | ||
| Objects.equals(svm, that.svm) && | ||
| Objects.equals(services, that.services); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(uuid, name, ip, svm, services); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "IpInterface{" + | ||
| "uuid='" + uuid + '\'' + | ||
| ", name='" + name + '\'' + | ||
| ", ip=" + ip + | ||
| ", svm=" + svm + | ||
| ", services=" + services + | ||
| '}'; | ||
| } | ||
|
|
||
| // Nested class for IP information | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public static class IpInfo { | ||
| @JsonProperty("address") | ||
| private String address; | ||
|
|
||
| public String getAddress() { | ||
| return address; | ||
| } | ||
|
|
||
| public void setAddress(String address) { | ||
| this.address = address; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| IpInfo ipInfo = (IpInfo) o; | ||
| return Objects.equals(address, ipInfo.address); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(address); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "IpInfo{" + | ||
| "address='" + address + '\'' + | ||
| '}'; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
Downgrading jackson-databind from 2.15.2 to 2.13.4 may introduce known security vulnerabilities. Version 2.13.4 was released in September 2022 and several CVEs have been fixed in later versions. Consider using a more recent version or document the reason for this downgrade.