From 2ee399681a4b3fac259563ef8d84350236eea72d Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 24 Oct 2023 23:23:12 -0300 Subject: [PATCH] Fix tests --- .../java/org/apache/cloudstack/service/NsxElement.java | 2 +- .../java/org/apache/cloudstack/service/NsxElementTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java index 59aa8468fea..f67b8cb5c3a 100644 --- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java +++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java @@ -103,7 +103,7 @@ public class NsxElement extends AdapterBase implements DhcpServiceProvider, DnsS @Inject DomainDao domainDao; @Inject - private VpcOfferingServiceMapDao vpcOfferingServiceMapDao; + protected VpcOfferingServiceMapDao vpcOfferingServiceMapDao; private static final Logger LOGGER = Logger.getLogger(NsxElement.class); diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java index 6e6962556e7..2553d5d1d93 100644 --- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java +++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java @@ -29,6 +29,7 @@ import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkVO; import com.cloud.network.vpc.Vpc; +import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao; import com.cloud.resource.ResourceManager; import com.cloud.user.Account; import com.cloud.user.AccountManager; @@ -42,6 +43,7 @@ import org.mockito.junit.MockitoJUnitRunner; import java.util.List; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyLong; @@ -75,6 +77,8 @@ public class NsxElementTest { Account account; @Mock DomainVO domain; + @Mock + private VpcOfferingServiceMapDao vpcOfferingServiceMapDao; NsxElement nsxElement; ReservationContext reservationContext; @@ -94,6 +98,7 @@ public class NsxElementTest { nsxElement.physicalNetworkDao = physicalNetworkDao; nsxElement.domainDao = domainDao; nsxElement.networkModel = networkModel; + nsxElement.vpcOfferingServiceMapDao = vpcOfferingServiceMapDao; reservationContext = mock(ReservationContext.class); deployDestination = mock(DeployDestination.class); @@ -106,6 +111,8 @@ public class NsxElementTest { when(domainDao.findById(anyLong())).thenReturn(domain); when(vpc.getZoneId()).thenReturn(1L); when(vpc.getName()).thenReturn("testVPC"); + when(vpc.getVpcOfferingId()).thenReturn(1L); + when(vpcOfferingServiceMapDao.areServicesSupportedByVpcOffering(anyLong(), any())).thenReturn(false); PhysicalNetworkVO physicalNetworkVO = new PhysicalNetworkVO(); physicalNetworkVO.setIsolationMethods(List.of("NSX"));