From 5b5a2e54dd2016481385d3b8558f23280d5047d1 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl.dsilva@shapeblue.com>
Date: Wed, 1 Jul 2020 17:50:25 +0530
Subject: [PATCH 1/2] Fix usage record count fix

---
 .../cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
index a5199ece9443..748b9d7b8bb7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
@@ -181,7 +181,7 @@ public void execute() {
                 }
             }
 
-            response.setResponses(usageResponses, usageResponses.size());
+            response.setResponses(usageResponses, usageRecords.second());
         }
 
         response.setResponseName(getCommandName());

From f5dd55c334e5319b33d5c1803c3df4ccf104185b Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl.dsilva@shapeblue.com>
Date: Thu, 17 Sep 2020 09:45:59 +0530
Subject: [PATCH 2/2] fix usage record

---
 server/src/main/java/com/cloud/api/ApiResponseHelper.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index 05c1ab09538f..e01b0e4c76bc 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -3406,11 +3406,6 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
                 if (networkId == null) {
                     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;
                 resourceId = ip.getId();
                 usageRecResponse.setUsageId(ip.getUuid());