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=e6744fee882be151a9ed71a9f3e166bb93e05382;hb=9cf5b95a5bc9810d739d14d324dd7d80cbdb4a7d;hp=f4caee3c40a78fe84ea5d9e4d738ac2530be1850;hpb=e6ee6ba3a164c8cb3c8ee259b05a838022af7ea5;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 f4caee3c..e6744fee 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 @@ -2,7 +2,7 @@ * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2019 AT&T Intellectual Property and Nokia + * Copyright (C) 2019 AT&T Intellectual Property * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,9 @@ 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.DashboardConstants; import org.oransc.ric.portal.dashboard.config.E2ManagerMockConfiguration; +import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; import org.oransc.ric.portal.dashboard.model.RanDetailsTransport; import org.oransc.ric.portal.dashboard.model.SuccessTransport; import org.slf4j.Logger; @@ -44,15 +46,17 @@ public class E2ManagerControllerTest extends AbstractControllerTest { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private ResponseEntity endcSetup() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.ENDC_SETUP_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.ENDC_SETUP_METHOD); logger.info("Invoking {}", uri); - SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.MOCK_RAN_NAME); + SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.RAN_NAME_1); HttpEntity entity = new HttpEntity<>(setup); return testRestTemplateAdminRole().exchange(uri, HttpMethod.POST, entity, Void.class); } private ResponseEntity reset() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_PREFIX, "ignored", + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.NODEB_PREFIX, "ignored", E2ManagerController.RESET_METHOD); logger.info("Invoking {}", uri); ResetRequest reset = new ResetRequest(); @@ -60,9 +64,23 @@ public class E2ManagerControllerTest extends AbstractControllerTest { return testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity, Void.class); } + @Test + public void endcSetupTest() { + ResponseEntity voidResponse = endcSetup(); + Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); + reset(); + } + + @Test + public void resetTest() { + ResponseEntity voidResponse = reset(); + logger.debug("resetTest: response {}", voidResponse); + Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); + } + @Test public void versionTest() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.VERSION_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.VERSION_METHOD); logger.info("Invoking {}", uri); SuccessTransport st = restTemplate.getForObject(uri, SuccessTransport.class); Assertions.assertFalse(st.getData().toString().isEmpty()); @@ -70,7 +88,8 @@ public class E2ManagerControllerTest extends AbstractControllerTest { @Test public void healthTest() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.HEALTH_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.HEALTH_METHOD); logger.info("Invoking {}", uri); ResponseEntity voidResponse = restTemplate.getForEntity(uri, Void.class); Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); @@ -79,7 +98,8 @@ public class E2ManagerControllerTest extends AbstractControllerTest { @Test public void ranDetailsTest() { endcSetup(); - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.RAN_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.RAN_METHOD); logger.info("Invoking {}", uri); ResponseEntity> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference>() { @@ -91,7 +111,8 @@ public class E2ManagerControllerTest extends AbstractControllerTest { @Test public void nodebListTest() { endcSetup(); - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_LIST_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.NODEB_LIST_METHOD); logger.info("Invoking {}", uri); ResponseEntity> response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference>() { @@ -103,26 +124,21 @@ public class E2ManagerControllerTest extends AbstractControllerTest { @Test public void nodebStatusTest() { endcSetup(); - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_SHUTDOWN_METHOD, - E2ManagerMockConfiguration.MOCK_RAN_NAME); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.NODEB_PREFIX, + E2ManagerMockConfiguration.RAN_NAME_1); logger.info("Invoking {}", uri); GetNodebResponse response = testRestTemplateStandardRole().getForObject(uri, GetNodebResponse.class); Assertions.assertNotNull(response.getRanName()); reset(); } - @Test - public void endcSetupTest() { - ResponseEntity voidResponse = endcSetup(); - Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); - reset(); - } - @Test public void x2SetupTest() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.X2_SETUP_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.X2_SETUP_METHOD); logger.info("Invoking {}", uri); - SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.MOCK_RAN_NAME); + SetupRequest setup = new SetupRequest().ranName(E2ManagerMockConfiguration.RAN_NAME_1); HttpEntity entity = new HttpEntity<>(setup); ResponseEntity voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.POST, entity, Void.class); @@ -133,18 +149,12 @@ public class E2ManagerControllerTest extends AbstractControllerTest { // Aka big--button test @Test public void nodebShutdownPutTest() { - URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, E2ManagerController.NODEB_SHUTDOWN_METHOD); + URI uri = buildUri(null, E2ManagerController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, E2ManagerController.NODEB_SHUTDOWN_METHOD); logger.info("Invoking {}", uri); ResponseEntity voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, null, Void.class); logger.debug("nodebPutTest: response {}", voidResponse); Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); } - @Test - public void resetTest() { - ResponseEntity voidResponse = reset(); - logger.debug("resetTest: response {}", voidResponse); - Assertions.assertTrue(voidResponse.getStatusCode().is2xxSuccessful()); - } - }