apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.13' into 4.14

Browse Source
This commit is contained in:
Daan Hoogland 2020-10-30 10:03:56 +01:00
commit b0d300c681
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
View File

@ -181,7 +181,7 @@ public class ListUsageRecordsCmd extends BaseListCmd {
} }
} }
response.setResponses(usageResponses, usageResponses.size()); response.setResponses(usageResponses, usageRecords.second());
} }
response.setResponseName(getCommandName()); response.setResponseName(getCommandName());

5
server/src/main/java/com/cloud/api/ApiResponseHelper.java
View File

@ -3429,11 +3429,6 @@ public class ApiResponseHelper implements ResponseGenerator {
if (networkId == null) { if (networkId == null) {
networkId = ip.getSourceNetworkId(); networkId = ip.getSourceNetworkId();
} }
NetworkDetailVO networkDetail = networkDetailsDao.findDetail(networkId, Network.hideIpAddressUsage);
if (networkDetail != null && networkDetail.getValue() != null && networkDetail.getValue().equals("true")) {
// Don't export network usage when admin wants it hidden
return null;
}
resourceType = ResourceObjectType.PublicIpAddress; resourceType = ResourceObjectType.PublicIpAddress;
resourceId = ip.getId(); resourceId = ip.getId();
usageRecResponse.setUsageId(ip.getUuid()); usageRecResponse.setUsageId(ip.getUuid());