Fix tests

Author: hsato03

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

@@ -2228,15 +2228,9 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
         });
     }
 
-    protected boolean existsVpcDomainRouterWithSufficientNicCapacity(long vpcId) {
-        DomainRouterVO vpcDomainRouter = routerDao.findOneByVpcId(vpcId);
-
-        if (vpcDomainRouter == null) {
-            return false;
-        }
-
+    protected boolean existsVpcDomainRouterWithSufficientNicCapacity(DomainRouterVO vpcDomainRouter) {
         int countRouterDefaultNetworks = domainRouterJoinDao.countDefaultNetworksById(vpcDomainRouter.getId());
-        long countVpcNetworks = _ntwkDao.countVpcNetworks(vpcId);
+        long countVpcNetworks = _ntwkDao.countVpcNetworks(vpcDomainRouter.getVpcId());
 
         Integer routerMaxNicsValue = networkOrchestrationService.getVirtualMachineMaxNicsValue(vpcDomainRouter);
 
@@ -2259,7 +2253,13 @@ protected void checkIfVpcNumberOfTiersIsNotExceeded(long vpcId, Account account)
     }
 
     protected void checkIfVpcHasDomainRouterWithSufficientNicCapacity(Vpc vpc) {
-        if (!existsVpcDomainRouterWithSufficientNicCapacity(vpc.getId())) {
+        DomainRouterVO vpcDomainRouter = routerDao.findOneByVpcId(vpc.getId());
+        if (vpcDomainRouter == null) {
+            logger.warn("No virtual router found for VPC {}. Skipping VR NIC capacity check.", vpc.getUuid());
+            return;
+        }
+
+        if (!existsVpcDomainRouterWithSufficientNicCapacity(vpcDomainRouter)) {
             logger.warn("Failed to create a new VPC Guest Network because no virtual routers were found with sufficient NIC capacity. The number of VPC Guest networks cannot exceed the number of NICs a virtual router can have.");
             throw new CloudRuntimeException(String.format("No available virtual router found to deploy new Guest Network on VPC [%s].", vpc.getName()));
         }

server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java

@@ -397,7 +397,6 @@ public void testCreateVpcNetwork() throws InsufficientCapacityException, Resourc
         Mockito.when(networkOfferingServiceMapDao.listByNetworkOfferingId(anyLong())).thenReturn(serviceMap);
         Mockito.when(vpcMock.getCidr()).thenReturn("10.0.0.0/8");
         Mockito.when(vpcMock.getNetworkDomain()).thenReturn("cs1cloud.internal");
-        Mockito.when(manager.existsVpcDomainRouterWithSufficientNicCapacity(VPC_ID)).thenReturn(true);
         Mockito.doNothing().when(manager).checkIfVpcNumberOfTiersIsNotExceeded(Mockito.anyLong(), Mockito.any());
 
         manager.validateNewVpcGuestNetwork("10.10.10.0/24", "10.10.10.1", accountMock, vpcMock, "cs1cloud.internal");
@@ -612,46 +611,41 @@ public void validateVpcPrivateGatewayTestAclFromDifferentVpcThrowsInvalidParamet
     @Test
     public void existsVpcDomainRouterWithSufficientNicCapacityTestUnavailableRoutersReturnsFalse() {
         Mockito.when(networkDao.countVpcNetworks(vpcId)).thenReturn(7L);
-        Mockito.when(routerDao.findOneByVpcId(vpcId)).thenReturn(domainRouterVOMock);
         Mockito.when(domainRouterVOMock.getId()).thenReturn(1L);
+        Mockito.when(domainRouterVOMock.getVpcId()).thenReturn(vpcId);
         Mockito.when(domainRouterJoinDaoMock.countDefaultNetworksById(1L)).thenReturn(2);
         Mockito.when(networkOrchestrationServiceMock.getVirtualMachineMaxNicsValue(domainRouterVOMock)).thenReturn(9);
 
-        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(vpcId);
+        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(domainRouterVOMock);
 
         Assert.assertFalse(result);
     }
 
     @Test
     public void existsVpcDomainRouterWithSufficientNicCapacityTestRouterIncompatibleHypervisorTypeReturnsTrue() {
-        Mockito.when(routerDao.findOneByVpcId(vpcId)).thenReturn(domainRouterVOMock);
         Mockito.when(domainRouterVOMock.getId()).thenReturn(1L);
         Mockito.when(domainRouterJoinDaoMock.countDefaultNetworksById(1L)).thenReturn(2);
         Mockito.when(networkOrchestrationServiceMock.getVirtualMachineMaxNicsValue(domainRouterVOMock)).thenReturn(null);
 
-        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(vpcId);
+        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(domainRouterVOMock);
 
         Assert.assertTrue(result);
     }
 
     @Test
     public void existsVpcDomainRouterWithSufficientNicCapacityTestAvailableRouterReturnsTrue() {
-        Mockito.when(networkDao.countVpcNetworks(vpcId)).thenReturn(6L);
-        Mockito.when(routerDao.findOneByVpcId(vpcId)).thenReturn(domainRouterVOMock);
         Mockito.when(domainRouterVOMock.getId()).thenReturn(1L);
         Mockito.when(domainRouterJoinDaoMock.countDefaultNetworksById(1L)).thenReturn(2);
         Mockito.when(networkOrchestrationServiceMock.getVirtualMachineMaxNicsValue(domainRouterVOMock)).thenReturn(9);
 
-        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(vpcId);
+        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(domainRouterVOMock);
 
         Assert.assertTrue(result);
     }
 
     @Test
     public void existsVpcDomainRouterWithSufficientNicCapacityTestNullRouterReturnsFalse() {
-        Mockito.when(routerDao.findOneByVpcId(vpcId)).thenReturn(null);
-
-        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(vpcId);
+        boolean result = manager.existsVpcDomainRouterWithSufficientNicCapacity(domainRouterVOMock);
 
         Assert.assertFalse(result);
     }
@@ -667,7 +661,8 @@ public void checkIfVpcNumberOfTiersIsNotExceededTestExceededTiersThrowCloudRunti
     @Test
     public void checkIfVpcHasDomainRouterWithSufficientNicCapacityTestDomainRoutersWithoutCapacityThrowsCloudRuntimeException() {
         Mockito.doReturn(vpcId).when(vpcMock).getId();
-        Mockito.doReturn(false).when(manager).existsVpcDomainRouterWithSufficientNicCapacity(vpcId);
+        Mockito.doReturn(domainRouterVOMock).when(routerDao).findOneByVpcId(vpcId);
+        Mockito.doReturn(false).when(manager).existsVpcDomainRouterWithSufficientNicCapacity(domainRouterVOMock);
 
         Assert.assertThrows(CloudRuntimeException.class, () -> manager.checkIfVpcHasDomainRouterWithSufficientNicCapacity(vpcMock));
     }