From c84dc84031fb219ce17dbc58304d12f6d961925b Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 24 Apr 2018 09:06:57 -0400 Subject: [PATCH] Add missing components in sdnc docker container Add missing components (ansible-adapter, lcm) to SDNC docker container. Also, version.properties and some pom.xmls so that release build of 1.3.1 works properly. Change-Id: I1e3e0a0a5b3ed7c6b584cae6c26a4afe503cebcf Issue-ID: SDNC-287 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: db25748dd03f8d48378130059ebde0fc70b7e58a --- admportal/pom.xml | 1 + installation/sdnc/pom.xml | 108 ++++++++++++++++----- .../sdnc/src/main/scripts/installFeatures.sh | 17 ++++ platform-logic/installer/pom.xml | 1 + platform-logic/pom.xml | 2 +- platform-logic/restapi-templates/pom.xml | 2 +- pom.xml | 6 +- version.properties | 2 +- 8 files changed, 109 insertions(+), 30 deletions(-) diff --git a/admportal/pom.xml b/admportal/pom.xml index 8ec41ea4..aa0d5287 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -7,6 +7,7 @@ org.onap.ccsdk.parent binding-parent 1.0.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 2b4cb107..330ac8c4 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -14,17 +14,49 @@ installation-sdnc 1.3.1-SNAPSHOT - sdnc-oam :: installation :: ${project.artifactId} + sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container onap/sdnc-image ${project.version} - 1.3.1-SNAPSHOT + 1.3.1-SNAPSHOT ${https_proxy} - yyyyMMdd'T'HHmmss'Z' + yyyyMMdd'T'HHmmss'Z' + + + org.onap.sdnc.northbound + generic-resource-api-installer + ${sdnc.northbound.version} + zip + + + org.onap.sdnc.northbound + vnfapi-installer + ${sdnc.northbound.version} + zip + + + org.onap.sdnc.northbound + vnftools-installer + ${sdnc.northbound.version} + zip + + + org.onap.ccsdk.sli.adaptors + ansible-adapter-installer + ${ccsdk.sli.adaptors.version} + zip + + + org.onap.ccsdk.sli.northbound + lcm-installer + ${ccsdk.sli.northbound.version} + zip + + @@ -44,18 +76,16 @@ println project.properties['sdnc.project.version']; def versionArray; if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); + 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"; + 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:' + - project.properties['project.docker.latesttag.version']; + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; @@ -229,29 +259,59 @@ - exec-maven-plugin - org.codehaus.mojo - 1.5.0 + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 - - Get features + unpack-sdnc-features generate-sources - exec + unpack-dependencies - /bin/bash - - ${sdnc.northbound.version} - ${project.version} - - - ${basedir}/src/main/scripts/installZips.sh - ${basedir}/target/docker-stage/opt/onap/sdnc - + ${basedir}/target/docker-stage/opt/onap/sdnc/features + org.onap.sdnc + true + + + + unpack-extra-ccsdk-features + generate-sources + + unpack-dependencies + + + ${basedir}/target/docker-stage/opt/onap/ccsdk/features + org.onap.ccsdk + true + + unpack dgs + generate-sources + + unpack + + + ${basedir}/target/docker-stage/opt/onap/sdnc + + + ${project.groupId} + platform-logic-installer + ${project.version} + zip + + + + + + + + exec-maven-plugin + org.codehaus.mojo + 1.5.0 + change shell permissions diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 66c09b2e..b9763630 100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -25,8 +25,13 @@ 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} +CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features} SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} +CCSDK_EXTRAS=" \ + ansible-adapter \ + lcm" + SDNC_NORTHBOUND_FEATURES=" \ @@ -40,6 +45,18 @@ SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT} # Install CCSDK features ${CCSDK_HOME}/bin/installCcsdkFeatures.sh +# Install CCSDK extras, used by SDNC but not APP-C +echo "Installing CCSDK extras" +for feature in ${CCSDK_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh + else + echo "No installer found for ${feature}" + fi +done + echo "Installing SDN-C northbound" for feature in ${SDNC_NORTHBOUND_FEATURES} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index d5208944..adba71e4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -6,6 +6,7 @@ org.onap.ccsdk.parent odlparent-lite 1.0.1-SNAPSHOT + org.onap.sdnc.oam diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 298b52fc..6bafb25a 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 0ada96fe..07f7b5db 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam platform-logic-restapi-templates - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index df369040..c49afae2 100755 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent - odlparent-carbon-sr1 - 0.1.0 + odlparent-lite + 1.0.1-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 1dcc37c2..9614fbff 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6