fix limit count of user_vm

Author: Gabriel

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -7312,7 +7312,7 @@ public UserVm moveVmToUser(final AssignVMCmd cmd) throws ResourceAllocationExcep
         final ServiceOfferingVO offering = serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId());
         VirtualMachineTemplate template = _templateDao.findByIdIncludingRemoved(vm.getTemplateId());
 
-        verifyResourceLimitsForAccountAndStorage(newAccount, vm, vmId, offering, volumes, template);
+        verifyResourceLimitsForAccountAndStorage(newAccount, vm, offering, volumes, template);
 
         validateIfNewOwnerHasAccessToTemplate(vm, newAccount, template);
 
@@ -7393,17 +7393,18 @@ protected void validateIfVolumesHaveNoSnapshots(List<VolumeVO> volumes) throws I
      * If any limit is exceeded, throws a {@link ResourceAllocationException}.
      * @param account The account to check if CPU and RAM limit has been exceeded.
      * @param vm The VM which can exceed resource limits.
-     * @param vmId The ID for the VM which can exceed resource limits.
      * @param offering The service offering which can exceed resource limits.
      * @param volumes The volumes whose total size can exceed resource limits.
      * @throws ResourceAllocationException
      */
-    protected void verifyResourceLimitsForAccountAndStorage(Account account, UserVmVO vm, Long vmId, ServiceOfferingVO offering, List<VolumeVO> volumes, VirtualMachineTemplate template)
+    protected void verifyResourceLimitsForAccountAndStorage(Account account, UserVmVO vm, ServiceOfferingVO offering, List<VolumeVO> volumes, VirtualMachineTemplate template)
             throws ResourceAllocationException {
 
         logger.trace(String.format("Verifying if CPU and RAM for VM [%s] do not exceed account [%s] limit.", vm, account));
 
-        resourceCountIncrement(account.getAccountId(), vm.isDisplayVm(), offering, template);
+        if (!VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
+            resourceLimitService.checkVmResourceLimit(account, vm.isDisplayVm(), offering, template);
+        }
 
         logger.trace(String.format("Verifying if volume size for VM [%s] does not exceed account [%s] limit.", vm, account));
 

server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java

@@ -601,7 +601,7 @@ private void configureDoNothingForMethodsThatWeDoNotWantToTest() throws Resource
         Mockito.doNothing().when(userVmManagerImpl).validateOldAndNewAccounts(Mockito.nullable(Account.class), Mockito.nullable(Account.class), Mockito.anyLong(), Mockito.nullable(String.class), Mockito.nullable(Long.class));
         Mockito.doNothing().when(userVmManagerImpl).validateIfVmHasNoRules(Mockito.any(), Mockito.anyLong());
         Mockito.doNothing().when(userVmManagerImpl).removeInstanceFromInstanceGroup(Mockito.anyLong());
-        Mockito.doNothing().when(userVmManagerImpl).verifyResourceLimitsForAccountAndStorage(Mockito.any(), Mockito.any(), Mockito.anyLong(), Mockito.any(), Mockito.anyList(), Mockito.any());
+        Mockito.doNothing().when(userVmManagerImpl).verifyResourceLimitsForAccountAndStorage(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyList(), Mockito.any());
         Mockito.doNothing().when(userVmManagerImpl).validateIfNewOwnerHasAccessToTemplate(Mockito.any(), Mockito.any(), Mockito.any());
 
         Mockito.doNothing().when(userVmManagerImpl).updateVmOwner(Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
@@ -1872,7 +1872,7 @@ public void validateIfVmHasNoRulesTestOneToOneNatRulesDoNotExistDoesNotThrowInva
     public void verifyResourceLimitsForAccountAndStorageTestDoesNotCallResourceLimitCheck() throws ResourceAllocationException {
         LinkedList<VolumeVO> volumeVoList = new LinkedList<VolumeVO>();
 
-        userVmManagerImpl.verifyResourceLimitsForAccountAndStorage(accountMock, userVmVoMock, 1l, serviceOfferingVoMock, volumeVoList, virtualMachineTemplateMock);
+        userVmManagerImpl.verifyResourceLimitsForAccountAndStorage(accountMock, userVmVoMock, serviceOfferingVoMock, volumeVoList, virtualMachineTemplateMock);
 
          Mockito.verify(resourceLimitMgr, Mockito.never()).checkVmResourceLimit(Mockito.any(), Mockito.anyBoolean(), Mockito.any(), Mockito.any());
 
@@ -2931,7 +2931,7 @@ public void moveVmToUserTestVerifyResourceLimitsForAccountAndStorageThrowsResour
 
         configureDoNothingForMethodsThatWeDoNotWantToTest();
 
-        Mockito.doThrow(ResourceAllocationException.class).when(userVmManagerImpl).verifyResourceLimitsForAccountAndStorage(Mockito.any(), Mockito.any(), Mockito.anyLong(),
+        Mockito.doThrow(ResourceAllocationException.class).when(userVmManagerImpl).verifyResourceLimitsForAccountAndStorage(Mockito.any(), Mockito.any(),
                 Mockito.any(), Mockito.any(), Mockito.any());
 
         Assert.assertThrows(ResourceAllocationException.class, () -> userVmManagerImpl.moveVmToUser(assignVmCmdMock));