Display acl name in listNetworks response (apache#4317)

ravening · web-flow · commit 43a25c78f65f · 2020-09-11T14:36:20.000+02:00
* 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
diff --git 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
@@ -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 Boolean getRedundantRouter() {
     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
@@ -2279,6 +2279,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)
             NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId());
             if (acl != null) {
                 response.setAclId(acl.getUuid());
+                response.setAclName(acl.getName());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2279,6 +2279,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network)`
`2279`	`2279`	`NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId());`
`2280`	`2280`	`if (acl != null) {`
`2281`	`2281`	`response.setAclId(acl.getUuid());`
	`2282`	`+ response.setAclName(acl.getName());`
`2282`	`2283`	`}`
`2283`	`2284`	`}`
`2284`	`2285`