Allow domain admins and users to use keyword

Author: winterhazel

plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java

@@ -198,7 +198,7 @@ public Pair<List<QuotaSummaryResponse>, Integer> createQuotaSummaryResponse(Quot
         Account caller = CallContext.current().getCallingAccount();
 
         if (!accountTypesThatCanListAllQuotaSummaries.contains(caller.getType()) || !cmd.isListAll()) {
-            return getQuotaSummaryResponse(cmd.getEntityOwnerId(), null, null, null, cmd);
+            return getQuotaSummaryResponse(cmd.getEntityOwnerId(), null, null, cmd);
         }
 
         return getQuotaSummaryResponseWithListAll(cmd, caller);
@@ -221,12 +221,7 @@ protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponseWithL
             accountId = cmd.isListAll() ? null : caller.getAccountId();
         }
 
-        String keyword = null;
-        if (Account.Type.ADMIN.equals(caller.getType())) {
-            keyword = cmd.getKeyword();
-        }
-
-        return getQuotaSummaryResponse(accountId, keyword, domainId, domainPath, cmd);
+        return getQuotaSummaryResponse(accountId, domainId, domainPath, cmd);
     }
 
     /**
@@ -250,13 +245,13 @@ protected String getDomainPathByDomainIdForDomainAdmin(Account caller) {
         return domain.getPath();
     }
 
-    protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponse(Long accountId, String accountName, Long domainId, String domainPath, QuotaSummaryCmd cmd) {
+    protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponse(Long accountId, Long domainId, String domainPath, QuotaSummaryCmd cmd) {
         if (accountId != null && accountId == -1) {
             // Either no specific account as provided, or list all is disabled
             accountId = CallContext.current().getCallingAccountId();
         }
 
-        Pair<List<QuotaSummaryVO>, Integer> pairSummaries = quotaSummaryDao.listQuotaSummariesForAccountAndOrDomain(accountId, accountName, domainId, domainPath,
+        Pair<List<QuotaSummaryVO>, Integer> pairSummaries = quotaSummaryDao.listQuotaSummariesForAccountAndOrDomain(accountId, cmd.getKeyword(), domainId, domainPath,
                 cmd.getAccountStateToShow(), cmd.getStartIndex(), cmd.getPageSizeVal());
         List<QuotaSummaryVO> summaries = pairSummaries.first();
 

plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java

@@ -550,7 +550,7 @@ public void createQuotaSummaryResponseTestNotListAllAndAllAccountTypesReturnsSin
 
             Mockito.doReturn(accountMock).when(callContextMock).getCallingAccount();
 
-            Mockito.doReturn(quotaSummaryResponseMock1).when(quotaResponseBuilderSpy).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
+            Mockito.doReturn(quotaSummaryResponseMock1).when(quotaResponseBuilderSpy).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
 
             for (Account.Type type : Account.Type.values()) {
                 Mockito.doReturn(type).when(accountMock).getType();
@@ -559,7 +559,7 @@ public void createQuotaSummaryResponseTestNotListAllAndAllAccountTypesReturnsSin
                 Assert.assertEquals(quotaSummaryResponseMock1, result);
             }
 
-            Mockito.verify(quotaResponseBuilderSpy, Mockito.times(Account.Type.values().length)).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any(),
+            Mockito.verify(quotaResponseBuilderSpy, Mockito.times(Account.Type.values().length)).getQuotaSummaryResponse(Mockito.any(), Mockito.any(), Mockito.any(),
                     Mockito.any());
         };
     }