Fix VM and volume metrics listing regression

Author: winterhazel

plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java

@@ -256,7 +256,7 @@ protected Pair<List<UserVmVO>, Integer> searchForUserVmsInternal(ListVMsUsageHis
         List<Long> permittedAccounts = new ArrayList<>();
         boolean recursive = AccountTypesWithRecursiveUsageAccess.contains(caller.getType());
         Ternary<Long, Boolean, Project.ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(null, recursive, null);
-        accountMgr.buildACLSearchParameters(caller, id, null, null, permittedAccounts, domainIdRecursiveListProject, true, false);
+        accountMgr.buildACLSearchParameters(caller, id, null, -1L, permittedAccounts, domainIdRecursiveListProject, true, false);
         Long domainId = domainIdRecursiveListProject.first();
         Boolean isRecursive = domainIdRecursiveListProject.second();
         Project.ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
@@ -362,7 +362,7 @@ protected Pair<List<VolumeVO>, Integer> searchForVolumesInternal(ListVolumesUsag
         List<Long> permittedAccounts = new ArrayList<>();
         boolean recursive = AccountTypesWithRecursiveUsageAccess.contains(caller.getType());
         Ternary<Long, Boolean, Project.ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<>(null, recursive, null);
-        accountMgr.buildACLSearchParameters(caller, id, null, null, permittedAccounts, domainIdRecursiveListProject, true, false);
+        accountMgr.buildACLSearchParameters(caller, id, null, -1L, permittedAccounts, domainIdRecursiveListProject, true, false);
         Long domainId = domainIdRecursiveListProject.first();
         Boolean isRecursive = domainIdRecursiveListProject.second();
         Project.ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();