You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/09/11 12:36:42 UTC
[cloudstack] branch master updated: Display acl name in
listNetworks response (#4317)
This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 43a25c7 Display acl name in listNetworks response (#4317)
43a25c7 is described below
commit 43a25c78f65f1f300e61ac57bf2b4f9ad4c74ca7
Author: Rakesh <ra...@gmail.com>
AuthorDate: Fri Sep 11 14:36:20 2020 +0200
Display acl name in listNetworks response (#4317)
* Display acl name in listNetworks response
Display acl name along with its id so that we
dont need to make extra api call to get acl name
* Add since tag
---
.../main/java/org/apache/cloudstack/api/ApiConstants.java | 1 +
.../org/apache/cloudstack/api/response/NetworkResponse.java | 12 ++++++++++++
server/src/main/java/com/cloud/api/ApiResponseHelper.java | 1 +
3 files changed, 14 insertions(+)
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
index 630db73..df28455 100644
--- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -719,6 +719,7 @@ public class ApiConstants {
public static final String AFFINITY_GROUP_ID = "affinitygroupid";
public static final String DEPLOYMENT_PLANNER = "deploymentplanner";
public static final String ACL_ID = "aclid";
+ public static final String ACL_NAME = "aclname";
public static final String NUMBER = "number";
public static final String IS_DYNAMICALLY_SCALABLE = "isdynamicallyscalable";
public static final String ROUTING = "isrouting";
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 84a5aaa..4079ab3 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
@@ -238,6 +238,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
@Param(description = "If the network has redundant routers enabled", since = "4.11.1")
private Boolean redundantRouter;
+ @SerializedName(ApiConstants.ACL_NAME)
+ @Param(description = "ACL name associated with the VPC network", since = "4.15.0")
+ private String aclName;
+
public Boolean getDisplayNetwork() {
return displayNetwork;
}
@@ -458,4 +462,12 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
public void setRedundantRouter(Boolean redundantRouter) {
this.redundantRouter = redundantRouter;
}
+
+ public String getAclName() {
+ return aclName;
+ }
+
+ public void setAclName(String aclName) {
+ this.aclName = aclName;
+ }
}
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index be35c4b..201ea1c 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -2279,6 +2279,7 @@ public class ApiResponseHelper implements ResponseGenerator {
NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId());
if (acl != null) {
response.setAclId(acl.getUuid());
+ response.setAclName(acl.getName());
}
}