You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2023/10/10 18:41:26 UTC
[cloudstack] 04/06: update tests
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch nsx-unit-tests
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1e3e6b868547054b079a6d50f09ad3e202292097
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Tue Oct 10 11:51:55 2023 -0400
update tests
---
.../cloudstack/resource/NsxResourceTest.java | 90 +++-------------------
.../service/NsxGuestNetworkGuruTest.java | 1 +
2 files changed, 12 insertions(+), 79 deletions(-)
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java
index 438895d1be8..cc46307a06f 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java
@@ -1,24 +1,12 @@
package org.apache.cloudstack.resource;
-import com.cloud.api.ApiDBUtils;
import com.cloud.network.dao.NetworkVO;
-import com.cloud.utils.script.Script;
-import com.vmware.nsx.TransportZones;
import com.vmware.nsx.model.TransportZone;
import com.vmware.nsx.model.TransportZoneListResult;
-import com.vmware.nsx_policy.infra.Segments;
-import com.vmware.nsx_policy.infra.Sites;
-import com.vmware.nsx_policy.infra.Tier1s;
-import com.vmware.nsx_policy.infra.sites.EnforcementPoints;
-import com.vmware.nsx_policy.infra.tier_0s.LocaleServices;
import com.vmware.nsx_policy.model.EnforcementPoint;
import com.vmware.nsx_policy.model.EnforcementPointListResult;
-import com.vmware.nsx_policy.model.LocaleServicesListResult;
-import com.vmware.nsx_policy.model.Segment;
import com.vmware.nsx_policy.model.Site;
import com.vmware.nsx_policy.model.SiteListResult;
-import com.vmware.vapi.bindings.Service;
-import com.vmware.vapi.client.ApiClient;
import junit.framework.Assert;
import org.apache.cloudstack.NsxAnswer;
import org.apache.cloudstack.agent.api.CreateNsxSegmentCommand;
@@ -26,15 +14,13 @@ import org.apache.cloudstack.agent.api.CreateNsxTier1GatewayCommand;
import org.apache.cloudstack.agent.api.DeleteNsxSegmentCommand;
import org.apache.cloudstack.agent.api.DeleteNsxTier1GatewayCommand;
import org.apache.cloudstack.agent.api.NsxCommand;
-import org.apache.cloudstack.service.NsxApi;
+import org.apache.cloudstack.service.NsxApiClient;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner;
@@ -42,61 +28,34 @@ import javax.naming.ConfigurationException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import static org.apache.cloudstack.utils.NsxApiClientUtils.TransportType.OVERLAY;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.ArgumentMatchers.any;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class NsxResourceTest {
@Mock
- NsxApi nsxApi;
- @Mock
- ApiClient apiClient;
+ NsxApiClient nsxApi;
NsxResource nsxResource;
AutoCloseable closeable;
@Mock
- private Tier1s tier1s;
- @Mock
- LocaleServices localeServices;
- @Mock
- EnforcementPoints enforcementPoints;
- @Mock
- Sites sites;
- @Mock
- Segments segments;
- @Mock
- TransportZones transportZones;
- @Mock
- com.vmware.nsx_policy.infra.tier_1s.LocaleServices tier1LocaleService;
- @Mock
- LocaleServicesListResult localeServicesListResult;
- @Mock
EnforcementPointListResult enforcementPointListResult;
@Mock
SiteListResult siteListResult;
@Mock
TransportZoneListResult transportZoneListResult;
- @Mock
- com.vmware.nsx_policy.model.LocaleServices localeService;
@Before
public void setup() {
closeable = MockitoAnnotations.openMocks(this);
nsxResource = new NsxResource();
- nsxResource.nsxApi = nsxApi;
+ nsxResource.nsxApiClient = nsxApi;
nsxResource.transportZone = "Overlay";
-
- when(nsxApi.getApiClient()).thenReturn(apiClient);
- when(apiClient.createStub(Tier1s.class)).thenReturn(tier1s);
- when(apiClient.createStub(LocaleServices.class)).thenReturn(localeServices);
- when(apiClient.createStub(com.vmware.nsx_policy.infra.tier_1s.LocaleServices.class)).thenReturn(tier1LocaleService);
}
@After
@@ -133,12 +92,6 @@ public class NsxResourceTest {
NsxCommand command = new CreateNsxTier1GatewayCommand("ZoneA", 1L,
"testAcc", 1L, "VPC01");
- when(localeServices.list(nullable(String.class), nullable(String.class),
- nullable(Boolean.class), nullable(String.class), nullable(Long.class),
- nullable(Boolean.class), nullable(String.class))).thenReturn(localeServicesListResult);
- when(localeServicesListResult.getResults()).thenReturn(List.of(localeService));
- doNothing().when(tier1LocaleService).patch(anyString(), anyString(), any(com.vmware.nsx_policy.model.LocaleServices.class));
-
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
assertTrue(answer.getResult());
}
@@ -148,9 +101,6 @@ public class NsxResourceTest {
NsxCommand command = new DeleteNsxTier1GatewayCommand("ZoneA", 1L,
"testAcc", 1L, "VPC01");
- doNothing().when(tier1LocaleService).delete(anyString(), anyString());
- doNothing().when(tier1s).delete(anyString());
-
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
assertTrue(answer.getResult());
}
@@ -160,6 +110,7 @@ public class NsxResourceTest {
NetworkVO tierNetwork = new NetworkVO();
tierNetwork.setName("tier1");
tierNetwork.setCidr("10.0.0.0/8");
+ tierNetwork.setGateway("10.0.0.1");
Site site = mock(Site.class);
List<Site> siteList = List.of(site);
EnforcementPoint enforcementPoint = mock(EnforcementPoint.class);
@@ -169,35 +120,18 @@ public class NsxResourceTest {
NsxCommand command = new CreateNsxSegmentCommand("ZoneA", 1L,
"testAcc", 1L, "VPC01", tierNetwork);
- when(apiClient.createStub(Sites.class)).thenReturn(sites);
- when(sites.list(nullable(String.class), anyBoolean(), nullable(String.class), nullable(Long.class), nullable(Boolean.class), nullable(String.class))).thenReturn(siteListResult);
+ when(nsxApi.getSites()).thenReturn(siteListResult);
when(siteListResult.getResults()).thenReturn(siteList);
when(siteList.get(0).getId()).thenReturn("site1");
- when(apiClient.createStub(EnforcementPoints.class)).thenReturn(enforcementPoints);
- when(enforcementPoints.list(anyString(), nullable(String.class), nullable(Boolean.class),
- nullable(String.class), nullable(Long.class), nullable(Boolean.class), nullable(String.class))).thenReturn(enforcementPointListResult);
+ when(nsxApi.getEnforcementPoints(anyString())).thenReturn(enforcementPointListResult);
when(enforcementPointListResult.getResults()).thenReturn(enforcementPointList);
when(enforcementPointList.get(0).getPath()).thenReturn("enforcementPointPath");
- when(apiClient.createStub(TransportZones.class)).thenReturn(transportZones);
- when(transportZones.list(nullable(String.class), nullable(String.class), anyBoolean(),
- nullable(String.class), anyBoolean(), nullable(Long.class), nullable(Boolean.class),
- nullable(String.class), anyString(), nullable(String.class))).thenReturn(transportZoneListResult);
+ when(nsxApi.getTransportZones()).thenReturn(transportZoneListResult);
when(transportZoneListResult.getResults()).thenReturn(transportZoneList);
- lenient().when(localeServices.list(nullable(String.class), nullable(String.class),
- nullable(Boolean.class), nullable(String.class), nullable(Long.class),
- nullable(Boolean.class), nullable(String.class))).thenReturn(localeServicesListResult);
- lenient().when(localeServicesListResult.getResults()).thenReturn(List.of(localeService));
-
- when(apiClient.createStub(Segments.class)).thenReturn(segments);
- doNothing().when(segments).patch(anyString(), any(Segment.class));
-
- lenient().doNothing().when(tier1LocaleService).patch(anyString(), anyString(), any(com.vmware.nsx_policy.model.LocaleServices.class));
-
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
- System.out.println(answer.getResult());
assertTrue(answer.getResult());
}
@@ -207,8 +141,6 @@ public class NsxResourceTest {
tierNetwork.setName("tier1");
DeleteNsxSegmentCommand command = new DeleteNsxSegmentCommand("testAcc", "VPC01", tierNetwork);
- when(apiClient.createStub(Segments.class)).thenReturn(segments);
- doNothing().when(segments).delete(anyString());
NsxAnswer answer = (NsxAnswer) nsxResource.executeRequest(command);
assertTrue(answer.getResult());
}
diff --git a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
index 92b849926c5..dd6ab927fbf 100644
--- a/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
+++ b/plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
@@ -21,6 +21,7 @@ import com.cloud.vm.ReservationContext;
import org.apache.cloudstack.NsxAnswer;
import org.apache.cloudstack.agent.api.CreateNsxSegmentCommand;
import org.apache.cloudstack.agent.api.NsxCommand;
+import org.apache.cloudstack.utils.NsxControllerUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;