X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FE2ManagerControllerTest.java;h=34729adf4e27b33288c1590b2a6000841974c0a2;hb=7e9fd6002462d69562797e741960c4e672a55d5c;hp=33fb47d45cab482ef0b40c81a86df4a6482d1e10;hpb=2ab4c976427eb13105d8dd03dda3f040a94a1ec1;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
index 33fb47d4..34729adf 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java
@@ -29,6 +29,7 @@ import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
 import org.oransc.ric.e2mgr.client.model.NodebIdentity;
 import org.oransc.ric.e2mgr.client.model.ResetRequest;
 import org.oransc.ric.e2mgr.client.model.SetupRequest;
+import org.oransc.ric.portal.dashboard.config.E2ManagerMockConfiguration;
 import org.oransc.ric.portal.dashboard.model.RanDetailsTransport;
 import org.oransc.ric.portal.dashboard.model.SuccessTransport;
 import org.slf4j.Logger;
@@ -42,6 +43,23 @@ public class E2ManagerControllerTest extends AbstractControllerTest {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	private ResponseEntity<Void> endcSetup() {
+		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.ENDC_SETUP_METHOD);
+		logger.info("Invoking {}", uri);
+		SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.RAN_NAME_1);
+		HttpEntity<SetupRequest> entity = new HttpEntity<>(setup);
+		return testRestTemplateAdminRole().exchange(uri, HttpMethod.POST, entity, Void.class);
+	}
+
+	private ResponseEntity<Void> reset() {
+		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_PREFIX, "ignored",
+				E2ManagerController.RESET_METHOD);
+		logger.info("Invoking {}", uri);
+		ResetRequest reset = new ResetRequest();
+		HttpEntity<ResetRequest> entity = new HttpEntity<>(reset);
+		return testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity, Void.class);
+	}
+
 	@Test
 	public void versionTest() {
 		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.VERSION_METHOD);
@@ -60,58 +78,62 @@ public class E2ManagerControllerTest extends AbstractControllerTest {
 
 	@Test
 	public void ranDetailsTest() {
+		endcSetup();
 		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.RAN_METHOD);
 		logger.info("Invoking {}", uri);
 		ResponseEntity<List<RanDetailsTransport>> response = testRestTemplateStandardRole().exchange(uri,
 				HttpMethod.GET, null, new ParameterizedTypeReference<List<RanDetailsTransport>>() {
 				});
 		Assertions.assertFalse(response.getBody().isEmpty());
+		reset();
 	}
 
 	@Test
 	public void nodebListTest() {
+		endcSetup();
 		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_LIST_METHOD);
 		logger.info("Invoking {}", uri);
 		ResponseEntity<List<NodebIdentity>> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET,
 				null, new ParameterizedTypeReference<List<NodebIdentity>>() {
 				});
 		Assertions.assertFalse(response.getBody().isEmpty());
+		reset();
 	}
 
 	@Test
 	public void nodebStatusTest() {
-		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_METHOD, "nodeb");
+		endcSetup();
+		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_SHUTDOWN_METHOD,
+				E2ManagerMockConfiguration.RAN_NAME_1);
 		logger.info("Invoking {}", uri);
 		GetNodebResponse response = testRestTemplateStandardRole().getForObject(uri, GetNodebResponse.class);
 		Assertions.assertNotNull(response.getRanName());
+		reset();
 	}
 
 	@Test
 	public void endcSetupTest() {
-		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.ENDC_SETUP_METHOD);
-		logger.info("Invoking {}", uri);
-		SetupRequest setup = new SetupRequest();
-		HttpEntity<SetupRequest> entity = new HttpEntity<>(setup);
-		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.POST, entity,
-				Void.class);
+		ResponseEntity<Void> voidResponse = endcSetup();
 		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
+		reset();
 	}
 
 	@Test
 	public void x2SetupTest() {
 		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.X2_SETUP_METHOD);
 		logger.info("Invoking {}", uri);
-		SetupRequest setup = new SetupRequest();
+		SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.RAN_NAME_1);
 		HttpEntity<SetupRequest> entity = new HttpEntity<>(setup);
 		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.POST, entity,
 				Void.class);
 		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
+		reset();
 	}
 
 	// Aka big--button test
 	@Test
-	public void nodebPutTest() {
-		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_METHOD);
+	public void nodebShutdownPutTest() {
+		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_SHUTDOWN_METHOD);
 		logger.info("Invoking {}", uri);
 		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, null, Void.class);
 		logger.debug("nodebPutTest: response {}", voidResponse);
@@ -120,12 +142,7 @@ public class E2ManagerControllerTest extends AbstractControllerTest {
 
 	@Test
 	public void resetTest() {
-		URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.RESET_METHOD, "ranName");
-		logger.info("Invoking {}", uri);
-		ResetRequest reset = new ResetRequest();
-		HttpEntity<ResetRequest> entity = new HttpEntity<>(reset);
-		ResponseEntity<Void> voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity,
-				Void.class);
+		ResponseEntity<Void> voidResponse = reset();
 		logger.debug("resetTest: response {}", voidResponse);
 		Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful());
 	}