Google GitGoogle Git
Sign in
apache/cloudstack/refs/heads/fix-vm-deployment-issue^!/.
commit
fdc4ee00e41b12c6307b6d49dd512a5c77587d0e
[log]
author
Daan Hoogland <dahn@apache.org>
Tue Aug 25 21:25:51 2026 +0200
committer
Daan Hoogland <dahn@apache.org>
Tue Aug 25 21:25:51 2026 +0200
tree
baaa1f6e96332ef2ac5c04a1ee81313bcd86bbd0
parent
b95cdce93e099138dbfed454ea22a062303f6f65 [diff]
static calls as required by sonarqube

diff --git a/plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java b/plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
index 6dbde01..14c96cc 100644
--- a/plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
+++ b/plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java

@@ -39,6 +39,11 @@
 import com.cloud.utils.Pair;
 import com.cloud.vm.VirtualMachineProfile;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.class)
 public class RandomAllocatorTest {
 
@@ -55,23 +60,23 @@
         Long id = 1L;
         String templateTag = "tag1";
         String offeringTag = "tag2";
-        HostVO host1 = Mockito.mock(HostVO.class);
-        HostVO host2 = Mockito.mock(HostVO.class);
-        Mockito.when(hostDao.listByHostTag(type, id, id, id, offeringTag)).thenReturn(List.of(host1, host2));
+        HostVO host1 = mock(HostVO.class);
+        HostVO host2 = mock(HostVO.class);
+        when(hostDao.listByHostTag(type, id, id, id, offeringTag)).thenReturn(List.of(host1, host2));
 
         // No template tagged host
-        Mockito.when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(new ArrayList<>());
+        when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(new ArrayList<>());
         List<HostVO> result = randomAllocator.listHostsByTags(type, id, id, id, offeringTag, templateTag);
         Assert.assertTrue(CollectionUtils.isEmpty(result));
 
         // Different template tagged host
-        HostVO host3 = Mockito.mock(HostVO.class);
-        Mockito.when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(List.of(host3));
+        HostVO host3 = mock(HostVO.class);
+        when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(List.of(host3));
         result = randomAllocator.listHostsByTags(type, id, id, id, offeringTag, templateTag);
         Assert.assertTrue(CollectionUtils.isEmpty(result));
 
         // Matching template tagged host
-        Mockito.when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(List.of(host1));
+        when(hostDao.listByHostTag(type, id, id, id, templateTag)).thenReturn(List.of(host1));
         result = randomAllocator.listHostsByTags(type, id, id, id, offeringTag, templateTag);
         Assert.assertFalse(CollectionUtils.isEmpty(result));
         Assert.assertEquals(1, result.size());
@@ -95,28 +100,28 @@
         Long clusterId = 3L;
         String offeringTag = "compute";
 
-        DeploymentPlan plan = Mockito.mock(DeploymentPlan.class);
-        Mockito.when(plan.getDataCenterId()).thenReturn(dcId);
-        Mockito.when(plan.getPodId()).thenReturn(podId);
-        Mockito.when(plan.getClusterId()).thenReturn(clusterId);
+        DeploymentPlan plan = mock(DeploymentPlan.class);
+        when(plan.getDataCenterId()).thenReturn(dcId);
+        when(plan.getPodId()).thenReturn(podId);
+        when(plan.getClusterId()).thenReturn(clusterId);
 
-        VirtualMachineProfile vmProfile = Mockito.mock(VirtualMachineProfile.class);
-        ServiceOffering offering = Mockito.mock(ServiceOffering.class);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
-        Mockito.when(vmProfile.getServiceOffering()).thenReturn(offering);
-        Mockito.when(vmProfile.getTemplate()).thenReturn(template);
-        Mockito.when(offering.getHostTag()).thenReturn(offeringTag);
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        ServiceOffering offering = mock(ServiceOffering.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        when(vmProfile.getServiceOffering()).thenReturn(offering);
+        when(vmProfile.getTemplate()).thenReturn(template);
+        when(offering.getHostTag()).thenReturn(offeringTag);
 
-        HostVO host = Mockito.mock(HostVO.class);
+        HostVO host = mock(HostVO.class);
         List<Host> hosts = List.of(host);
-        Mockito.when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(List.of(host));
-        Mockito.when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
-        Mockito.when(capacityManager.checkIfHostHasCpuCapabilityAndCapacity(host, offering, true)).thenReturn(new Pair<>(true, true));
+        when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(List.of(host));
+        when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
+        when(capacityManager.checkIfHostHasCpuCapabilityAndCapacity(host, offering, true)).thenReturn(new Pair<>(true, true));
 
         List<Host> result = randomAllocator.allocateTo(vmProfile, plan, type, new ExcludeList(), hosts, 1, true);
 
         Assert.assertEquals(1, result.size());
-        Mockito.verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
-        Mockito.verify(hostDao, Mockito.never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
+        verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
+        verify(hostDao, never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
     }
 }

diff --git a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
index a9ddda8..7c10e94 100644
--- a/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java
+++ b/server/src/test/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocatorTest.java

@@ -39,6 +39,12 @@
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.UserVmDetailsDao;
 
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.class)
 public class FirstFitAllocatorTest {
 
@@ -58,32 +64,32 @@
         Long clusterId = 3L;
         String offeringTag = "compute";
 
-        DeploymentPlan plan = Mockito.mock(DeploymentPlan.class);
-        Mockito.when(plan.getDataCenterId()).thenReturn(dcId);
-        Mockito.when(plan.getPodId()).thenReturn(podId);
-        Mockito.when(plan.getClusterId()).thenReturn(clusterId);
+        DeploymentPlan plan = mock(DeploymentPlan.class);
+        when(plan.getDataCenterId()).thenReturn(dcId);
+        when(plan.getPodId()).thenReturn(podId);
+        when(plan.getClusterId()).thenReturn(clusterId);
 
-        VirtualMachineProfile vmProfile = Mockito.mock(VirtualMachineProfile.class);
-        ServiceOffering offering = Mockito.mock(ServiceOffering.class);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
-        Account account = Mockito.mock(Account.class);
-        Mockito.when(vmProfile.getServiceOffering()).thenReturn(offering);
-        Mockito.when(vmProfile.getTemplate()).thenReturn(template);
-        Mockito.when(vmProfile.getOwner()).thenReturn(account);
-        Mockito.when(offering.getHostTag()).thenReturn(offeringTag);
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        ServiceOffering offering = mock(ServiceOffering.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        Account account = mock(Account.class);
+        when(vmProfile.getServiceOffering()).thenReturn(offering);
+        when(vmProfile.getTemplate()).thenReturn(template);
+        when(vmProfile.getOwner()).thenReturn(account);
+        when(offering.getHostTag()).thenReturn(offeringTag);
 
-        HostVO host = Mockito.mock(HostVO.class);
+        HostVO host = mock(HostVO.class);
         List<Host> selectedHosts = List.of(host);
-        Mockito.when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(List.of(host));
-        Mockito.when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
-        Mockito.doReturn(selectedHosts).when(firstFitAllocator).allocateTo(
+        when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(List.of(host));
+        when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
+        doReturn(selectedHosts).when(firstFitAllocator).allocateTo(
                 Mockito.eq(plan), Mockito.eq(offering), Mockito.eq(template), Mockito.any(ExcludeList.class), Mockito.anyList(), Mockito.eq(1), Mockito.eq(true), Mockito.eq(account));
 
         List<Host> result = firstFitAllocator.allocateTo(vmProfile, plan, type, new ExcludeList(), selectedHosts, 1, true);
 
         Assert.assertEquals(1, result.size());
-        Mockito.verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
-        Mockito.verify(hostDao, Mockito.never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
+        verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
+        verify(hostDao, never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
     }
 
     @Test
@@ -94,33 +100,33 @@
         Long clusterId = 3L;
         String offeringTag = "compute";
 
-        DeploymentPlan plan = Mockito.mock(DeploymentPlan.class);
-        Mockito.when(plan.getDataCenterId()).thenReturn(dcId);
-        Mockito.when(plan.getPodId()).thenReturn(podId);
-        Mockito.when(plan.getClusterId()).thenReturn(clusterId);
+        DeploymentPlan plan = mock(DeploymentPlan.class);
+        when(plan.getDataCenterId()).thenReturn(dcId);
+        when(plan.getPodId()).thenReturn(podId);
+        when(plan.getClusterId()).thenReturn(clusterId);
 
-        VirtualMachineProfile vmProfile = Mockito.mock(VirtualMachineProfile.class);
-        ServiceOffering offering = Mockito.mock(ServiceOffering.class);
-        VMTemplateVO template = Mockito.mock(VMTemplateVO.class);
-        Account account = Mockito.mock(Account.class);
-        Mockito.when(vmProfile.getServiceOffering()).thenReturn(offering);
-        Mockito.when(vmProfile.getTemplate()).thenReturn(template);
-        Mockito.when(vmProfile.getOwner()).thenReturn(account);
-        Mockito.when(offering.getHostTag()).thenReturn(offeringTag);
-        Mockito.when(userVmDetailsDao.findDetail(Mockito.anyLong(), Mockito.eq("UEFI"))).thenReturn(null);
+        VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+        ServiceOffering offering = mock(ServiceOffering.class);
+        VMTemplateVO template = mock(VMTemplateVO.class);
+        Account account = mock(Account.class);
+        when(vmProfile.getServiceOffering()).thenReturn(offering);
+        when(vmProfile.getTemplate()).thenReturn(template);
+        when(vmProfile.getOwner()).thenReturn(account);
+        when(offering.getHostTag()).thenReturn(offeringTag);
+        when(userVmDetailsDao.findDetail(Mockito.anyLong(), Mockito.eq("UEFI"))).thenReturn(null);
 
-        HostVO host = Mockito.mock(HostVO.class);
+        HostVO host = mock(HostVO.class);
         List<Host> selectedHosts = List.of(host);
-        Mockito.when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(new ArrayList<>(List.of(host)));
-        Mockito.when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
-        Mockito.when(hostDao.listAllUpAndEnabledNonHAHosts(type, clusterId, podId, dcId, null)).thenReturn(new ArrayList<>());
-        Mockito.doReturn(selectedHosts).when(firstFitAllocator).allocateTo(
+        when(hostDao.listByHostTag(type, clusterId, podId, dcId, offeringTag)).thenReturn(new ArrayList<>(List.of(host)));
+        when(hostDao.findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId)).thenReturn(new ArrayList<>());
+        when(hostDao.listAllUpAndEnabledNonHAHosts(type, clusterId, podId, dcId, null)).thenReturn(new ArrayList<>());
+        doReturn(selectedHosts).when(firstFitAllocator).allocateTo(
                 Mockito.eq(plan), Mockito.eq(offering), Mockito.eq(template), Mockito.any(ExcludeList.class), Mockito.anyList(), Mockito.eq(1), Mockito.eq(true), Mockito.eq(account));
 
         List<Host> result = firstFitAllocator.allocateTo(vmProfile, plan, type, new ExcludeList(), 1, true);
 
         Assert.assertEquals(1, result.size());
-        Mockito.verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
-        Mockito.verify(hostDao, Mockito.never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
+        verify(hostDao).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag, clusterId, podId, dcId);
+        verify(hostDao, never()).findHostsWithTagRuleThatMatchComputeOferringTags(offeringTag);
     }
 }