Refactor distribution

groovy files updated and removed references to ccsdk

Issue-ID: OAM-540
Change-Id: If23485b8d612a6191c05b18767f54b70d1036ea1
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/distribution/oam-controller-web/pom.xml b/distribution/oam-controller-web/pom.xml
index b50c10f..7e71c11 100644 (file)
--- a/distribution/oam-controller-web/pom.xml
+++ b/distribution/oam-controller-web/pom.xml
@@ -14,13 +14,16 @@
         <base.image.repo>docker.io/bitnamilegacy/nginx:1.25-debian-12</base.image.repo>
         <image.name>o-ran-sc/oam-oam-controller/sdnr-web-image</image.name>
         <image.version>14.0.0-SNAPSHOT</image.version>
-        <sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnr-web.project.version>${project.version}</sdnr-web.project.version>
         <odlux.features.version>14.0.0-SNAPSHOT</odlux.features.version>
-        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+        <sdnr-web.build.timestamp>${maven.build.timestamp}</sdnr-web.build.timestamp>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
+        <docker.release.registry>nexus3.o-ran-sc.org:10002</docker.release.registry>
+        <docker.snapshot.registry>nexus3.o-ran-sc.org:10003</docker.snapshot.registry>
+        <docker.pull.registry>nexus3.o-ran-sc.org:10001</docker.pull.registry>
     </properties>
 
     <distributionManagement>
@@ -57,7 +60,7 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>${basedir}/../TagVersion.groovy</source>
+                            <source>${basedir}/src/main/groovy/TagVersion.groovy</source>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/distribution/TagVersion.groovy b/distribution/oam-controller-web/src/main/groovy/TagVersion.groovy
similarity index 77%
rename from distribution/TagVersion.groovy
rename to distribution/oam-controller-web/src/main/groovy/TagVersion.groovy
index bcf2452..32052d2 100644 (file)
--- a/distribution/TagVersion.groovy
+++ b/distribution/oam-controller-web/src/main/groovy/TagVersion.groovy
@@ -21,21 +21,23 @@
  *
  */
 
-package org.onap.sdnc.oam
+package org.o_ran_sc.oam_controller.sdnr_web
 
 
 def versionArray;
