This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch netris-integration-upstream in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 294fa064e969c8e97afe6fbf8ea91fa8be68858e Author: nvazquez <[email protected]> AuthorDate: Tue Oct 22 22:06:24 2024 -0300 Fix unit tests --- .../java/com/cloud/configuration/ConfigurationManagerImplTest.java | 4 ++++ .../network/router/deployment/RouterDeploymentDefinitionTest.java | 3 +++ .../network/router/deployment/VpcRouterDeploymentDefinitionTest.java | 3 +++ 3 files changed, 10 insertions(+) diff --git a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java index 0a045296821..f348382159a 100644 --- a/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java +++ b/server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java @@ -33,6 +33,7 @@ import com.cloud.network.NetworkModel; import com.cloud.network.NetworkService; import com.cloud.network.Networks; import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.NetrisProviderDao; import com.cloud.network.dao.NsxProviderDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.element.NsxProviderVO; @@ -124,6 +125,8 @@ public class ConfigurationManagerImplTest { @Mock NsxProviderDao nsxProviderDao; @Mock + NetrisProviderDao netrisProviderDao; + @Mock DataCenterDao zoneDao; @Mock HostDao hostDao; @@ -402,6 +405,7 @@ public class ConfigurationManagerImplTest { DataCenterVO dataCenterVO = Mockito.mock(DataCenterVO.class); when(nsxProviderDao.findByZoneId(anyLong())).thenReturn(nsxProviderVO); + when(netrisProviderDao.findByZoneId(anyLong())).thenReturn(null); when(zoneDao.findById(anyLong())).thenReturn(dataCenterVO); lenient().when(hostDao.findByDataCenterId(anyLong())).thenReturn(Collections.emptyList()); when(podDao.listByDataCenterId(anyLong())).thenReturn(Collections.emptyList()); diff --git a/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java index 0b4c48e99b4..3dec0fc2b66 100644 --- a/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java +++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java @@ -30,6 +30,7 @@ import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.VirtualRouterProvider.Type; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.NetrisProviderDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NsxProviderDao; import com.cloud.network.dao.PhysicalNetworkDao; @@ -79,6 +80,8 @@ public class RouterDeploymentDefinitionTest extends RouterDeploymentDefinitionTe PhysicalNetworkDao physicalNetworkDao; @Mock protected NsxProviderDao nsxProviderDao; + @Mock + protected NetrisProviderDao netrisProviderDao; protected RouterDeploymentDefinition deployment; diff --git a/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java index d3ab6d8904b..e7f75f5dbbb 100644 --- a/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java +++ b/server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java @@ -24,6 +24,7 @@ import com.cloud.exception.InsufficientServerCapacityException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.network.addr.PublicIp; +import com.cloud.network.dao.NetrisProviderDao; import com.cloud.network.dao.NsxProviderDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; @@ -65,6 +66,8 @@ public class VpcRouterDeploymentDefinitionTest extends RouterDeploymentDefinitio @Mock protected NsxProviderDao nsxProviderDao; @Mock + protected NetrisProviderDao netrisProviderDao; + @Mock protected PhysicalNetworkDao mockPhNwDao; protected PhysicalNetworkServiceProviderDao mockPhProviderDao;
