From f660cae7a447b60d84ef75f7c2bcbf62412d4579 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 1 May 2019 18:59:10 -0400 Subject: [PATCH] Upgrade to E2 spec of 2 May 2019 Use o-ran-sc in groupId strings. Adjust java package names similarly. Bump version to 1.0.1. Change-Id: I8385916c53a6ee3e6de81d8e95510f4e14738d1d Signed-off-by: Lott, Christopher (cl778h) --- docs/release-notes.rst | 4 + e2-mgr-client/pom.xml | 42 +++--- .../src/main/resources/e2_manager_02052019.yaml | 147 +++++++++++++++++++++ .../e2mgr/client/test}/E2ManagerClientTest.java | 10 +- pom.xml | 6 +- webapp-backend/pom.xml | 10 +- .../portal/dashboard}/DashboardApplication.java | 4 +- .../ric/portal/dashboard}/DashboardConstants.java | 2 +- .../dashboard}/config/E2ManagerConfiguration.java | 31 +++-- .../config/E2ManagerMockConfiguration.java | 41 ++++-- .../dashboard}/config/SwaggerConfiguration.java | 4 +- .../config/XappManagerConfiguration.java | 6 +- .../config/XappManagerMockConfiguration.java | 18 +-- .../controller/A1MediationController.java | 20 +-- .../dashboard}/controller/E2ManagerController.java | 45 ++++--- .../controller/SimpleErrorController.java | 2 +- .../controller/XappManagerController.java | 14 +- .../portal/dashboard}/model/DelayTransport.java | 2 +- .../portal/dashboard}/model/ErrorTransport.java | 2 +- .../dashboard}/model/IDashboardResponse.java | 2 +- .../ric/portal/dashboard}/model/LoadTransport.java | 2 +- .../portal/dashboard}/model/MetricsTransport.java | 2 +- .../ric/portal/dashboard}/model/PathTransport.java | 2 +- .../portal/dashboard}/model/SuccessTransport.java | 2 +- .../ric/portal/dashboard}/model/UrlTransport.java | 2 +- .../dashboard}/DashboardApplicationTest.java | 2 +- webapp-frontend/pom.xml | 18 ++- xapp-mgr-client/pom.xml | 20 +-- xapp-mgr-client/src/main/resources/.gitignore | 1 + .../client/test}/XappManagerClientTest.java | 14 +- 30 files changed, 328 insertions(+), 149 deletions(-) create mode 100644 e2-mgr-client/src/main/resources/e2_manager_02052019.yaml rename e2-mgr-client/src/test/java/org/{oranosc/ric/portal/dashboard/e2mgr/demo => oransc/ric/portal/dashboard/e2mgr/client/test}/E2ManagerClientTest.java (84%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/DashboardApplication.java (95%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/DashboardConstants.java (95%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/config/E2ManagerConfiguration.java (76%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/config/E2ManagerMockConfiguration.java (62%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/config/SwaggerConfiguration.java (95%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/config/XappManagerConfiguration.java (93%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/config/XappManagerMockConfiguration.java (86%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/controller/A1MediationController.java (93%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/controller/E2ManagerController.java (72%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/controller/SimpleErrorController.java (98%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/controller/XappManagerController.java (91%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/DelayTransport.java (96%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/ErrorTransport.java (98%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/IDashboardResponse.java (95%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/LoadTransport.java (96%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/MetricsTransport.java (97%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/PathTransport.java (96%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/SuccessTransport.java (96%) rename webapp-backend/src/main/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/model/UrlTransport.java (96%) rename webapp-backend/src/test/java/org/{oranosc/ric/portal/dash => oransc/ric/portal/dashboard}/DashboardApplicationTest.java (96%) create mode 100644 xapp-mgr-client/src/main/resources/.gitignore rename xapp-mgr-client/src/test/java/org/{oranosc/ric/portal/dashboard/xmc/demo => oransc/ric/portal/dashboard/xappmgr/client/test}/XappManagerClientTest.java (78%) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 05e1c236..5d37d36d 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -20,6 +20,10 @@ RIC Dashboard Release Notes =========================== +Version 1.0.1, 2 May 2019 +------------------------- +* Use E2 Manager API definition dated 2 May 2019 + Version 1.0.0, 30 Apr 2019 -------------------------- * Initial version diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml index 372f9da1..6e213c7e 100644 --- a/e2-mgr-client/pom.xml +++ b/e2-mgr-client/pom.xml @@ -23,26 +23,26 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.oranosc.ric.portal.dashboard + org.o-ran-sc.portal.ric-dashboard ric-dash-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT - org.oranosc.ric.e2mgr.client + + org.o-ran-sc.ric.e2mgr.client e2-mgr-client RIC E2 Manager client - 0.0.1-SNAPSHOT + 02052019-SNAPSHOT UTF-8 UTF-8 - 1.5.15 - org.oranosc.ric.e2mgr.client + org.oransc.ric.e2mgr.client - io.swagger + io.swagger.core.v3 swagger-annotations - ${swagger-annotations-version} + 2.0.8 org.springframework @@ -91,40 +91,32 @@ limitations under the License. - io.swagger + + io.swagger.codegen.v3 swagger-codegen-maven-plugin - 2.4.5 + 3.0.8 generate - ${project.basedir}/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml + ${project.basedir}/src/main/resources/e2_manager_02052019.yaml java + ${client.base.package.name} + ${client.base.package.name}.model + ${client.base.package.name}.api + ${client.base.package.name}.invoker ${project.groupId} ${project.artifactId} ${project.version} - www.oran-osc.org - E2 manager client library resttemplate true java8 Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0 - - - http://gerrit.oran-osc.org - RIC Team - - AT&T and Nokia - - ${client.base.package.name} - ${client.base.package.name}.model - ${client.base.package.name}.api - ${client.base.package.name}.invoker @@ -190,7 +182,7 @@ limitations under the License. - io.swagger + io.swagger.codegen.v3 swagger-codegen-maven-plugin [1.0,) diff --git a/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml b/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml new file mode 100644 index 00000000..3846b383 --- /dev/null +++ b/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml @@ -0,0 +1,147 @@ +# ========================LICENSE_START================================= +# ORAN-OSC +# %% +# Copyright (C) 2019 AT&T Intellectual Property and Nokia +# %% +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ========================LICENSE_END=================================== +openapi: 3.0.0 +info: + title: E2 Manager Service + description: This is a description of E2 manager service APIs + version: 1.0.0 +servers: + - url: http://{apiRoot}/nodeb/v1 + variables: + apiRoot: + default: localhost:3800 + description: >- + E2 manager +paths: + /setup: + post: + summary: X2 Setup Request + tags: + - X2 Setup Request + operationId: setup + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/SetupRequest' + required: true + responses: + '200': + description: Request was handled successfuly + '400': + description: Invalid input + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + '404': + description: Resource not found + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + default: + description: Unexpected error + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + + /endcSetup: + post: + tags: + - ENDC Setup Request + summary: ENDC Setup Request + operationId: endcSetup + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/SetupRequest' + required: true + responses: + '200': + description: Request was handled successfuly + '400': + description: Invalid input + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + '404': + description: Resource not found + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + '500': + description: Internal server error + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + default: + description: Unexpected error + content: + application/json: + schema: + $ref: '#/components/schemas/ErrorResponse' + + /health: + get: + tags: + - Health Check + summary: E2 Manager Service Health Check + operationId: healthCheck + responses: + '200': + description: OK +components: + schemas: + SetupRequest: + type: object + required: + - ranIp + - ranPort + - ranName + properties: + ranIp: + type: string + ranPort: + type: integer + format: uint16 + ranName: + type: string + ErrorResponse: + type: object + required: + - errorCode + - errorMessage + properties: + errorCode: + type: string + description: 401 - corrupted json, 402 - validation error, 501 - internal problem + errorMessage: + type: string + description: Human readable text diff --git a/e2-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/e2mgr/demo/E2ManagerClientTest.java b/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java similarity index 84% rename from e2-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/e2mgr/demo/E2ManagerClientTest.java rename to e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java index 56e6cfcf..fa48e693 100644 --- a/e2-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/e2mgr/demo/E2ManagerClientTest.java +++ b/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java @@ -17,11 +17,11 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dashboard.e2mgr.demo; +package org.oransc.ric.portal.dashboard.e2mgr.client.test; import org.junit.jupiter.api.Test; -import org.oranosc.ric.e2mgr.client.api.DefaultApi; -import org.oranosc.ric.e2mgr.client.invoker.ApiClient; +import org.oransc.ric.e2mgr.client.api.HealthCheckApi; +import org.oransc.ric.e2mgr.client.invoker.ApiClient; import org.springframework.web.client.RestClientException; /** @@ -35,9 +35,9 @@ public class E2ManagerClientTest { public void demo() { ApiClient apiClient = new ApiClient(); apiClient.setBasePath("http://localhost:30099/"); - DefaultApi e2Mgr = new DefaultApi(apiClient); + HealthCheckApi e2Health = new HealthCheckApi(apiClient); try { - e2Mgr.getHealth(); + e2Health.healthCheck(); System.out.println("getHealth answered: " + apiClient.getStatusCode().toString()); } catch (RestClientException e) { System.err.println("getHealth failed: " + e.toString()); diff --git a/pom.xml b/pom.xml index 9928ca06..93842b07 100644 --- a/pom.xml +++ b/pom.xml @@ -25,14 +25,14 @@ limitations under the License. org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.1.4.RELEASE - org.oranosc.ric.portal.dashboard + org.o-ran-sc.portal.ric-dashboard ric-dash-parent RIC Dashboard project pom - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT AT&T Intellectual Property and Nokia diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml index 3b06ab9e..6f7147c3 100644 --- a/webapp-backend/pom.xml +++ b/webapp-backend/pom.xml @@ -23,9 +23,9 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.oranosc.ric.portal.dashboard + org.o-ran-sc.portal.ric-dashboard ric-dash-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT ric-dash-be RIC Dashboard Webapp backend @@ -36,12 +36,12 @@ limitations under the License. - org.oranosc.ric.e2mgr.client + org.o-ran-sc.ric.e2mgr.client e2-mgr-client - 0.0.1-SNAPSHOT + 02052019-SNAPSHOT - org.oranosc.ric.xappmgr.client + org.o-ran-sc.ric.xappmgr.client xapp-mgr-client 0.0.10-SNAPSHOT diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardApplication.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java similarity index 95% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardApplication.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java index bac38b81..15c082f9 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardApplication.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash; +package org.oransc.ric.portal.dashboard; import java.lang.invoke.MethodHandles; @@ -30,7 +30,7 @@ import org.springframework.context.annotation.ComponentScan; @SpringBootApplication // Limit the annotation scan to the dashboard classes; // exclude the generated client classes! -@ComponentScan("org.oranosc.ric.portal.dash") +@ComponentScan("org.oransc.ric.portal.dashboard") public class DashboardApplication { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardConstants.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java similarity index 95% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardConstants.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java index b63f0887..cd70a81a 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/DashboardConstants.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash; +package org.oransc.ric.portal.dashboard; public abstract class DashboardConstants { diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java similarity index 76% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java index 6498ee1c..3b610b55 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java @@ -17,12 +17,14 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.config; +package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import org.oranosc.ric.e2mgr.client.api.DefaultApi; -import org.oranosc.ric.e2mgr.client.invoker.ApiClient; +import org.oransc.ric.e2mgr.client.api.EndcSetupRequestApi; +import org.oransc.ric.e2mgr.client.api.HealthCheckApi; +import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi; +import org.oransc.ric.e2mgr.client.invoker.ApiClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,14 +54,25 @@ public class E2ManagerConfiguration { this.e2mgrBasepath = e2mgrBasepath; } - /** - * @return A DefaultApi with an ApiClient configured from properties - */ - @Bean - public DefaultApi e2ManagerClient() { + private ApiClient apiClient() { ApiClient apiClient = new ApiClient(new RestTemplate()); apiClient.setBasePath(e2mgrBasepath); - return new DefaultApi(apiClient); + return apiClient; + } + + @Bean + public EndcSetupRequestApi endcSetupRequestApi() { + return new EndcSetupRequestApi(apiClient()); + } + + @Bean + public HealthCheckApi healthCheckApi() { + return new HealthCheckApi(apiClient()); + } + + @Bean + public X2SetupRequestApi x2SetupRequestApi() { + return new X2SetupRequestApi(apiClient()); } } diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java similarity index 62% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerMockConfiguration.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java index 3ce923b3..3df6dc70 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/E2ManagerMockConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.config; +package org.oransc.ric.portal.dashboard.config; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; @@ -26,9 +26,11 @@ import static org.mockito.Mockito.when; import java.lang.invoke.MethodHandles; -import org.oranosc.ric.e2mgr.client.api.DefaultApi; -import org.oranosc.ric.e2mgr.client.invoker.ApiClient; -import org.oranosc.ric.e2mgr.client.model.RanSetupRequest; +import org.oransc.ric.e2mgr.client.api.EndcSetupRequestApi; +import org.oransc.ric.e2mgr.client.api.HealthCheckApi; +import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi; +import org.oransc.ric.e2mgr.client.invoker.ApiClient; +import org.oransc.ric.e2mgr.client.model.SetupRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; @@ -50,22 +52,39 @@ public class E2ManagerMockConfiguration { logger.info("Configuring mock E2 Manager"); } - @Bean - public DefaultApi e2ManagerMockClient() { + private ApiClient apiClient() { ApiClient mockClient = mock(ApiClient.class); when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK); + return mockClient; + } - DefaultApi mockApi = mock(DefaultApi.class); - when(mockApi.getApiClient()).thenReturn(mockClient); + @Bean + public EndcSetupRequestApi endcSetupRequestApi() { + ApiClient apiClient = apiClient(); + EndcSetupRequestApi mockApi = mock(EndcSetupRequestApi.class); + when(mockApi.getApiClient()).thenReturn(apiClient); + return mockApi; + } + @Bean + public HealthCheckApi healthCheckApi() { + ApiClient apiClient = apiClient(); + HealthCheckApi mockApi = mock(HealthCheckApi.class); + when(mockApi.getApiClient()).thenReturn(apiClient); doAnswer(i -> { return null; - }).when(mockApi).getHealth(); + }).when(mockApi).healthCheck(); + return mockApi; + } + @Bean + public X2SetupRequestApi x2SetupRequestApi() { + ApiClient apiClient = apiClient(); + X2SetupRequestApi mockApi = mock(X2SetupRequestApi.class); + when(mockApi.getApiClient()).thenReturn(apiClient); doAnswer(i -> { return null; - }).when(mockApi).setupRan(any(RanSetupRequest.class)); - + }).when(mockApi).setup(any(SetupRequest.class)); return mockApi; } diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/SwaggerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java similarity index 95% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/SwaggerConfiguration.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java index 33e56e72..fe079365 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/SwaggerConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java @@ -18,9 +18,9 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.config; +package org.oransc.ric.portal.dashboard.config; -import org.oranosc.ric.portal.dash.DashboardApplication; +import org.oransc.ric.portal.dashboard.DashboardApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java similarity index 93% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerConfiguration.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java index a980e16d..3714b824 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java @@ -17,12 +17,12 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.config; +package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import org.oranosc.ric.xappmgr.client.api.DefaultApi; -import org.oranosc.ric.xappmgr.client.invoker.ApiClient; +import org.oransc.ric.xappmgr.client.api.DefaultApi; +import org.oransc.ric.xappmgr.client.invoker.ApiClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java similarity index 86% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerMockConfiguration.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java index c1e1675e..86988930 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/config/XappManagerMockConfiguration.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.config; +package org.oransc.ric.portal.dashboard.config; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; @@ -26,14 +26,14 @@ import static org.mockito.Mockito.when; import java.lang.invoke.MethodHandles; -import org.oranosc.ric.xappmgr.client.api.DefaultApi; -import org.oranosc.ric.xappmgr.client.invoker.ApiClient; -import org.oranosc.ric.xappmgr.client.model.AllXapps; -import org.oranosc.ric.xappmgr.client.model.SubscriptionRequest; -import org.oranosc.ric.xappmgr.client.model.SubscriptionResponse; -import org.oranosc.ric.xappmgr.client.model.XAppInfo; -import org.oranosc.ric.xappmgr.client.model.Xapp; -import org.oranosc.ric.xappmgr.client.model.Xapp.StatusEnum; +import org.oransc.ric.xappmgr.client.api.DefaultApi; +import org.oransc.ric.xappmgr.client.invoker.ApiClient; +import org.oransc.ric.xappmgr.client.model.AllXapps; +import org.oransc.ric.xappmgr.client.model.SubscriptionRequest; +import org.oransc.ric.xappmgr.client.model.SubscriptionResponse; +import org.oransc.ric.xappmgr.client.model.XAppInfo; +import org.oransc.ric.xappmgr.client.model.Xapp; +import org.oransc.ric.xappmgr.client.model.Xapp.StatusEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/A1MediationController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java similarity index 93% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/A1MediationController.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java index 68b42923..c63b6c1d 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/A1MediationController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.controller; +package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import java.net.MalformedURLException; @@ -26,15 +26,15 @@ import java.net.URL; import javax.servlet.http.HttpServletResponse; -import org.oranosc.ric.portal.dash.DashboardConstants; -import org.oranosc.ric.portal.dash.model.DelayTransport; -import org.oranosc.ric.portal.dash.model.ErrorTransport; -import org.oranosc.ric.portal.dash.model.IDashboardResponse; -import org.oranosc.ric.portal.dash.model.LoadTransport; -import org.oranosc.ric.portal.dash.model.MetricsTransport; -import org.oranosc.ric.portal.dash.model.PathTransport; -import org.oranosc.ric.portal.dash.model.SuccessTransport; -import org.oranosc.ric.portal.dash.model.UrlTransport; +import org.oransc.ric.portal.dashboard.DashboardConstants; +import org.oransc.ric.portal.dashboard.model.DelayTransport; +import org.oransc.ric.portal.dashboard.model.ErrorTransport; +import org.oransc.ric.portal.dashboard.model.IDashboardResponse; +import org.oransc.ric.portal.dashboard.model.LoadTransport; +import org.oransc.ric.portal.dashboard.model.MetricsTransport; +import org.oransc.ric.portal.dashboard.model.PathTransport; +import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ric.portal.dashboard.model.UrlTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/E2ManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java similarity index 72% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/E2ManagerController.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java index ea46c198..53593a64 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/E2ManagerController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.controller; +package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import java.util.HashSet; @@ -25,9 +25,10 @@ import java.util.Set; import javax.servlet.http.HttpServletResponse; -import org.oranosc.ric.e2mgr.client.api.DefaultApi; -import org.oranosc.ric.e2mgr.client.model.RanSetupRequest; -import org.oranosc.ric.portal.dash.DashboardConstants; +import org.oransc.ric.e2mgr.client.api.HealthCheckApi; +import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi; +import org.oransc.ric.e2mgr.client.model.SetupRequest; +import org.oransc.ric.portal.dashboard.DashboardConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -56,18 +57,18 @@ public class E2ManagerController { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); // Populated by the autowired constructor - private final DefaultApi e2MgrClient; + private final HealthCheckApi healthCheckApi; + private final X2SetupRequestApi x2SetupRequestApi; // Tracks the requests previously submitted. // TODO remove when the E2 manager is extended. - private Set requests = new HashSet<>(); + private Set requests = new HashSet<>(); @Autowired - public E2ManagerController(final DefaultApi e2MgrClient) { - Assert.notNull(e2MgrClient, "client must not be null"); - if (logger.isDebugEnabled()) - logger.debug("ctor: configured with client type {}", e2MgrClient.getClass().getName()); - this.e2MgrClient = e2MgrClient; + public E2ManagerController(final HealthCheckApi healthCheckApi, final X2SetupRequestApi x2SetupRequestApi) { + Assert.notNull(healthCheckApi, "API must not be null"); + this.healthCheckApi = healthCheckApi; + this.x2SetupRequestApi = x2SetupRequestApi; } private void assertNotNull(Object o) { @@ -85,32 +86,32 @@ public class E2ManagerController { @RequestMapping(value = "/health", method = RequestMethod.GET) public void getHealth(HttpServletResponse response) { logger.debug("getHealth"); - e2MgrClient.getHealth(); - response.setStatus(e2MgrClient.getApiClient().getStatusCode().value()); + healthCheckApi.healthCheck(); + response.setStatus(healthCheckApi.getApiClient().getStatusCode().value()); } - @ApiOperation(value = "Gets the unique requests submitted to the E2 manager.", response = RanSetupRequest.class, responseContainer = "List") + @ApiOperation(value = "Gets the unique requests submitted to the E2 manager.", response = SetupRequest.class, responseContainer = "List") @RequestMapping(value = "/setup", method = RequestMethod.GET) - public Iterable getRequests() { + public Iterable getRequests() { logger.debug("getRequests"); return requests; } @ApiOperation(value = "Sets up a RAN connection via the E2 manager.") @RequestMapping(value = "/setup", method = RequestMethod.POST) - public void setup(@RequestBody RanSetupRequest rsr, HttpServletResponse response) { - logger.debug("setup {}", rsr); + public void setup(@RequestBody SetupRequest setupRequest, HttpServletResponse response) { + logger.debug("setup {}", setupRequest); try { - assertNotEmpty(rsr.getRanIp()); - assertNotEmpty(rsr.getRanName()); - assertNotNull(rsr.getRanPort()); + assertNotEmpty(setupRequest.getRanIp()); + assertNotEmpty(setupRequest.getRanName()); + assertNotNull(setupRequest.getRanPort()); } catch (Exception ex) { logger.error("Bad request", ex); response.setStatus(HttpServletResponse.SC_BAD_REQUEST); } try { - requests.add(rsr); - e2MgrClient.setupRan(rsr); + requests.add(setupRequest); + x2SetupRequestApi.setup(setupRequest); } catch (Exception ex) { logger.error("Failed", ex); response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/SimpleErrorController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java similarity index 98% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/SimpleErrorController.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java index f7180d3a..334a88cb 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/SimpleErrorController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.controller; +package org.oransc.ric.portal.dashboard.controller; import java.util.Map; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java similarity index 91% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java index 9eb62e8a..1101ac68 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/controller/XappManagerController.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java @@ -17,18 +17,18 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.controller; +package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import javax.servlet.http.HttpServletResponse; -import org.oranosc.ric.portal.dash.DashboardConstants; -import org.oranosc.ric.portal.dash.model.ErrorTransport; -import org.oranosc.ric.xappmgr.client.api.DefaultApi; -import org.oranosc.ric.xappmgr.client.model.AllXapps; -import org.oranosc.ric.xappmgr.client.model.XAppInfo; -import org.oranosc.ric.xappmgr.client.model.Xapp; +import org.oransc.ric.portal.dashboard.DashboardConstants; +import org.oransc.ric.portal.dashboard.model.ErrorTransport; +import org.oransc.ric.xappmgr.client.api.DefaultApi; +import org.oransc.ric.xappmgr.client.model.AllXapps; +import org.oransc.ric.xappmgr.client.model.XAppInfo; +import org.oransc.ric.xappmgr.client.model.Xapp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/DelayTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java similarity index 96% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/DelayTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java index fe924d96..909b0bc1 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/DelayTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Trivial model to transport a number, to be serialized as JSON. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/ErrorTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java similarity index 98% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/ErrorTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java index 4bf90337..ff801bb2 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/ErrorTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Model for message returned on failure, to be serialized as JSON. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/IDashboardResponse.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java similarity index 95% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/IDashboardResponse.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java index 1cb0ca15..25c3fc52 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/IDashboardResponse.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Marker interface used by all transport models. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/LoadTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java similarity index 96% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/LoadTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java index 7d142bd3..0e75d523 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/LoadTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Trivial model to transport a number, to be serialized as JSON. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/MetricsTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java similarity index 97% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/MetricsTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java index 38f3fc79..2809544e 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/MetricsTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Trivial model to transport a batch of numbers, to be serialized as JSON. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/PathTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java similarity index 96% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/PathTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java index 5a155087..e9a63f71 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/PathTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Trivial model to transport a path, to be serialized as JSON. diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/SuccessTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java similarity index 96% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/SuccessTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java index ceba0ae5..4af67c3f 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/SuccessTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; public class SuccessTransport implements IDashboardResponse { diff --git a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/UrlTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java similarity index 96% rename from webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/UrlTransport.java rename to webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java index cf7f7408..5067243a 100644 --- a/webapp-backend/src/main/java/org/oranosc/ric/portal/dash/model/UrlTransport.java +++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java @@ -18,7 +18,7 @@ * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash.model; +package org.oransc.ric.portal.dashboard.model; /** * Trivial model to transport a URL, to be serialized as JSON. diff --git a/webapp-backend/src/test/java/org/oranosc/ric/portal/dash/DashboardApplicationTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java similarity index 96% rename from webapp-backend/src/test/java/org/oranosc/ric/portal/dash/DashboardApplicationTest.java rename to webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java index 10bcbdc1..c4652576 100644 --- a/webapp-backend/src/test/java/org/oranosc/ric/portal/dash/DashboardApplicationTest.java +++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java @@ -17,7 +17,7 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dash; +package org.oransc.ric.portal.dashboard; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/webapp-frontend/pom.xml b/webapp-frontend/pom.xml index d386e5b9..e738a127 100644 --- a/webapp-frontend/pom.xml +++ b/webapp-frontend/pom.xml @@ -22,20 +22,24 @@ limitations under the License. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.oranosc.ric.portal.dashboard - ric-dash-parent - 1.0.0-SNAPSHOT - + + org.o-ran-sc.portal.ric-dashboard + ric-dash-parent + 1.0.1-SNAPSHOT + ric-dash-fe - RIC Dashboard Webapp frontend + RIC Dashboard Webapp frontend + + + true + org.apache.maven.plugins maven-deploy-plugin - + true diff --git a/xapp-mgr-client/pom.xml b/xapp-mgr-client/pom.xml index ad034ad6..3f468a99 100644 --- a/xapp-mgr-client/pom.xml +++ b/xapp-mgr-client/pom.xml @@ -23,26 +23,26 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.oranosc.ric.portal.dashboard + org.o-ran-sc.portal.ric-dashboard ric-dash-parent - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT - org.oranosc.ric.xappmgr.client + + org.o-ran-sc.ric.xappmgr.client xapp-mgr-client RIC xApp Manager client 0.0.10-SNAPSHOT UTF-8 UTF-8 - 1.5.15 - org.oranosc.ric.xappmgr.client + org.oransc.ric.xappmgr.client io.swagger swagger-annotations - ${swagger-annotations-version} + 1.5.15 org.springframework @@ -91,6 +91,7 @@ limitations under the License. + io.swagger swagger-codegen-maven-plugin 2.4.5 @@ -113,13 +114,6 @@ limitations under the License. java8 Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0 - - - http://gerrit.oran-osc.org - RIC Team - - AT&T and Nokia - ${client.base.package.name} ${client.base.package.name}.model diff --git a/xapp-mgr-client/src/main/resources/.gitignore b/xapp-mgr-client/src/main/resources/.gitignore new file mode 100644 index 00000000..de73726a --- /dev/null +++ b/xapp-mgr-client/src/main/resources/.gitignore @@ -0,0 +1 @@ +xapp_manager_rest_api_v0_0_10.yaml diff --git a/xapp-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/xmc/demo/XappManagerClientTest.java b/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java similarity index 78% rename from xapp-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/xmc/demo/XappManagerClientTest.java rename to xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java index eaf316d5..9a310bc2 100644 --- a/xapp-mgr-client/src/test/java/org/oranosc/ric/portal/dashboard/xmc/demo/XappManagerClientTest.java +++ b/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java @@ -17,19 +17,23 @@ * limitations under the License. * ========================LICENSE_END=================================== */ -package org.oranosc.ric.portal.dashboard.xmc.demo; +package org.oransc.ric.portal.dashboard.xappmgr.client.test; import org.junit.jupiter.api.Test; -import org.oranosc.ric.xappmgr.client.api.DefaultApi; -import org.oranosc.ric.xappmgr.client.invoker.ApiClient; -import org.oranosc.ric.xappmgr.client.model.AllXapps; -import org.oranosc.ric.xappmgr.client.model.Xapp; +import org.oransc.ric.xappmgr.client.api.DefaultApi; +import org.oransc.ric.xappmgr.client.invoker.ApiClient; +import org.oransc.ric.xappmgr.client.model.AllXapps; +import org.oransc.ric.xappmgr.client.model.Xapp; import org.springframework.web.client.RestClientException; /** * Demonstrates use of the generated xApp manager client. * * The test fails because no server is available. + * + * The ugly name "DefaultApi" is generated because the spec lacks appropriate + * tags on the operation, also see + * https://stackoverflow.com/questions/38293236/swagger-swagger-codegen-maven-plugin-generate-default-api-interface */ public class XappManagerClientTest { -- 2.16.6