From 6833a016b231f698789cf5e074efd558248db392 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 24 Jun 2021 08:11:04 -0400
Subject: Moving CCSDK/Features and ORAN Features to SDNC OAM

Cleaning up Dockerfile and Pom for related items

Issue-ID: CCSDK-3358
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Iea381caf4a9245e6dc65d9d322dd016a2df50a46
---
 odlsli/odlsli-alpine/pom.xml                    | 75 ++-----------------------
 odlsli/odlsli-alpine/src/main/docker/Dockerfile | 16 ++----
 2 files changed, 10 insertions(+), 81 deletions(-)

(limited to 'odlsli/odlsli-alpine')

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 307f7101..c112cb5a 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -31,12 +31,12 @@
         <opendaylight.root>opt/opendaylight</opendaylight.root>
 
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
-        <ccsdk.odl.features>
-            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
-        </ccsdk.odl.features>
-        <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-        <ccsdk.oran.a1adapter.version>1.1.6</ccsdk.oran.a1adapter.version>
+        <extra.odl.features>
+            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
+        </extra.odl.features>
+        <ccsdk.sli.features>
+            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
+        </ccsdk.sli.features>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -238,69 +238,6 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>aafshiro-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>sdnr-northbound-features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.oran</groupId>
-            <artifactId>a1-adapter-northbound-installer</artifactId>
-            <version>${ccsdk.oran.a1adapter.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>oofpcipoc-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.oran</groupId>
-            <artifactId>a1-adapter-installer</artifactId>
-            <version>${ccsdk.oran.a1adapter.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>CMNotify-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>ranSlice-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index be93e531..fd1a7598 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -20,22 +20,13 @@ mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.version}/xml/
 mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.version}/xml/features,\
 mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.version}/xml/features
 
-# CCSDK SDNR FEATURES
-ENV CCSDK_SDNR_FEATURES_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features,\
-mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\
-mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\
-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\
-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\
-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\
-mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features
-
 # ODL and CCSDK SLI featuresBoot defined in pom.xml
-ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
+ENV ODL_BOOT_FEATURES_EXTRA ${extra.odl.features},${ccsdk.sli.features}
 
 # Backing up existing karaf cfg and updating features boot and features repository
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresRepositories|s|$|,${CCSDK_SLI_FEATURES_REPO},${CCSDK_SDNR_FEATURES_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|,${CCSDK_SLI_FEATURES_REPO} |" $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 # Enable wheel and create a group and user
 RUN sed -i -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers \
@@ -56,7 +47,8 @@ LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
 USER root
 
 ENV JAVA_HOME /opt/java/openjdk
-ENV PATH ${JAVA_HOME}/bin:$PATH
+ENV PATH $PATH:/opt/java/openjdk/bin
+
 ENV ODL_HOME /opt/opendaylight/current
 ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
-- 
cgit 1.2.3-korg