Rename artifacts in A1 controller
Change-Id: I0aa592dd98a1f6c9a038aa3415e363d1263772d6
Issue-ID: NONRTRIC-201
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
diff --git a/sdnc-a1-controller/oam/README.md b/sdnc-a1-controller/oam/README.md
index 2cabf6b..7f74ef7 100644
--- a/sdnc-a1-controller/oam/README.md
+++ b/sdnc-a1-controller/oam/README.md
@@ -1,15 +1,4 @@
-This source repository contains the code for SDN Controller operations, administration and maintenance utilities. This code depends on the following, which should be downloaded and compiled first:
-
-1. org.openecomp.sdnc/sdnc-core
-2. org.openecomp.sdnc/sdnc-adaptors
-3. org.openecomp.sdnc/sdnc-northbound
-4. org.openecomp.sdnc/sdnc-plugins
-
-To compile this code:
-
-1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example.
-
-2. To compile, run "mvn clean install".
+This source repository contains the code for SDN-A1 Controller operations, administration and maintenance utilities. To compile, run "mvn clean install".
## License
diff --git a/sdnc-a1-controller/oam/installation/TagVersion.groovy b/sdnc-a1-controller/oam/installation/TagVersion.groovy
index 9daac31..551eb70 100644
--- a/sdnc-a1-controller/oam/installation/TagVersion.groovy
+++ b/sdnc-a1-controller/oam/installation/TagVersion.groovy
@@ -21,7 +21,7 @@
*
*/
-package org.onap.sdnc.oam
+package org.o_ran_sc.nonrtric.sdnc_a1.oam
def versionArray;
diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml
index 76ff884..0b64bca 100644
--- a/sdnc-a1-controller/oam/installation/pom.xml
+++ b/sdnc-a1-controller/oam/installation/pom.xml
@@ -28,14 +28,14 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <groupId>org.onap.sdnc.oam</groupId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
<artifactId>installation</artifactId>
<version>1.7.3-SNAPSHOT</version>
- <name>sdnc-oam :: installation</name>
+ <name>sdnc-a1-oam :: installation</name>
<description>Installs SDN-C on local file system</description>
<modules>
- <module>sdnc</module>
+ <module>sdnc-a1</module>
</modules>
</project>
diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
similarity index 97%
rename from sdnc-a1-controller/oam/installation/sdnc/pom.xml
rename to sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
index 8525571..bf8bfe3 100644
--- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
@@ -28,11 +28,11 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation-sdnc</artifactId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
+ <artifactId>installation-sdnc-a1</artifactId>
<version>1.7.3-SNAPSHOT</version>
- <name>sdnc-oam :: installation :: ${project.artifactId}</name>
+ <name>sdnc-a1-oam :: installation :: ${project.artifactId}</name>
<description>Creates SDN Controller Docker container</description>
<properties>
@@ -50,15 +50,15 @@
<dependencies>
<dependency>
- <groupId>org.onap.sdnc.northbound</groupId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
<artifactId>nonrt-ric-api-installer</artifactId>
<version>${sdnc.northbound.version}</version>
<classifier>repo</classifier>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>sdnc-northbound-features-installer</artifactId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
+ <artifactId>sdnc-a1-northbound-features-installer</artifactId>
<version>${sdnc.northbound.version}</version>
<classifier>repo</classifier>
<type>zip</type>
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
similarity index 88%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
index 629732c..3077ee5 100755
--- a/sdnc-a1-controller/oam/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/docker/standalone.Dockerfile
@@ -20,7 +20,7 @@
FROM nexus3.onap.org:10001/onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
-MAINTAINER SDN-C Team (sdnc@lists.onap.org)
+MAINTAINER O-RAN-SC NONRTRIC Team
ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
ENV ODL_HOME /opt/opendaylight
@@ -28,7 +28,7 @@
ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
ENV SSL_CERTS_DIR /etc/ssl/certs
ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
+ENV SDNC_NORTHBOUND_REPO mvn:org.o-ran-sc.nonrtric.sdnc-a1.northbound/sdnc-a1-northbound-all/${sdnc.northbound.version}/xml/features
ENV SDNC_KEYSTORE ${sdnc.keystore}
ENV SDNC_KEYPASS ${sdnc.keypass}
ENV SDNC_SECUREPORT ${sdnc.secureport}
@@ -40,7 +40,7 @@
# Add SDNC repositories to boot repositories
RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-a1-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg
# Install ssl and java certificates
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/sdnctl.dump
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/sdnctl.dump
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/resources/truststoreONAPall.jks
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/resources/truststoreONAPall.jks
Binary files differ
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/addSdncKeyStore.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/addSdncKeyStore.sh
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installCerts.py
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installCerts.py
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh
similarity index 100%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/installSdncDb.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/installSdncDb.sh
diff --git a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
similarity index 96%
rename from sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh
rename to sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
index 9418984..1b8f519 100755
--- a/sdnc-a1-controller/oam/installation/sdnc/src/main/scripts/startODL.sh
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/src/main/scripts/startODL.sh
@@ -51,9 +51,9 @@
if [ ! -f ${INSTALLED_DIR}/.installed ]
then
- echo "Installing SDN-C database"
+ echo "Installing SDNC-A1 database"
${SDNC_HOME}/bin/installSdncDb.sh
- echo "Installing SDN-C keyStore"
+ echo "Installing SDNC-A1 keyStore"
${SDNC_HOME}/bin/addSdncKeyStore.sh
if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
index 668c5b0..77fb72c 100644
--- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml
@@ -28,12 +28,12 @@
<relativePath/>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
<version>1.7.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+ <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
<description>Contains platform-level service logic installer</description>
<build>
diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml
index 2644861..c4f3e8f 100644
--- a/sdnc-a1-controller/oam/platform-logic/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/pom.xml
@@ -28,12 +28,12 @@
<relativePath/>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
<artifactId>platform-logic</artifactId>
<version>1.7.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>sdnc-oam :: platform-logic</name>
+ <name>sdnc-a1-oam :: platform-logic</name>
<description>Contains platform-level service logic</description>
<organization>
<name>ONAP</name>
diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
index 68e506c..4b8b354 100644
--- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
+++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml
@@ -28,12 +28,12 @@
<relativePath/>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
<version>1.7.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
+ <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
<description>Copies base ONAP platform-logic</description>
<build>
diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml
index 6ac9f90..8cc1cab 100755
--- a/sdnc-a1-controller/oam/pom.xml
+++ b/sdnc-a1-controller/oam/pom.xml
@@ -27,12 +27,12 @@
<version>1.4.3</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>sdnc-oam</artifactId>
+ <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
+ <artifactId>sdnc-a1-oam</artifactId>
<version>1.7.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>sdnc-oam</name>
+ <name>sdnc-a1-oam</name>
<description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
<url>https://wiki.onap.org</url>
<organization>
@@ -43,27 +43,6 @@
<module>platform-logic</module>
</modules>
- <scm>
- <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection>
- <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection>
- <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url>
- <tag>HEAD</tag>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>https://jira.onap.org/</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://jenkins.onap.org/</url>
- </ciManagement>
- <distributionManagement>
- <site>
- <id>sdnc-javadoc</id>
- <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
-
<build>
<plugins>
<plugin>