From 98ddb133dec262b727b93eab40f384b88fed864a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 1 Sep 2017 17:40:45 -0400 Subject: [PATCH] Build sdnc/oam from ccsdk Update sdnc/oam to build from ccsdk. To get a clean build, it was necessary to also change openecomp references to onap. Change-Id: I90d939e77504cd58148889aff2a50f060e27f963 Issue-ID: SDNC-50 Signed-off-by: Dan Timoney Former-commit-id: e391e1e3ca8ea5385bb1f77ed7c4c83935451575 --- .gitignore | 2 + admportal/pom.xml | 10 +- dgbuilder/pom.xml | 10 +- installation/admportal/pom.xml | 20 ++-- installation/admportal/src/main/docker/Dockerfile | 2 +- installation/dgbuilder/pom.xml | 20 ++-- installation/pom.xml | 51 +++++----- installation/sdnc/pom.xml | 109 +++------------------ installation/sdnc/src/main/docker/Dockerfile | 21 ++-- .../sdnc/src/main/scripts/installFeatures.sh | 59 +---------- .../sdnc/src/main/scripts/installSdncDb.sh | 6 +- installation/sdnc/src/main/scripts/installZips.sh | 36 ++----- installation/sdnc/src/main/scripts/startODL.sh | 8 +- installation/ubuntu/pom.xml | 10 +- platform-logic/asdc-api/pom.xml | 8 +- platform-logic/installer/pom.xml | 10 +- platform-logic/pom.xml | 8 +- platform-logic/sliapi/pom.xml | 8 +- platform-logic/vnfapi/pom.xml | 8 +- pom.xml | 30 +++--- 20 files changed, 136 insertions(+), 300 deletions(-) diff --git a/.gitignore b/.gitignore index 662e956a..b9f593a1 100755 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ local-mode-cache #dgbuilder releases #**/dgbuilder/releases +#version plugin backups +**/*.versionsBackup diff --git a/admportal/pom.xml b/admportal/pom.xml index 1bdb85f0..aebb75b3 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam sdnc-oam - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam admportal - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Admin Portal Admin Portal @@ -29,7 +29,7 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common ${sdnctl.sli.version} diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 98631295..5f5056eb 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam sdnc-oam - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam dgbuilder - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Directed Graph Builder Directed Graph Builder @@ -29,7 +29,7 @@ - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common ${sdnctl.sli.version} diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 3476b6f0..bb607147 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -3,22 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation-admportal - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Installation - admportal Creates admportal Docker container - openecomp/admportal-sdnc-image + onap/admportal-sdnc-image ${project.version} @@ -130,7 +130,7 @@ validate - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties ../src/main/properties @@ -160,7 +160,7 @@ /usr/bin/unzip -d - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc ../../admportal/target/*.zip @@ -176,7 +176,7 @@ /bin/cp ../../admportal/config/admportal.json - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties @@ -191,7 +191,7 @@ /bin/cp ../../admportal/config/admportal.log4js.json - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties @@ -206,7 +206,7 @@ /usr/bin/find - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc -name *.sh -exec diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index 4006af3e..fadb8120 100644 --- a/installation/admportal/src/main/docker/Dockerfile +++ b/installation/admportal/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM openecomp/ubuntu-sdnc-image:${project.version} +FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # create link for pm2 diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index e88658c6..644d8f63 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -3,22 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation-dgbuilder - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Installation - dgbuilder Creates docker container for dgbuilder - openecomp/dgbuilder-sdnc-image + onap/dgbuilder-sdnc-image ${project.version} @@ -141,7 +141,7 @@ /bin/mkdir -p - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc @@ -155,7 +155,7 @@ /usr/bin/unzip -d - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc ../../dgbuilder/target/*.zip @@ -171,7 +171,7 @@ -r ../../dgbuilder - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc @@ -185,7 +185,7 @@ /bin/bash - ${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh + ${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh 1702 dguser change_email_id@dgbuilder.com @@ -202,7 +202,7 @@ /usr/bin/find - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc -name *.sh -exec diff --git a/installation/pom.xml b/installation/pom.xml index 4605633c..1d9f97e4 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -1,35 +1,34 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.openecomp.sdnc.oam - sdnc-oam - 1.1.2-SNAPSHOT - + + org.onap.sdnc.oam + sdnc-oam + 1.2.0-SNAPSHOT + - 4.0.0 - pom - org.openecomp.sdnc.oam - installation - 1.1.2-SNAPSHOT + 4.0.0 + pom + org.onap.sdnc.oam + installation + 1.2.0-SNAPSHOT - Installation - Installs SDN-C on local file system + Installation + Installs SDN-C on local file system - - installation + + installation - yyMMdd-HHmmss - ${maven.build.timestamp} - UTF-8 - UTF-8 - + yyMMdd-HHmmss + ${maven.build.timestamp} + 0.1.0-SNAPSHOT + UTF-8 + UTF-8 + - -ubuntu -sdnc -admportal -dgbuilder - + + sdnc + admportal + diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 24344d07..f609fbb6 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -3,48 +3,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation-sdnc - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Installation - sdnc Creates SDN Controller Docker container - openecomp/sdnc-image + onap/sdnc-image ${project.version} - ${project.version} - ${project.version} - ${project.version} - ${project.version} - 0.5.1-Boron-SR1 - 5.1.39 + ${project.version} ${https_proxy} - - - - org.opendaylight.integration - distribution-karaf - ${sdnc.opendaylight.version} - tar.gz - - - mysql - mysql-connector-java - ${sdnc.mysql-connector-java.version} - jar - - - @@ -125,67 +104,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-odl-distribution - validate - - copy - - - - - org.opendaylight.integration - distribution-karaf - ${sdnc.opendaylight.version} - tar.gz - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-mysql-connector-jar - validate - - copy - - - - - mysql - mysql-connector-java - ${sdnc.mysql-connector-java.version} - jar - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - maven-resources-plugin @@ -218,7 +136,7 @@ validate - ${basedir}/target/docker-stage/opt/openecomp/sdnc/bin + ${basedir}/target/docker-stage/opt/onap/sdnc/bin src/main/scripts @@ -257,7 +175,7 @@ validate - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data + ${basedir}/target/docker-stage/opt/onap/sdnc/data src/main/resources @@ -276,7 +194,7 @@ validate - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties + ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties ../src/main/properties @@ -295,7 +213,7 @@ validate - ${basedir}/target/docker-stage/opt/openecomp/sdnc/data/stores + ${basedir}/target/docker-stage/opt/onap/sdnc/data/stores ../src/main/stores @@ -324,15 +242,12 @@ /bin/bash - ${sdnc.core.version} - ${sdnc.adaptors.version} ${sdnc.northbound.version} - ${sdnc.plugins.version} ${project.version} ${basedir}/src/main/scripts/installZips.sh - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc @@ -346,7 +261,7 @@ /usr/bin/find - ${basedir}/target/docker-stage/opt/openecomp/sdnc + ${basedir}/target/docker-stage/opt/onap/sdnc -name *.sh -exec diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 37db15db..c67c3339 100644 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -1,29 +1,20 @@ # Base ubuntu with added packages needed for open ecomp -FROM openecomp/ubuntu-sdnc-image:${project.version} +FROM onap/ccsdk-odlsli-image:${ccsdk.distribution.version} -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) +MAINTAINER SDN-C Team (sdnc@lists.onap.org) ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight/current -ENV SDNC_CONFIG_DIR /opt/openecomp/sdnc/data/properties +ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties -# copy the opendaylight tar and expand -COPY distribution-karaf-${sdnc.opendaylight.version}.tar.gz /tmp/ -RUN mkdir /opt/opendaylight \ - && tar zxvf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz --directory /opt/opendaylight \ - && rm -rf /tmp/distribution-karaf-${sdnc.opendaylight.version}.tar.gz \ - && ln -s /opt/opendaylight/distribution-karaf-${sdnc.opendaylight.version} /opt/opendaylight/current \ - && mkdir /opt/openecomp +# Overlay ODL credential database with pre-staged credentials COPY idmlight.db.mv.db /opt/opendaylight/current -# copy openecomp +# copy onap COPY opt /opt -RUN ln -s /opt/openecomp/sdnc /opt/sdnc +RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc -# workaround till we get proxy working -RUN mkdir -p /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version} -COPY mysql-connector-java-${sdnc.mysql-connector-java.version}.jar /opt/opendaylight/current/system/mysql/mysql-connector-java/${sdnc.mysql-connector-java.version} # ENTRYPOINT exec /opt/opendaylight/current/bin/karaf EXPOSE 8181 diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index bdca3855..56a5fe57 100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,34 +26,14 @@ ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJv SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc} SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} -SDNC_CORE_FEATURES=" \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" - -SDNC_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" SDNC_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange \ vnfapi \ vnftools" -SDNC_PLUGINS_FEATURES=" \ - properties-node \ - restapi-call-node" -SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT} -SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} -SDNC_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 @@ -63,28 +43,6 @@ ${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all -echo "Installing SDN-C core" -for feature in ${SDNC_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 SDN-C adaptors" -for feature in ${SDNC_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 SDN-C northbound" for feature in ${SDNC_NORTHBOUND_FEATURES} do @@ -96,13 +54,4 @@ do fi done -echo "Installing SDN-C plugins" -for feature in ${SDNC_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 + diff --git a/installation/sdnc/src/main/scripts/installSdncDb.sh b/installation/sdnc/src/main/scripts/installSdncDb.sh index 37329d7b..c9110f82 100644 --- a/installation/sdnc/src/main/scripts/installSdncDb.sh +++ b/installation/sdnc/src/main/scripts/installSdncDb.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,7 @@ # ============LICENSE_END========================================================= ### -SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} diff --git a/installation/sdnc/src/main/scripts/installZips.sh b/installation/sdnc/src/main/scripts/installZips.sh index 06b13da0..77052758 100644 --- a/installation/sdnc/src/main/scripts/installZips.sh +++ b/installation/sdnc/src/main/scripts/installZips.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,40 +28,20 @@ then GLOBAL_SETTINGS_FILE=${GLOBAL_SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}} fi -SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} targetDir=${1:-${SDNC_HOME}} featureDir=${targetDir}/features -SDNC_CORE_FEATURES=" \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" - -SDNC_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" SDNC_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange \ vnfapi \ vnftools" -SDNC_PLUGINS_FEATURES=" \ - properties-node \ - restapi-call-node" -SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.1} -SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.1.1} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.1.1} -SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.1.1} -SDNC_OAM_VERSION=${SDNC_OAM_VERSION:-0.1.1} +SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0} +SDNC_OAM_VERSION=${SDNC_OAM_VERSION:-1.2.0} if [ ! -d ${targetDir} ] then @@ -82,7 +62,7 @@ echo "Installing SDN-C core version ${SDNC_CORE_VERSION}" for feature in ${SDNC_CORE_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.core:${feature}-installer:${SDNC_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true + mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.core:${feature}-installer:${SDNC_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done @@ -90,7 +70,7 @@ echo "Installing SDN-C adaptors version ${SDNC_ADAPTORS_VERSION}" for feature in ${SDNC_ADAPTORS_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.adaptors:${feature}-installer:${SDNC_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true + mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.adaptors:${feature}-installer:${SDNC_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done @@ -98,7 +78,7 @@ echo "Installing SDN-C northbound version ${SDNC_NORTHBOUND_VERSION}" for feature in ${SDNC_NORTHBOUND_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.northbound:${feature}-installer:${SDNC_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true + mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.openecomp.sdnc.northbound:${feature}-installer:${SDNC_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 3a6071ef..cbc856d9 100644 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -10,9 +10,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,11 +26,11 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} -SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} SLEEP_TIME=${SLEEP_TIME:-120} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} -# +# # Wait for database # echo "Waiting for mysql" diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index 9a7ceefb..c702b474 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -3,22 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam installation-ubuntu - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Installation - ubuntu Creates base ubuntu Docker container - openecomp/ubuntu-sdnc-image + onap/ubuntu-sdnc-image ${project.version} diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 546814fb..581f8ec9 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic-asdcapi - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic : ASDC-API Contains platform-level service logic for the ASDC-API diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 351bacc2..84d95ab1 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic-installer - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic Installer Contains platform-level service logic installer @@ -107,7 +107,7 @@ compile - org.openecomp.sdnc.core + org.onap.ccsdk.sli.core sli-common ${sdnctl.sli.version} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 0ab9add5..df48229d 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam sdnc-oam - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic Contains platform-level service logic diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 82680a21..71ac1188 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic-sliapi - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic : SLI-API Contains platform-level service logic for the SLI-API diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 5ad7a035..0f5a3d1a 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam platform-logic-vnfapi - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic : VNF-API Contains platform-level service logic for the VNF-API diff --git a/pom.xml b/pom.xml index 37030ef6..c9274554 100755 --- a/pom.xml +++ b/pom.xml @@ -3,42 +3,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.openecomp.sdnc.core - root-boron-sr1 - 1.1.0 + org.onap.ccsdk.parent + odlparent-carbon-sr1 + 0.0.1-SNAPSHOT 4.0.0 pom - org.openecomp.sdnc.oam + org.onap.sdnc.oam sdnc-oam SDN-C OAM - https://wiki.openecomp.org + https://wiki.onap.org The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform. JIRA - https://jira.openecomp.org/ + https://jira.onap.org/ - scm:git:ssh://git@${openecomp.git.host}/sdnc-oam.git - scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-oam.git - ${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-oam/browse + scm:git:ssh://git@${onap.git.host}/sdnc-oam.git + scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git + ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse HEAD Jenkins - https://jenkins.openecomp.org/ + https://jenkins.onap.org/ sdnc-javadoc - dav:https://${openecomp.nexus.host}:${openecomp.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} + dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} @@ -101,9 +101,9 @@ 1.6.7 true - https://${openecomp.nexus.host} - ${openecomp.nexus.staging.profile-id} - ${openecomp.nexus.staging.server-id} + https://${onap.nexus.host} + ${onap.nexus.staging.profile-id} + ${onap.nexus.staging.server-id} @@ -118,7 +118,7 @@ AT&T - 1.1.2-SNAPSHOT + 1.2.0-SNAPSHOT -- 2.16.6