(cloudstack) branch main updated: engine-schema,test: fix domain searchbuilder, test check (#8725)

[shwstppr]

This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 68a3e9e8398 engine-schema,test: fix domain searchbuilder, test check 
(#8725)
68a3e9e8398 is described below

commit 68a3e9e83985baca8c6538dbc538dc82d7520175
Author: Abhishek Kumar <abhishek.mr...@gmail.com>
AuthorDate: Fri Mar 1 16:54:50 2024 +0530

    engine-schema,test: fix domain searchbuilder, test check (#8725)
    
    The SearchBuilder listDomainAndTypeAndNoTagSearch in 
ReservationDaoImpl.java is wrongly created by adding ACCOUNT_ID as part of the 
search param. Instead it should be DOMAIN_ID.
    Additional fixes in test cases to:
    - add assert
    - add spacing
---
 .../src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java     | 4 ++--
 .../org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java     | 2 +-
 server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
 
b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
index 82ddce10958..e357c062c17 100644
--- 
a/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
+++ 
b/engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java
@@ -1131,7 +1131,7 @@ public class VirtualMachineManagerImplTest {
         poolListMock.add(storagePoolVoMock);
         
Mockito.doReturn(poolListMock).when(storagePoolAllocatorMock).allocateToPool(any(DiskProfile.class),
 any(VirtualMachineProfile.class), any(DeploymentPlan.class),
                 any(ExcludeList.class), Mockito.eq(1));
-        boolean result = 
virtualMachineManagerImpl.isDiskOfferingSuitableForVm(vmInstanceMock, 
virtualMachineProfileMock, 1L, 1L,1L, 1L);
+        boolean result = 
virtualMachineManagerImpl.isDiskOfferingSuitableForVm(vmInstanceMock, 
virtualMachineProfileMock, 1L, 1L, 1L, 1L);
         assertTrue(result);
     }
 
@@ -1140,7 +1140,7 @@ public class VirtualMachineManagerImplTest {
         
Mockito.doReturn(Mockito.mock(DiskOfferingVO.class)).when(diskOfferingDaoMock).findById(anyLong());
         Mockito.doReturn(new 
ArrayList<>()).when(storagePoolAllocatorMock).allocateToPool(any(DiskProfile.class),
 any(VirtualMachineProfile.class), any(DeploymentPlan.class),
                 any(ExcludeList.class), Mockito.eq(1));
-        boolean result = 
virtualMachineManagerImpl.isDiskOfferingSuitableForVm(vmInstanceMock, 
virtualMachineProfileMock, 1L, 1L,1L, 1L);
+        boolean result = 
virtualMachineManagerImpl.isDiskOfferingSuitableForVm(vmInstanceMock, 
virtualMachineProfileMock, 1L, 1L, 1L, 1L);
         assertFalse(result);
     }
 
diff --git 
a/engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
 
b/engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
index 5239aa50ad0..011262afe39 100644
--- 
a/engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
+++ 
b/engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
@@ -59,7 +59,7 @@ public class ReservationDaoImpl extends 
GenericDaoBase<ReservationVO, Long> impl
         listDomainAndTypeSearch.done();
 
         listDomainAndTypeAndNoTagSearch = createSearchBuilder();
-        listDomainAndTypeAndNoTagSearch.and(ACCOUNT_ID, 
listDomainAndTypeAndNoTagSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
+        listDomainAndTypeAndNoTagSearch.and(DOMAIN_ID, 
listDomainAndTypeAndNoTagSearch.entity().getDomainId(), SearchCriteria.Op.EQ);
         listDomainAndTypeAndNoTagSearch.and(RESOURCE_TYPE, 
listDomainAndTypeAndNoTagSearch.entity().getResourceType(), 
SearchCriteria.Op.EQ);
         listDomainAndTypeAndNoTagSearch.and(RESOURCE_TAG, 
listDomainAndTypeAndNoTagSearch.entity().getTag(), SearchCriteria.Op.NULL);
         listDomainAndTypeAndNoTagSearch.done();
diff --git a/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java 
b/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
index 09fcde24d79..35c54a2f6d8 100644
--- a/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
+++ b/server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
@@ -348,7 +348,7 @@ public class QueryManagerImplTest {
 
     @Test
     public void 
testGetHostTagsFromTemplateForServiceOfferingsListingNoTemplateId() {
-        
CollectionUtils.isEmpty(queryManager.getHostTagsFromTemplateForServiceOfferingsListing(Mockito.mock(AccountVO.class),
 null));
+        
Assert.assertTrue(CollectionUtils.isEmpty(queryManager.getHostTagsFromTemplateForServiceOfferingsListing(Mockito.mock(AccountVO.class),
 null)));
     }
 
     @Test(expected = InvalidParameterValueException.class)