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) <cl778h@att.com>
<version>2.0.1-SNAPSHOT</version>
</parent>
<!-- This groupId will NOT allow deployment in LF -->
- <groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.a1.client</groupId>
<artifactId>a1-med-client</artifactId>
- <name>RIC A1 Mediator client</name>
+ <name>RIC A1 Mediator Client</name>
<!-- Update to match submodule tag -->
<version>2.1.0-SNAPSHOT</version>
<properties>
<!-- Jenkins invokes maven with -Dbuild.number=.. -->
<build.number>0</build.number>
<!-- same as groupId BUT without hyphens -->
- <client.base.package.name>org.oransc.ric.a1med.client</client.base.package.name>
+ <client.base.package.name>org.oransc.ricplt.a1.client</client.base.package.name>
</properties>
<!-- Successful compilation requires generated code dependencies -->
<dependencies>
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;
/**
<version>2.0.1-SNAPSHOT</version>
</parent>
<!-- This groupId will NOT allow deployment in LF -->
- <groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
- <name>RIC App Manager client</name>
+ <name>RIC App Manager Client</name>
<!-- Update to match submodule tag -->
<version>0.3.3-SNAPSHOT</version>
<properties>
<!-- Jenkins invokes maven with -Dbuild.number=.. -->
<build.number>0</build.number>
<!-- same as groupId BUT without hyphens -->
- <client.base.package.name>org.oransc.ric.plt.appmgr.client</client.base.package.name>
+ <client.base.package.name>org.oransc.ricplt.appmgr.client</client.base.package.name>
</properties>
<!-- Successful compilation requires generated code dependencies -->
<dependencies>
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;
/**
<version>2.0.1-SNAPSHOT</version>
</parent>
<!-- This groupId will NOT allow deployment in LF -->
- <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
- <name>RIC E2 Manager client</name>
+ <name>RIC E2 Manager Client</name>
<version>3.0.3-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Jenkins invokes maven with -Dbuild.number=.. -->
<build.number>0</build.number>
<!-- same as groupId BUT without hyphens -->
- <client.base.package.name>org.oransc.ric.e2mgr.client</client.base.package.name>
+ <client.base.package.name>org.oransc.ricplt.e2mgr.client</client.base.package.name>
</properties>
<!-- Successful compilation requires generated code dependencies -->
<dependencies>
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;
/**
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <!-- this group Id must match LF gerrit repository -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.4.RELEASE</version>
</parent>
<groupId>org.o-ran-sc.portal.ric-dashboard</groupId>
<artifactId>ric-dash-parent</artifactId>
- <name>RIC Dashboard project</name>
+ <name>RIC Dashboard Project</name>
<packaging>pom</packaging>
<version>2.0.1-SNAPSHOT</version>
<properties>
<artifactId>ric-dash-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
</parent>
+ <!-- reuse parent groupId -->
<artifactId>ric-dash-be</artifactId>
- <name>RIC Dashboard Webapp backend</name>
+ <name>RIC Dashboard Webapp Backend</name>
<properties>
<springfox.version>2.9.2</springfox.version>
<!-- Set by Jenkins -->
<dependencies>
<!-- Platform components -->
<dependency>
- <groupId>org.o-ran-sc.ric.plt.a1med.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.a1.client</groupId>
<artifactId>a1-med-client</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.o-ran-sc.ric.plt.appmgr.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.appmgr.client</groupId>
<artifactId>app-mgr-client</artifactId>
<version>0.3.3-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.o-ran-sc.ric.plt.e2mgr.client</groupId>
+ <groupId>org.o-ran-sc.ric-plt.e2mgr.client</groupId>
<artifactId>e2-mgr-client</artifactId>
<version>3.0.3-SNAPSHOT</version>
</dependency>
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;
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;
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;
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;
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;
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;
*/
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 {
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;
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;
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;
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 {
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 {
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 {
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;
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;
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;
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;
<artifactId>ric-dash-parent</artifactId>
<version>2.0.1-SNAPSHOT</version>
</parent>
+ <!-- reuse parent groupId -->
<artifactId>ric-dash-fe</artifactId>
- <name>RIC Dashboard Webapp frontend</name>
+ <name>RIC Dashboard Webapp Frontend</name>
<build>
<plugins>
<plugin>