-if ( project.properties['sdnc.project.version'] != null ) {
-       versionArray = project.properties['sdnc.project.version'].split('\\.');
+if ( project.properties['sdnr-web.project.version'] != null ) {
+       versionArray = project.properties['sdnr-web.project.version'].split('\\.');
 }
 
-if ( project.properties['sdnc.project.version'].endsWith("-SNAPSHOT") ) {
+if ( project.properties['sdnr-web.project.version'].endsWith("-SNAPSHOT") ) {
        patchArray = versionArray[2].split('-');
        project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
        project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['sdnc.build.timestamp'];
+       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['sdnr-web.build.timestamp'];
+       project.properties['docker.push.registry']=project.properties['docker.snapshot.registry'];
 } else {
        project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
        project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['sdnc.build.timestamp'];
+       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['sdnr-web.build.timestamp'];
+       project.properties['docker.push.registry']=project.properties['docker.release.registry'];
 }

diff --git a/distribution/oam-controller/pom.xml b/distribution/oam-controller/pom.xml
index 4a0a925..29b9940 100644 (file)
--- a/distribution/oam-controller/pom.xml
+++ b/distribution/oam-controller/pom.xml
@@ -24,11 +24,11 @@
         <odl.karaf.version>0.21.2</odl.karaf.version>
         <odl.aaa.version>0.20.8</odl.aaa.version>
         <odl.ops4j.version>8.0.27</odl.ops4j.version>
-        <ccsdk.features.version>14.0.0-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.feature.groupid>org.o-ran-sc.oam-oam-controller.features.sdnr.wt</ccsdk.feature.groupid>
-        <ccsdk.feature.repopath>system/org/o-ran-sc/oam-oam-controller/features/sdnr/wt</ccsdk.feature.repopath>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+        <sdnr.features.version>14.0.0-SNAPSHOT</sdnr.features.version>
+        <sdnr.feature.groupid>org.o-ran-sc.oam-oam-controller.features.sdnr.wt</sdnr.feature.groupid>
+        <sdnr.feature.repopath>system/org/o-ran-sc/oam-oam-controller/features/sdnr/wt</sdnr.feature.repopath>
+        <sdnr.project.version>${project.version}</sdnr.project.version>
+        <sdnr.build.timestamp>${maven.build.timestamp}</sdnr.build.timestamp>
         <!-- Below not used -->
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
@@ -54,9 +54,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>${ccsdk.feature.groupid}</groupId>
+            <groupId>${sdnr.feature.groupid}</groupId>
             <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
+            <version>${sdnr.features.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>

diff --git a/distribution/oam-controller/src/main/docker/Dockerfile b/distribution/oam-controller/src/main/docker/Dockerfile
index 33f36a9..9c61b8d 100644 (file)
--- a/distribution/oam-controller/src/main/docker/Dockerfile
+++ b/distribution/oam-controller/src/main/docker/Dockerfile
@@ -5,13 +5,13 @@ ENV ODL_HOME /opt/opendaylight
 ENV IMAGEPATH ${base.image.repo}//${image.name}
 ENV IMAGENAMES "ONAP SDNC"//"SDNR Patches"
 ENV A1_ADAPTER_NORTHBOUND=false
-ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
-ENV CCSDKFEATURE_SDNR_GROUPID ${ccsdk.feature.groupid}
-ENV FEATURES_SDNR ${ccsdk.feature.repopath}
-ENV SDNR_DM_REPO mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator/${CCSDKFEATUREVERSION}/xml/features, \
-    mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager-base/${CCSDKFEATUREVERSION}/xml/features, \
-    mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager/${CCSDKFEATUREVERSION}/xml/features, \
-    mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-oauth/${CCSDKFEATUREVERSION}/xml/features
+ENV SDNRFEATUREVERSION ${sdnr.features.version}
+ENV SDNRFEATURE_SDNR_GROUPID ${sdnr.feature.groupid}
+ENV FEATURES_SDNR ${sdnr.feature.repopath}
+ENV SDNR_DM_REPO mvn:${SDNRFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator/${SDNRFEATUREVERSION}/xml/features, \
+    mvn:${SDNRFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager-base/${SDNRFEATUREVERSION}/xml/features, \
+    mvn:${SDNRFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager/${SDNRFEATUREVERSION}/xml/features, \
+    mvn:${SDNRFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-oauth/${SDNRFEATUREVERSION}/xml/features
 
 ENV SDNR_FEATURES_BOOT_INITIAL odl-restconf-all,odl-netconf-topology,odl-netconf-callhome-ssh,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
 ENV JAVA_OPTS="-Xms512m -Xmx3g" 

diff --git a/distribution/oam-controller/src/main/groovy/TagVersion.groovy b/distribution/oam-controller/src/main/groovy/TagVersion.groovy
index 404b597..56b6e23 100644 (file)
--- a/distribution/oam-controller/src/main/groovy/TagVersion.groovy
+++ b/distribution/oam-controller/src/main/groovy/TagVersion.groovy
@@ -21,23 +21,23 @@
  *
  */
 
-package org.onap.ccsdk.distribution
+package org.o_ran_sc.oam_controller.sdnr
 
 
 def versionArray;
-if ( project.properties['ccsdk.project.version'] != null ) {
-       versionArray = project.properties['ccsdk.project.version'].split('\\.');
+if ( project.properties['sdnr.project.version'] != null ) {
+       versionArray = project.properties['sdnr.project.version'].split('\\.');
 }
 
-if ( project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT") ) {
+if ( project.properties['sdnr.project.version'].endsWith("-SNAPSHOT") ) {
        patchArray = versionArray[2].split('-');
        project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
        project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp'];
+       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['sdnr.build.timestamp'];
        project.properties['docker.push.registry']=project.properties['docker.snapshot.registry'];
 } else {
        project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
        project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest";
-       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp'];
+       project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['sdnr.build.timestamp'];
        project.properties['docker.push.registry']=project.properties['docker.release.registry'];
 }