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/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 ]