From: Lott, Christopher (cl778h) Date: Wed, 4 Mar 2020 15:15:26 +0000 (-0500) Subject: Revise groupIds in POM files; no functional changes X-Git-Tag: 2.0.2~17 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ea0bb57b5c50ec5a60901c7227bf269009120968;p=portal%2Fric-dashboard.git Revise groupIds in POM files; no functional changes Harmonize package name components like ric.plt to ric-plt. Clean up some comments in POM files also. Change-Id: I7d17b2fc71fc89194cb1cefd594b0d7fbd58857e Signed-off-by: Lott, Christopher (cl778h) --- diff --git a/dashboard/a1-med-client/pom.xml b/dashboard/a1-med-client/pom.xml index 227b09cf..34ee440b 100644 --- a/dashboard/a1-med-client/pom.xml +++ b/dashboard/a1-med-client/pom.xml @@ -28,9 +28,9 @@ limitations under the License. 2.0.1-SNAPSHOT - org.o-ran-sc.ric.plt.a1med.client + org.o-ran-sc.ric-plt.a1.client a1-med-client - RIC A1 Mediator client + RIC A1 Mediator Client 2.1.0-SNAPSHOT @@ -39,7 +39,7 @@ limitations under the License. 0 - org.oransc.ric.a1med.client + org.oransc.ricplt.a1.client diff --git a/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java b/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java index 7066f2fc..8e5cef4e 100644 --- a/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java +++ b/dashboard/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java @@ -21,8 +21,8 @@ package org.oransc.ric.portal.dashboard.a1med.client.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.a1med.client.api.A1MediatorApi; -import org.oransc.ric.a1med.client.invoker.ApiClient; +import org.oransc.ricplt.a1.client.api.A1MediatorApi; +import org.oransc.ricplt.a1.client.invoker.ApiClient; import org.springframework.web.client.RestClientException; /** diff --git a/dashboard/app-mgr-client/pom.xml b/dashboard/app-mgr-client/pom.xml index 6f608116..3c1ae83a 100644 --- a/dashboard/app-mgr-client/pom.xml +++ b/dashboard/app-mgr-client/pom.xml @@ -28,9 +28,9 @@ limitations under the License. 2.0.1-SNAPSHOT - org.o-ran-sc.ric.plt.appmgr.client + org.o-ran-sc.ric-plt.appmgr.client app-mgr-client - RIC App Manager client + RIC App Manager Client 0.3.3-SNAPSHOT @@ -39,7 +39,7 @@ limitations under the License. 0 - org.oransc.ric.plt.appmgr.client + org.oransc.ricplt.appmgr.client diff --git a/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java b/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java index a4593752..614e173d 100644 --- a/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java +++ b/dashboard/app-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/appmgr/client/test/AppManagerClientTest.java @@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.appmgr.client.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.plt.appmgr.client.api.HealthApi; -import org.oransc.ric.plt.appmgr.client.api.XappApi; -import org.oransc.ric.plt.appmgr.client.invoker.ApiClient; -import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps; -import org.oransc.ric.plt.appmgr.client.model.Xapp; +import org.oransc.ricplt.appmgr.client.api.HealthApi; +import org.oransc.ricplt.appmgr.client.api.XappApi; +import org.oransc.ricplt.appmgr.client.invoker.ApiClient; +import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps; +import org.oransc.ricplt.appmgr.client.model.Xapp; import org.springframework.web.client.RestClientException; /** diff --git a/dashboard/e2-mgr-client/pom.xml b/dashboard/e2-mgr-client/pom.xml index 08a13df8..d19f810c 100644 --- a/dashboard/e2-mgr-client/pom.xml +++ b/dashboard/e2-mgr-client/pom.xml @@ -28,9 +28,9 @@ limitations under the License. 2.0.1-SNAPSHOT - org.o-ran-sc.ric.plt.e2mgr.client + org.o-ran-sc.ric-plt.e2mgr.client e2-mgr-client - RIC E2 Manager client + RIC E2 Manager Client 3.0.3-SNAPSHOT UTF-8 @@ -38,7 +38,7 @@ limitations under the License. 0 - org.oransc.ric.e2mgr.client + org.oransc.ricplt.e2mgr.client diff --git a/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java b/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java index 14e52584..f242009a 100644 --- a/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java +++ b/dashboard/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java @@ -21,8 +21,8 @@ package org.oransc.ric.portal.dashboard.e2mgr.client.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.invoker.ApiClient; +import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi; +import org.oransc.ricplt.e2mgr.client.invoker.ApiClient; import org.springframework.web.client.RestClientException; /** diff --git a/dashboard/pom.xml b/dashboard/pom.xml index 3723fc34..b61a4b02 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -23,7 +23,6 @@ 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.springframework.boot spring-boot-starter-parent 2.2.4.RELEASE @@ -31,7 +30,7 @@ limitations under the License. org.o-ran-sc.portal.ric-dashboard ric-dash-parent - RIC Dashboard project + RIC Dashboard Project pom 2.0.1-SNAPSHOT diff --git a/dashboard/webapp-backend/pom.xml b/dashboard/webapp-backend/pom.xml index f1dfa7f5..5e944213 100644 --- a/dashboard/webapp-backend/pom.xml +++ b/dashboard/webapp-backend/pom.xml @@ -27,8 +27,9 @@ limitations under the License. ric-dash-parent 2.0.1-SNAPSHOT + ric-dash-be - RIC Dashboard Webapp backend + RIC Dashboard Webapp Backend 2.9.2 @@ -44,17 +45,17 @@ limitations under the License. - org.o-ran-sc.ric.plt.a1med.client + org.o-ran-sc.ric-plt.a1.client a1-med-client 2.1.0-SNAPSHOT - org.o-ran-sc.ric.plt.appmgr.client + org.o-ran-sc.ric-plt.appmgr.client app-mgr-client 0.3.3-SNAPSHOT - org.o-ran-sc.ric.plt.e2mgr.client + org.o-ran-sc.ric-plt.e2mgr.client e2-mgr-client 3.0.3-SNAPSHOT diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java index 21f30334..4604e3c9 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorApiBuilder.java @@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import org.oransc.ric.a1med.client.api.A1MediatorApi; -import org.oransc.ric.a1med.client.invoker.ApiClient; import org.oransc.ric.portal.dashboard.model.RicInstance; import org.oransc.ric.portal.dashboard.model.RicRegionList; +import org.oransc.ricplt.a1.client.api.A1MediatorApi; +import org.oransc.ricplt.a1.client.invoker.ApiClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.client.RestTemplate; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java index c92baa7d..5ea3d954 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AppManagerApiBuilder.java @@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import org.oransc.ric.plt.appmgr.client.api.HealthApi; -import org.oransc.ric.plt.appmgr.client.api.XappApi; -import org.oransc.ric.plt.appmgr.client.invoker.ApiClient; import org.oransc.ric.portal.dashboard.model.RicInstance; import org.oransc.ric.portal.dashboard.model.RicRegionList; +import org.oransc.ricplt.appmgr.client.api.HealthApi; +import org.oransc.ricplt.appmgr.client.api.XappApi; +import org.oransc.ricplt.appmgr.client.invoker.ApiClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.client.RestTemplate; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java index c0291842..9b8a01cf 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerApiBuilder.java @@ -21,11 +21,11 @@ package org.oransc.ric.portal.dashboard.config; import java.lang.invoke.MethodHandles; -import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.api.NodebApi; -import org.oransc.ric.e2mgr.client.invoker.ApiClient; import org.oransc.ric.portal.dashboard.model.RicInstance; import org.oransc.ric.portal.dashboard.model.RicRegionList; +import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi; +import org.oransc.ricplt.e2mgr.client.api.NodebApi; +import org.oransc.ricplt.e2mgr.client.invoker.ApiClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.client.RestTemplate; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java index 2b64e8d1..c31fc0be 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediatorController.java @@ -22,12 +22,12 @@ package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; import java.util.List; -import org.oransc.ric.a1med.client.api.A1MediatorApi; -import org.oransc.ric.a1med.client.model.PolicyTypeSchema; import org.oransc.ric.portal.dashboard.DashboardApplication; import org.oransc.ric.portal.dashboard.DashboardConstants; import org.oransc.ric.portal.dashboard.config.A1MediatorApiBuilder; import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ricplt.a1.client.api.A1MediatorApi; +import org.oransc.ricplt.a1.client.model.PolicyTypeSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java index b9695f5b..cd3d8a91 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/AppManagerController.java @@ -21,21 +21,21 @@ package org.oransc.ric.portal.dashboard.controller; import java.lang.invoke.MethodHandles; -import org.oransc.ric.plt.appmgr.client.api.HealthApi; -import org.oransc.ric.plt.appmgr.client.api.XappApi; -import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps; -import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps; -import org.oransc.ric.plt.appmgr.client.model.AllXappConfig; -import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors; -import org.oransc.ric.plt.appmgr.client.model.XAppConfig; -import org.oransc.ric.plt.appmgr.client.model.Xapp; -import org.oransc.ric.plt.appmgr.client.model.XappDescriptor; import org.oransc.ric.portal.dashboard.DashboardApplication; import org.oransc.ric.portal.dashboard.DashboardConstants; import org.oransc.ric.portal.dashboard.config.AppManagerApiBuilder; import org.oransc.ric.portal.dashboard.model.AppTransport; import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps; import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ricplt.appmgr.client.api.HealthApi; +import org.oransc.ricplt.appmgr.client.api.XappApi; +import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps; +import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps; +import org.oransc.ricplt.appmgr.client.model.AllXappConfig; +import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors; +import org.oransc.ricplt.appmgr.client.model.XAppConfig; +import org.oransc.ricplt.appmgr.client.model.Xapp; +import org.oransc.ricplt.appmgr.client.model.XappDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java index 296d33be..ea0422eb 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java @@ -23,17 +23,17 @@ import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; -import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.api.NodebApi; -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.DashboardApplication; import org.oransc.ric.portal.dashboard.DashboardConstants; import org.oransc.ric.portal.dashboard.config.E2ManagerApiBuilder; import org.oransc.ric.portal.dashboard.model.RanDetailsTransport; import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi; +import org.oransc.ricplt.e2mgr.client.api.NodebApi; +import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentity; +import org.oransc.ricplt.e2mgr.client.model.ResetRequest; +import org.oransc.ricplt.e2mgr.client.model.SetupRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java index bb581aa8..6045127b 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/RanDetailsTransport.java @@ -19,8 +19,8 @@ */ package org.oransc.ric.portal.dashboard.model; -import org.oransc.ric.e2mgr.client.model.GetNodebResponse; -import org.oransc.ric.e2mgr.client.model.NodebIdentity; +import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentity; public class RanDetailsTransport implements IDashboardResponse { diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java index 67b2176c..b1ff3f9c 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java @@ -31,10 +31,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.oransc.ric.a1med.client.api.A1MediatorApi; -import org.oransc.ric.a1med.client.invoker.ApiClient; -import org.oransc.ric.a1med.client.model.PolicyTypeSchema; import org.oransc.ric.portal.dashboard.TestUtils; +import org.oransc.ricplt.a1.client.api.A1MediatorApi; +import org.oransc.ricplt.a1.client.invoker.ApiClient; +import org.oransc.ricplt.a1.client.model.PolicyTypeSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java index 36f6ff32..32a775fa 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java @@ -26,23 +26,23 @@ import static org.mockito.Mockito.when; import java.lang.invoke.MethodHandles; -import org.oransc.ric.plt.appmgr.client.api.HealthApi; -import org.oransc.ric.plt.appmgr.client.api.XappApi; -import org.oransc.ric.plt.appmgr.client.invoker.ApiClient; -import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps; -import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps; -import org.oransc.ric.plt.appmgr.client.model.AllXappConfig; -import org.oransc.ric.plt.appmgr.client.model.ConfigMetadata; -import org.oransc.ric.plt.appmgr.client.model.ConfigValidationError; -import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors; -import org.oransc.ric.plt.appmgr.client.model.EventType; -import org.oransc.ric.plt.appmgr.client.model.SubscriptionRequest; -import org.oransc.ric.plt.appmgr.client.model.SubscriptionResponse; -import org.oransc.ric.plt.appmgr.client.model.XAppConfig; -import org.oransc.ric.plt.appmgr.client.model.Xapp; -import org.oransc.ric.plt.appmgr.client.model.Xapp.StatusEnum; -import org.oransc.ric.plt.appmgr.client.model.XappDescriptor; -import org.oransc.ric.plt.appmgr.client.model.XappInstance; +import org.oransc.ricplt.appmgr.client.api.HealthApi; +import org.oransc.ricplt.appmgr.client.api.XappApi; +import org.oransc.ricplt.appmgr.client.invoker.ApiClient; +import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps; +import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps; +import org.oransc.ricplt.appmgr.client.model.AllXappConfig; +import org.oransc.ricplt.appmgr.client.model.ConfigMetadata; +import org.oransc.ricplt.appmgr.client.model.ConfigValidationError; +import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors; +import org.oransc.ricplt.appmgr.client.model.EventType; +import org.oransc.ricplt.appmgr.client.model.SubscriptionRequest; +import org.oransc.ricplt.appmgr.client.model.SubscriptionResponse; +import org.oransc.ricplt.appmgr.client.model.XAppConfig; +import org.oransc.ricplt.appmgr.client.model.Xapp; +import org.oransc.ricplt.appmgr.client.model.Xapp.StatusEnum; +import org.oransc.ricplt.appmgr.client.model.XappDescriptor; +import org.oransc.ricplt.appmgr.client.model.XappInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java index 16d24861..812ba203 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java @@ -30,14 +30,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.api.NodebApi; -import org.oransc.ric.e2mgr.client.invoker.ApiClient; -import org.oransc.ric.e2mgr.client.model.GetNodebResponse; -import org.oransc.ric.e2mgr.client.model.NodebIdentity; -import org.oransc.ric.e2mgr.client.model.NodebIdentityGlobalNbId; -import org.oransc.ric.e2mgr.client.model.ResetRequest; -import org.oransc.ric.e2mgr.client.model.SetupRequest; +import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi; +import org.oransc.ricplt.e2mgr.client.api.NodebApi; +import org.oransc.ricplt.e2mgr.client.invoker.ApiClient; +import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentity; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentityGlobalNbId; +import org.oransc.ricplt.e2mgr.client.model.ResetRequest; +import org.oransc.ricplt.e2mgr.client.model.SetupRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java index 286cfedb..cdea6d4b 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/A1MediatorConfigTest.java @@ -21,9 +21,9 @@ package org.oransc.ric.portal.dashboard.config.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.a1med.client.api.A1MediatorApi; import org.oransc.ric.portal.dashboard.config.A1MediatorApiBuilder; import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; +import org.oransc.ricplt.a1.client.api.A1MediatorApi; public class A1MediatorConfigTest extends AbstractConfigTest { diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java index adb428f2..7f232861 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/AppManagerConfigTest.java @@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.plt.appmgr.client.api.HealthApi; -import org.oransc.ric.plt.appmgr.client.api.XappApi; import org.oransc.ric.portal.dashboard.config.AppManagerApiBuilder; import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; +import org.oransc.ricplt.appmgr.client.api.HealthApi; +import org.oransc.ricplt.appmgr.client.api.XappApi; public class AppManagerConfigTest extends AbstractConfigTest { diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java index 8f79e384..c89a9f4d 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/test/E2ManagerConfigTest.java @@ -21,10 +21,10 @@ package org.oransc.ric.portal.dashboard.config.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.e2mgr.client.api.HealthCheckApi; -import org.oransc.ric.e2mgr.client.api.NodebApi; import org.oransc.ric.portal.dashboard.config.E2ManagerApiBuilder; import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; +import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi; +import org.oransc.ricplt.e2mgr.client.api.NodebApi; public class E2ManagerConfigTest extends AbstractConfigTest { diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java index 4021f5cb..2a9b8202 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/A1MediatorControllerTest.java @@ -27,11 +27,11 @@ import java.util.List; import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.a1med.client.model.PolicyTypeSchema; import org.oransc.ric.portal.dashboard.DashboardConstants; import org.oransc.ric.portal.dashboard.config.A1MediatorMockConfiguration; import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ricplt.a1.client.model.PolicyTypeSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java index 52a383ec..779feaf5 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/AppManagerControllerTest.java @@ -24,15 +24,15 @@ import java.net.URI; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps; -import org.oransc.ric.plt.appmgr.client.model.AllXappConfig; -import org.oransc.ric.plt.appmgr.client.model.XAppConfig; -import org.oransc.ric.plt.appmgr.client.model.Xapp; -import org.oransc.ric.plt.appmgr.client.model.XappDescriptor; import org.oransc.ric.portal.dashboard.DashboardConstants; import org.oransc.ric.portal.dashboard.config.RICInstanceMockConfiguration; import org.oransc.ric.portal.dashboard.model.DashboardDeployableXapps; import org.oransc.ric.portal.dashboard.model.SuccessTransport; +import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps; +import org.oransc.ricplt.appmgr.client.model.AllXappConfig; +import org.oransc.ricplt.appmgr.client.model.XAppConfig; +import org.oransc.ricplt.appmgr.client.model.Xapp; +import org.oransc.ricplt.appmgr.client.model.XappDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpEntity; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java index e6744fee..96ff35e3 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/controller/E2ManagerControllerTest.java @@ -25,15 +25,15 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -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.oransc.ricplt.e2mgr.client.model.GetNodebResponse; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentity; +import org.oransc.ricplt.e2mgr.client.model.ResetRequest; +import org.oransc.ricplt.e2mgr.client.model.SetupRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java index 8e2ddeb9..17fb48f3 100644 --- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java +++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/model/ModelTest.java @@ -26,10 +26,10 @@ import java.util.List; import org.junit.Assert; import org.junit.jupiter.api.Test; import org.onap.portalsdk.core.restful.domain.EcompUser; -import org.oransc.ric.e2mgr.client.model.GetNodebResponse; -import org.oransc.ric.e2mgr.client.model.NodebIdentity; import org.oransc.ric.portal.dashboard.DashboardUserManagerTest; import org.oransc.ric.portal.dashboard.exception.UnknownInstanceException; +import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse; +import org.oransc.ricplt.e2mgr.client.model.NodebIdentity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dashboard/webapp-frontend/pom.xml b/dashboard/webapp-frontend/pom.xml index c39db7f4..d7261094 100644 --- a/dashboard/webapp-frontend/pom.xml +++ b/dashboard/webapp-frontend/pom.xml @@ -27,8 +27,9 @@ limitations under the License. ric-dash-parent 2.0.1-SNAPSHOT + ric-dash-fe - RIC Dashboard Webapp frontend + RIC Dashboard Webapp Frontend