From 632987493c6c24532b2ec526b17daf73ee6d21f0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 1 Mar 2018 10:59:28 -0500 Subject: Nitrogen port : sdnc-oam Update sdnc-oam to create docker containers based on ODL Nitrogen release. Change-Id: If8df28c417a2dec69be6eee2fc4521541126085a Issue-ID: SDNC-269 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: 2822ea7882e20879b1556bf98cf28695f5052348 --- installation/admportal/pom.xml | 10 +- installation/dgbuilder/pom.xml | 10 +- installation/dmaap-listener/pom.xml | 47 +++++--- installation/pom.xml | 12 +- installation/sdnc/pom.xml | 12 +- .../sdnc/src/main/scripts/installFeatures.sh | 77 +----------- installation/sdnc/src/main/scripts/startODL.sh | 4 +- installation/ubuntu/pom.xml | 134 --------------------- installation/ubuntu/src/main/docker/Dockerfile | 24 ---- installation/ueb-listener/pom.xml | 48 +++++--- 10 files changed, 83 insertions(+), 295 deletions(-) delete mode 100644 installation/ubuntu/pom.xml delete mode 100644 installation/ubuntu/src/main/docker/Dockerfile (limited to 'installation') diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 6266049b..ca823723 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - admportal + sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index ceed5c32..fc19d352 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dgbuilder - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - dgbuilder + sdnc-oam :: installation :: ${project.artifactId} Creates docker container for dgbuilder diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index c894a249..1e4cafa6 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -3,23 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom installation-dmaap-listener - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - dmaap-listener + sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container onap/sdnc-dmaap-listener-image ${project.version} - 0.1.0 - 0.1.1 ${https_proxy} @@ -39,20 +37,29 @@ - println project.properties['sdnc.project.version']; + println + project.properties['sdnc.project.version']; def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); + if ( + project.properties['sdnc.project.version'] + != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + if + (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } - println 'New Tag for docker:' + + println 'New Tag for + docker:' + project.properties['project.docker.latesttag.version']; @@ -140,12 +147,12 @@ initialize - - org.onap.ccsdk.sli.northbound - dmaap-listener - zip - ${ccsdk.sli.northbound.version} - + + org.onap.ccsdk.sli.northbound + dmaap-listener + zip + ${ccsdk.sli.northbound.version} + ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener bin/**,**/*-javadoc.jar,**/*-sources.jar diff --git a/installation/pom.xml b/installation/pom.xml index 113a6088..ca4eb265 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - sdnc-oam - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation + sdnc-oam :: installation Installs SDN-C on local file system @@ -22,7 +22,7 @@ yyMMdd-HHmmss ${maven.build.timestamp} - v0.1.0 + 0.2.1-SNAPSHOT UTF-8 UTF-8 diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 0eaae82b..bafaed0e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -3,24 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - sdnc + sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container onap/sdnc-image ${project.version} - 1.2.2 + 1.3.1-SNAPSHOT ${https_proxy} diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 29a3a70e..66c09b2e 100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -24,90 +24,21 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} -CCSDK_SLI_CORE_FEATURES=" \ - slicore-utils \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" -CCSDK_SLI_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" - -CCSDK_SLI_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange" SDNC_NORTHBOUND_FEATURES=" \ generic-resource-api \ vnfapi \ vnftools" -CCSDK_SLI_PLUGINS_FEATURES=" \ - properties-node \ - restapi-call-node" - -CCSDK_SLI_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0-SNAPSHOT} - -echo "Enabling core features" -${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all -${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-apidocs -${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all - - -echo "Installing CCSDK SLI core" -for feature in ${CCSDK_SLI_CORE_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done - -echo "Installing CCSDK SLI adaptors" -for feature in ${CCSDK_SLI_ADAPTORS_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done -echo "Installing CCSDK SLI northbound" -for feature in ${CCSDK_SLI_NORTHBOUND_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done +SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT} -echo "Installing CCSDK SLI plugins" -for feature in ${CCSDK_SLI_PLUGINS_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done +# Install CCSDK features +${CCSDK_HOME}/bin/installCcsdkFeatures.sh echo "Installing SDN-C northbound" diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index ec7fb791..6f35ad30 100644 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -28,8 +28,8 @@ function enable_odl_cluster(){ fi echo "Installing Opendaylight cluster features" - ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-clustering - ${ODL_HOME}/bin/client -u karaf feature:install odl-jolokia + ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering + ${ODL_HOME}/bin/client feature:install odl-jolokia echo "Update cluster information statically" hm=$(hostname) diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml deleted file mode 100644 index 4d8deb63..00000000 --- a/installation/ubuntu/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT - - - 4.0.0 - pom - org.onap.sdnc.oam - installation-ubuntu - 1.3.0-SNAPSHOT - - Installation - ubuntu - Creates base ubuntu Docker container - - - onap/ubuntu-sdnc-image - ${project.version} - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - } - - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; - - - - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - generate-sources - - build - - - - - push-images - deploy - - build - push - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - - - - - openECOMP - - diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile deleted file mode 100644 index 464d4c0a..00000000 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM ubuntu:16.04 -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -# Add tools needed for OpenDaylight -RUN apt-get update && apt-get install -y git \ - graphviz \ - openjdk-8-jdk \ - maven \ - mysql-client \ - nodejs \ - nodejs-legacy \ - npm \ - python-pip \ - unzip diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 4260154d..2c2c300e 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -3,23 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom installation-ueb-listener - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - ueb-listener + sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container onap/sdnc-ueb-listener-image ${project.version} - 0.2.0-SNAPSHOT - ${https_proxy} + ${https_proxy} @@ -38,20 +37,29 @@ - println project.properties['sdnc.project.version']; + println + project.properties['sdnc.project.version']; def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); + if ( + project.properties['sdnc.project.version'] + != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + if + (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } - println 'New Tag for docker:' + + println 'New Tag for + docker:' + project.properties['project.docker.latesttag.version']; @@ -139,12 +147,12 @@ initialize - - org.onap.ccsdk.sli.northbound - ueb-listener - zip - ${ccsdk.sli.northbound.version} - + + org.onap.ccsdk.sli.northbound + ueb-listener + zip + ${ccsdk.sli.northbound.version} + ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener bin/**,**/*-javadoc.jar,**/*-sources.jar -- cgit 1.2.3-korg