From f0b83196b3a1f79235d5d8f4bbd741f10cdf7b09 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Thu, 19 Nov 2020 16:37:52 +0100 Subject: [PATCH 1/2] Display VPC name to which the network belongs to If an isolated network is created in VPC then display its name along with vpc id which is used for UI --- .../cloudstack/api/response/NetworkResponse.java | 12 ++++++++++++ .../main/java/com/cloud/api/ApiResponseHelper.java | 1 + 2 files changed, 13 insertions(+) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java index 1b6821248a39..e6bb268dfec6 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java @@ -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 = "VPC name of the network", since = "4.15") + private String vpcName; + @SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY) @Param(description = "list networks available for vm deployment") private Boolean canUseForDeploy; @@ -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; + } } diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index baac70711e70..e07a94c44b49 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -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)); From 840d96884f1a7b815e82535f63537d31650a3f3d Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Fri, 20 Nov 2020 09:42:51 +0100 Subject: [PATCH 2/2] Change description --- .../org/apache/cloudstack/api/response/NetworkResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java index e6bb268dfec6..a1337144a6ca 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java @@ -191,7 +191,7 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes private String vpcId; @SerializedName(ApiConstants.VPC_NAME) - @Param(description = "VPC name of the network", since = "4.15") + @Param(description = "Name of the VPC to which this network belongs", since = "4.15") private String vpcName; @SerializedName(ApiConstants.CAN_USE_FOR_DEPLOY)