Skip to content

Commit 963d603

Browse files
Pearl1594Pearl Dsilva
andauthored
Fix usage record count (#4193)
Co-authored-by: Pearl Dsilva <pearl.dsilva@shapeblue.com>
1 parent d6152b3 commit 963d603

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
@@ -3412,11 +3412,6 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
34123412
if (networkId == null) {
34133413
networkId = ip.getSourceNetworkId();
34143414
}
3415-
NetworkDetailVO networkDetail = networkDetailsDao.findDetail(networkId, Network.hideIpAddressUsage);
3416-
if (networkDetail != null && networkDetail.getValue() != null && networkDetail.getValue().equals("true")) {
3417-
// Don't export network usage when admin wants it hidden
3418-
return null;
3419-
}
34203415
resourceType = ResourceObjectType.PublicIpAddress;
34213416
resourceId = ip.getId();
34223417
usageRecResponse.setUsageId(ip.getUuid());

0 commit comments

Comments
 (0)