X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fcontroller%2FAdminControllerTest.java;h=f3f9fad36ef92440d4f42347e5a2881b92e1a64d;hb=HEAD;hp=02534fb0e3656021ce64e7b358e14bbd6f123a9f;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java index 02534fb0..f3f9fad3 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AdminControllerTest.java @@ -21,23 +21,30 @@ package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import java.net.URI; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import org.junit.Assert; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.onap.portalsdk.core.restful.domain.EcompUser; import org.oransc.ric.portal.dashboard.DashboardConstants; -import org.oransc.ric.portal.dashboard.model.ErrorTransport; +import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; +import org.oransc.ric.portal.dashboard.model.AppStats; import org.oransc.ric.portal.dashboard.model.RicInstanceKeyName; +import org.oransc.ric.portal.dashboard.model.StatsDetailsTransport; import org.oransc.ric.portal.dashboard.model.SuccessTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestClientException; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class AdminControllerTest extends AbstractControllerTest { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -87,40 +94,112 @@ public class AdminControllerTest extends AbstractControllerTest { Assertions.assertTrue(response.getStatusCode().is4xxClientError()); } + @Order(1) @Test - public void getxAppMetricsUrlTest() { - Map metricsQueryParms = new HashMap(); - URI uri; + public void getAppStatsTest() { + // Get all + URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1", + AdminController.STATAPPMETRIC_METHOD); + logger.info("getAppStatsTest: uri {}", uri); + ResponseEntity> list = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }); + Assertions.assertFalse(list.getBody().isEmpty()); + Assertions.assertNotEquals(-1, list.getBody().get(0).getStatsDetails().getAppId()); + + // Get one by ID + int appId = list.getBody().get(0).getStatsDetails().getAppId(); + uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1", + AdminController.STATAPPMETRIC_METHOD, DashboardConstants.APP_ID, Integer.toString(appId)); + logger.info("getAppStatsTest: uri {}", uri); + AppStats stats = testRestTemplateStandardRole().getForObject(uri, AppStats.class); + Assertions.assertEquals(appId, stats.getStatsDetails().getAppId()); + + // Fail to get one by ID + uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, "i1", + AdminController.STATAPPMETRIC_METHOD, DashboardConstants.APP_ID, "987654321"); + logger.info("getAppStatsTest: uri {}", uri); + stats = testRestTemplateStandardRole().getForObject(uri, AppStats.class); + Assert.assertNull(stats); + } - metricsQueryParms.clear(); - metricsQueryParms.put("app", DashboardConstants.APP_NAME_AC); - uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD); - logger.debug("Invoking {}", uri); - ResponseEntity successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, - null, SuccessTransport.class); - Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty()); - Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful()); + @Order(2) + @Test + public void createAppStatsTest() { + URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD); + logger.info("Invoking uri {}", uri); + StatsDetailsTransport statsDetails = new StatsDetailsTransport(); + statsDetails.setAppName("MachLearn-2"); + statsDetails.setMetricUrl("https://www.example2.com"); + AppStats st = testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class); + Assertions.assertFalse(st.getStatsDetails().getAppName().isEmpty()); + statsDetails.setAppName("MachLearn-2-next"); + statsDetails.setMetricUrl("https://www.example2-next.com"); + AppStats stNext = testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class); + Assertions.assertTrue(st.getStatsDetails().getAppId() < stNext.getStatsDetails().getAppId()); + Assertions.assertThrows(RestClientException.class, () -> { + testRestTemplateAdminRole().postForObject(uri, statsDetails, AppStats.class); + }); + } - metricsQueryParms.clear(); - metricsQueryParms.put("app", DashboardConstants.APP_NAME_MC); - logger.debug("Invoking {}", uri); - successResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, SuccessTransport.class); - Assertions.assertFalse(successResponse.getBody().getData().toString().isEmpty()); - Assertions.assertTrue(successResponse.getStatusCode().is2xxSuccessful()); + @Order(3) + @Test + public void updateAppStatsTest() { + URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD); + logger.info("Invoking uri {}", uri); + ResponseEntity> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }); + int statToUpdate = 0; + if (response.getBody() != null) { + statToUpdate = response.getBody().get(0).getStatsDetails().getAppId(); + } + StatsDetailsTransport statsDetails = new StatsDetailsTransport(); + statsDetails.setAppId(statToUpdate); + statsDetails.setAppName("MachLearn-1"); + statsDetails.setMetricUrl("https://www.example1.com"); + HttpEntity entity = new HttpEntity<>(statsDetails); + ResponseEntity stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, entity, + String.class); + Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful()); + + StatsDetailsTransport bogusDetails = new StatsDetailsTransport(); + bogusDetails.setAppId(-1); + bogusDetails.setAppName("bogus"); + HttpEntity bogusEntity = new HttpEntity<>(bogusDetails); + ResponseEntity voidResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.PUT, bogusEntity, + String.class); + Assertions.assertTrue(voidResponse.getStatusCode().is4xxClientError()); } + @Order(4) @Test - public void getxAppMetricsUrlTestFail() { - Map metricsQueryParms = new HashMap(); - // Providing a bogus value for application name in query parameter to test - // failure - metricsQueryParms.put("app", "ABCD"); - URI uri = buildUri(metricsQueryParms, AdminController.CONTROLLER_PATH, AdminController.XAPPMETRICS_METHOD); - logger.debug("Invoking {}", uri); - ResponseEntity errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, - null, ErrorTransport.class); - logger.debug("{}", errorResponse.getBody().getError().toString()); - Assertions.assertTrue(errorResponse.getStatusCode().is4xxClientError()); + public void deleteAppStatsTest() { + URI uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD); + ResponseEntity> response = testRestTemplateAdminRole().exchange(uri, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }); + int statToDelete = 0; + if (response.getBody() != null) { + statToDelete = response.getBody().get(0).getStatsDetails().getAppId(); + } + uri = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD, + DashboardConstants.APP_ID, String.valueOf(statToDelete)); + logger.info("Invoking uri {}", uri); + ResponseEntity stringResponse = testRestTemplateAdminRole().exchange(uri, HttpMethod.DELETE, null, + String.class); + Assertions.assertTrue(stringResponse.getStatusCode().is2xxSuccessful()); + + URI uri99 = buildUri(null, AdminController.CONTROLLER_PATH, DashboardConstants.RIC_INSTANCE_KEY, + RICInstanceMockConfiguration.INSTANCE_KEY_1, AdminController.STATAPPMETRIC_METHOD, + DashboardConstants.APP_ID, "999999"); + ResponseEntity voidResponse = testRestTemplateAdminRole().exchange(uri99, HttpMethod.DELETE, null, + String.class); + Assertions.assertTrue(voidResponse.getStatusCode().is4xxClientError()); } @Test @@ -128,10 +207,10 @@ public class AdminControllerTest extends AbstractControllerTest { URI uri = buildUri(null, AdminController.CONTROLLER_PATH, AdminControllerExtension.HTTP_STATUS_CODE_EXCEPTION_METHOD); logger.debug("Invoking {}", uri); - ResponseEntity errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, - null, ErrorTransport.class); - logger.debug("{}", errorResponse.getBody().getError().toString()); - Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError()); + ResponseEntity response = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, + String.class); + logger.debug("{}", response.getBody().toString()); + Assertions.assertTrue(response.getStatusCode().is5xxServerError()); } @Test @@ -139,9 +218,9 @@ public class AdminControllerTest extends AbstractControllerTest { URI uri = buildUri(null, AdminController.CONTROLLER_PATH, AdminControllerExtension.REST_CLIENT_RESPONSE_EXCEPTION_METHOD); logger.debug("Invoking {}", uri); - ResponseEntity errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, - null, ErrorTransport.class); - logger.debug("{}", errorResponse.getBody().getError().toString()); + ResponseEntity errorResponse = testRestTemplateStandardRole().exchange(uri, HttpMethod.GET, null, + String.class); + logger.debug("{}", errorResponse.getBody()); Assertions.assertTrue(errorResponse.getStatusCode().is5xxServerError()); }