Update to ODL Aluminum SR1

Update to OpenDaylight Aluminum SR1 release

Change-Id: Ifcd172fec903dd2fb681b6998d45eac690066d10
Issue-ID: CCSDK-3107
Signed-off-by: Dan Timoney <dtimoney@att.com>
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

3 files changed, 49 insertions, 6 deletions

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 57031a1f..00b58973 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-odlsli</artifactId>
+        <version>1.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
@@ -21,7 +20,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index adb686ab..5fd78664 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -26,6 +26,7 @@ ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.s
 ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
 ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
 ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
+ENV CCSDK_FEATURES_SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features
 ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
 ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
 ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
@@ -36,6 +37,7 @@ ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 RUN apk update && apk --no-cache add sudo iputils openssl
 
 
+
 # Enable wheel group
 RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
 
@@ -47,7 +49,7 @@ COPY --from=stage0 --chown=odl:odl /opt /opt
 
 # Add CCSDK 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|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}, ${CCSDK_FEATURES_SDNR_NORTHBOUND_REPO} |"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 USER odl
diff --git a/odlsli/src/main/dc/docker-compose.yaml b/odlsli/src/main/dc/docker-compose.yaml
new file mode 100755
index 00000000..e48a8302
--- /dev/null
+++ b/odlsli/src/main/dc/docker-compose.yaml
@@ -0,0 +1,42 @@
+version: '2.1'
+
+services:
+  db:
+    image: mariadb:10.5
+    container_name: odlsli_db
+    ports:
+      - "3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - MYSQL_ROOT_HOST=%
+    logging:       
+      driver:   "json-file"
+      options:  
+        max-size: "30m"
+        max-file: "5"
+  
+      
+  odlsli:
+    image: onap/ccsdk-odlsli-alpine-image:latest
+    depends_on:
+      - db
+    container_name: odlsli_controller
+    entrypoint: ["/opt/onap/ccsdk/bin/startODL.sh"]
+    ports:
+      - "8383:8181"
+      - "1830:1830"
+      - "8543:8443"
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+    environment:
+      - MYSQL_ROOT_PASSWORD=MySecretPassword
+      - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
+    logging:       
+      driver:   "json-file"
+      options:  
+        max-size: "30m"
+        max-file: "5"
+
+