Skip to content

Commit 4f03b2a

Browse files
Pearl1594Pearl Dsilva
andcommitted
Fix usage record count (apache#4193)
Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
1 parent 2d1989f commit 4f03b2a

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void execute() {
181181
}
182182
}
183183

184-
response.setResponses(usageResponses, usageResponses.size());
184+
response.setResponses(usageResponses, usageRecords.second());
185185
}
186186

187187
response.setResponseName(getCommandName());

server/src/main/java/com/cloud/api/ApiResponseHelper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3436,11 +3436,6 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
34363436
if (networkId == null) {
34373437
networkId = ip.getSourceNetworkId();
34383438
}
3439-
NetworkDetailVO networkDetail = networkDetailsDao.findDetail(networkId, Network.hideIpAddressUsage);
3440-
if (networkDetail != null && networkDetail.getValue() != null && networkDetail.getValue().equals("true")) {
3441-
// Don't export network usage when admin wants it hidden
3442-
return null;
3443-
}
34443439
resourceType = ResourceObjectType.PublicIpAddress;
34453440
resourceId = ip.getId();
34463441
usageRecResponse.setUsageId(ip.getUuid());

0 commit comments

Comments
 (0)