Skip to content

Display VPC name to which the network belongs to #4483

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.

Sign up for GitHub

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

Merged
yadvr merged 2 commits into from
Nov 20, 2020
Merged

Display VPC name to which the network belongs to #4483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0b8319
Display VPC name to which the network belongs to
ravening Nov 19, 2020
840d968
Change description
ravening Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
@Param(description = "VPC the network belongs to")
private String vpcId;

@SerializedName(ApiConstants.VPC_NAME)
@Param(description = "Name of the VPC to which this network belongs", since = "4.15")
private String vpcName;

@SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY)
@Param(description = "list networks available for vm deployment")
private Boolean canUseForDeploy;
Expand Down Expand Up @@ -470,4 +474,12 @@ public Boolean getRedundantRouter() {
public void setRedundantRouter(Boolean redundantRouter) {
this.redundantRouter = redundantRouter;
}

public String getVpcName() {
return vpcName;
}

public void setVpcName(String vpcName) {
this.vpcName = vpcName;
}
}
1 change: 1 addition & 0 deletions server/src/main/java/com/cloud/api/ApiResponseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2262,6 +2262,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
Vpc vpc = ApiDBUtils.findVpcById(network.getVpcId());
if (vpc != null) {
response.setVpcId(vpc.getUuid());
response.setVpcName(vpc.getName());
}
}
response.setCanUseForDeploy(ApiDBUtils.canUseForDeploy(network));
Expand Down