Skip to content

Adding acl name to listNetworkAcl, listNetwork, listPrivateGateway, listVpcs responses #4315

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 1 commit into from
Sep 17, 2020
Merged

Adding acl name to listNetworkAcl, listNetwork, listPrivateGateway, listVpcs responses #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ public class NetworkACLItemResponse extends BaseResponse {
@Param(description = "the ID of the ACL this item belongs to")
private String aclId;

@SerializedName(ApiConstants.ACL_NAME)
@Param(description = "the name of the ACL this item belongs to")
private String aclName;

@SerializedName(ApiConstants.NUMBER)
@Param(description = "Number of the ACL Item")
private Integer number;
Expand Down Expand Up @@ -133,6 +137,10 @@ public void setAclId(String aclId) {
this.aclId = aclId;
}

public void setAclName(String aclName) {
this.aclName = aclName;
}

public void setNumber(Integer number) {
this.number = number;
}
Expand Down
24 changes: 12 additions & 12 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 @@ -222,6 +222,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes
@Param(description = "ACL Id associated with the VPC network")
private String aclId;

@SerializedName(ApiConstants.ACL_NAME)
@Param(description = "ACL name associated with the VPC network")
private String aclName;

@SerializedName(ApiConstants.STRECHED_L2_SUBNET)
@Param(description = "true if network can span multiple zones", since = "4.4")
private Boolean strechedL2Subnet;
Expand All @@ -238,10 +242,6 @@ 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;
}
Expand Down Expand Up @@ -443,6 +443,14 @@ public void setAclId(String aclId) {
this.aclId = aclId;
}

public String getAclName() {
return aclName;
}

public void setAclName(String aclName) {
this.aclName = aclName;
}

public void setStrechedL2Subnet(Boolean strechedL2Subnet) {
this.strechedL2Subnet = strechedL2Subnet;
}
Expand All @@ -462,12 +470,4 @@ public Boolean getRedundantRouter() {
public void setRedundantRouter(Boolean redundantRouter) {
this.redundantRouter = redundantRouter;
}

public String getAclName() {
return aclName;
}

public void setAclName(String aclName) {
this.aclName = aclName;
}
}
8 changes: 8 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn
@Param(description = "ACL Id set for private gateway")
private String aclId;

@SerializedName(ApiConstants.ACL_NAME)
@Param(description = "ACL name set for private gateway")
private String aclName;

@Override
public String getObjectId() {
return this.id;
Expand Down Expand Up @@ -183,4 +187,8 @@ public void setAclId(String aclId) {
this.aclId = aclId;
}

public void setAclName(String aclName) {
this.aclName = aclName;
}

}
2 changes: 2 additions & 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 @@ -2409,6 +2409,7 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte
NetworkACL acl = ApiDBUtils.findByNetworkACLId(aclItem.getAclId());
if (acl != null) {
response.setAclId(acl.getUuid());
response.setAclName(acl.getName());
}

//set tag information
Expand Down Expand Up @@ -3003,6 +3004,7 @@ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result
NetworkACL acl = ApiDBUtils.findByNetworkACLId(result.getNetworkACLId());
if (acl != null) {
response.setAclId(acl.getUuid());
response.setAclName(acl.getName());
}

response.setObjectName("privategateway");
Expand Down