diff options
| -rw-r--r-- | dgbuilder-docker/pom.xml | 27 | ||||
| -rw-r--r-- | dgbuilder/pom.xml | 33 | ||||
| -rw-r--r-- | odlsli/pom.xml | 24 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installCcsdkFeatures.sh | 108 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installFeatures.sh | 85 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installSdncDb.sh | 6 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installZips.sh | 49 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 14 | ||||
| -rw-r--r-- | opendaylight/carbon/pom.xml | 24 | ||||
| -rw-r--r-- | opendaylight/nitrogen/pom.xml | 22 | ||||
| -rw-r--r-- | opendaylight/pom.xml | 13 | ||||
| -rw-r--r-- | platform-logic/asdc-api/pom.xml | 19 | ||||
| -rw-r--r-- | platform-logic/installer/pom.xml | 72 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 35 | ||||
| -rw-r--r-- | platform-logic/sliapi/pom.xml | 19 | ||||
| -rw-r--r-- | pom.xml | 29 | ||||
| -rw-r--r-- | ubuntu/pom.xml | 21 | ||||
| -rw-r--r-- | version.properties | 2 |
18 files changed, 300 insertions, 302 deletions
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 73d84713..ef72f1d9 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <artifactId>distribution-root</artifactId> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-dgbuilder-docker</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - dgbuilder-docker</name> + <name>ccsdk-distribution :: dgbuilder-docker</name> <description>Creates docker container for dgbuilder</description> + <organization> + <name>ONAP</name> + </organization> <properties> <image.name>onap/ccsdk-dgbuilder-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> - <build> <plugins> @@ -85,8 +86,8 @@ </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> <execution> @@ -175,7 +176,8 @@ </plugin> </plugins> </build> - <profiles> + + <profiles> <profile> <id>docker</id> <build> @@ -226,7 +228,4 @@ </build> </profile> </profiles> - <organization> - <name>ONAP</name> - </organization> </project> diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index a82829f4..f3e073ab 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-root</artifactId> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-dgbuilder</artifactId> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <version>0.2.0-SNAPSHOT</version> - - <name>Distribution - dgbuilder</name> + <name>ccsdk-distribution :: dgbuilder</name> <description>Directed Graph Builder</description> + <organization> + <name>ONAP</name> + </organization> <properties> <application.name>dgbuilder</application.name> @@ -34,9 +35,9 @@ <version>${sdnctl.sli.version}</version> </dependency> <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${mariadb.connector.version}</version> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> </dependency> <dependency> <groupId>org.antlr</groupId> @@ -131,8 +132,4 @@ </plugin> </plugins> </build> - <organization> - <name>ONAP</name> - </organization> </project> - diff --git a/odlsli/pom.xml b/odlsli/pom.xml index ba9fc265..68865e9b 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -1,19 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <artifactId>distribution-odlsli</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - odlsli</name> + <name>ccsdk-distribution :: odlsli</name> <description>Creates SDN Controller Docker container</description> + <organization> + <name>openECOMP</name> + </organization> <properties> <image.name>onap/ccsdk-odlsli-image</image.name> @@ -21,7 +24,6 @@ <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> </properties> - <build> <plugins> @@ -202,8 +204,8 @@ </executions> </plugin> <plugin> - <artifactId>exec-maven-plugin</artifactId> <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> <version>1.5.0</version> <executions> @@ -254,7 +256,6 @@ </plugins> - </build> <profiles> @@ -307,7 +308,4 @@ </build> </profile> </profiles> - <organization> - <name>openECOMP</name> - </organization> </project> diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh new file mode 100644 index 00000000..9aff1d8c --- /dev/null +++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh @@ -0,0 +1,108 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} +CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features} + +CCSDK_CORE_FEATURES=" \ + slicore-utils \ + dblib \ + filters \ + sli \ + sliPluginUtils \ + sliapi" + +CCSDK_ADAPTORS_FEATURES=" \ + aai-service \ + mdsal-resource \ + resource-assignment \ + sql-resource" + +CCSDK_NORTHBOUND_FEATURES=" \ + asdcApi \ + dataChange" + +CCSDK_PLUGINS_FEATURES=" \ + properties-node \ + restapi-call-node" + + +CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.0.1-SNAPSHOT} +CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} +CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} +CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.0.1-SNAPSHOT} + +echo "Enabling core features" +${ODL_HOME}/bin/client feature:install odl-mdsal-all +${ODL_HOME}/bin/client feature:install odl-mdsal-apidocs +${ODL_HOME}/bin/client feature:install odl-restconf-all + + + + +echo "Installing CCSDK sli/core" +for feature in ${CCSDK_CORE_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 sdnc-${feature}" + fi +done + +echo "Installing CCSDK sli/adaptors" +for feature in ${CCSDK_ADAPTORS_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 ccsdk-${feature}" + fi +done + +echo "Installing CCSDK sli/northbound" +for feature in ${CCSDK_NORTHBOUND_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + + +echo "Installing CCSDK sli/plugins" +for feature in ${CCSDK_PLUGINS_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done diff --git a/odlsli/src/main/scripts/installFeatures.sh b/odlsli/src/main/scripts/installFeatures.sh index 37532e7d..e6b35bdd 100644 --- a/odlsli/src/main/scripts/installFeatures.sh +++ b/odlsli/src/main/scripts/installFeatures.sh @@ -21,87 +21,6 @@ # ============LICENSE_END========================================================= ### -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} -ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} -SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -SDNC_CORE_FEATURES=" \ - slicore-utils \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" - -SDNC_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" - -SDNC_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange" - -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} - -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 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 - 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 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 +${CCSDK_HOME}/bin/installCcsdkFeatures.sh
\ No newline at end of file diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh index eaac0221..efd7fe02 100644 --- a/odlsli/src/main/scripts/installSdncDb.sh +++ b/odlsli/src/main/scripts/installSdncDb.sh @@ -21,7 +21,7 @@ # ============LICENSE_END========================================================= ### -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} @@ -39,7 +39,7 @@ GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRAN commit; END -if [ -f ${SDNC_HOME}/data/odlsli.dump ] +if [ -f ${CCSDK_HOME}/data/odlsli.dump ] then -mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/odlsli.dump +mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump fi diff --git a/odlsli/src/main/scripts/installZips.sh b/odlsli/src/main/scripts/installZips.sh index 85e33800..f3d296a2 100644 --- a/odlsli/src/main/scripts/installZips.sh +++ b/odlsli/src/main/scripts/installZips.sh @@ -28,12 +28,12 @@ then GLOBAL_SETTINGS_FILE=${GLOBAL_SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}} fi -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -targetDir=${1:-${SDNC_HOME}} +targetDir=${1:-${CCSDK_HOME}} featureDir=${targetDir}/features -SDNC_CORE_FEATURES=" \ +CCSDK_CORE_FEATURES=" \ utils \ dblib \ filters \ @@ -41,24 +41,24 @@ SDNC_CORE_FEATURES=" \ sliPluginUtils \ sliapi" -SDNC_ADAPTORS_FEATURES=" \ +CCSDK_ADAPTORS_FEATURES=" \ aai-service \ mdsal-resource \ resource-assignment \ sql-resource" -SDNC_NORTHBOUND_FEATURES=" \ +CCSDK_NORTHBOUND_FEATURES=" \ asdcApi \ dataChange " -SDNC_PLUGINS_FEATURES=" \ +CCSDK_PLUGINS_FEATURES=" \ properties-node \ restapi-call-node" -SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.2} -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} +CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.2.1-SNAPSHOT} +CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.2.1-SNAPSHOT} +CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.2.1-SNAPSHOT} +CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.2.1-SNAPSHOT} if [ ! -d ${targetDir} ] then @@ -75,43 +75,44 @@ cwd=$(pwd) mavenOpts=${2:-"-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"} cd /tmp -echo "Installing SDN-C core version ${SDNC_CORE_VERSION}" -for feature in ${SDNC_CORE_FEATURES} +echo "Installing CCSDK sli/core version ${CCSDK_CORE_VERSION}" +for feature in ${CCSDK_CORE_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.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.onap.ccsdk.sli.core:${feature}-installer:${CCSDK_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C adaptors version ${SDNC_ADAPTORS_VERSION}" -for feature in ${SDNC_ADAPTORS_FEATURES} +echo "Installing CCSDK sli/adaptors version ${CCSDK_ADAPTORS_VERSION}" +for feature in ${CCSDK_ADAPTORS_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.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.onap.ccsdk.sli.adaptors:${feature}-installer:${CCSDK_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C northbound version ${SDNC_NORTHBOUND_VERSION}" -for feature in ${SDNC_NORTHBOUND_FEATURES} +echo "Installing CCSDK sli/northbound version ${CCSDK_NORTHBOUND_VERSION}" +for feature in ${CCSDK_NORTHBOUND_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.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.onap.ccsdk.sli.northbound:${feature}-installer:${CCSDK_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C plugins version ${SDNC_PLUGINS_VERSION}" -for feature in ${SDNC_PLUGINS_FEATURES} + +echo "Installing CCSDK sli/plugins version ${CCSDK_PLUGINS_VERSION}" +for feature in ${CCSDK_PLUGINS_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.plugins:${feature}-installer:${SDNC_PLUGINS_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.onap.ccsdk.sli.plugins:${feature}-installer:${CCSDK_PLUGINS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing platform-logic" +echo "Installing CCSDK platform-logic" rm -f /tmp/platform-logic-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.distribution:platform-logic-installer:${SDNC_OAM_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.onap.ccsdk.distribution:platform-logic-installer:${CCSDK_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${targetDir} /tmp/platform-logic-installer*.zip find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index cbc856d9..50e45ce0 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -26,7 +26,7 @@ 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} SLEEP_TIME=${SLEEP_TIME:-120} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} @@ -41,26 +41,26 @@ do done echo -e "\nmysql ready" -if [ ! -f ${SDNC_HOME}/.installed ] +if [ ! -f ${CCSDK_HOME}/.installed ] then echo "Installing SDN-C database" - ${SDNC_HOME}/bin/installSdncDb.sh + ${CCSDK_HOME}/bin/installSdncDb.sh echo "Starting OpenDaylight" ${ODL_HOME}/bin/start echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize" sleep ${SLEEP_TIME} echo "Installing SDN-C platform features" - ${SDNC_HOME}/bin/installFeatures.sh - if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] + ${CCSDK_HOME}/bin/installFeatures.sh + if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ] then echo "Installing directed graphs" - ${SDNC_HOME}/svclogic/bin/install.sh + ${CCSDK_HOME}/svclogic/bin/install.sh fi echo "Restarting OpenDaylight" ${ODL_HOME}/bin/stop - echo "Installed at `date`" > ${SDNC_HOME}/.installed + echo "Installed at `date`" > ${CCSDK_HOME}/.installed fi exec ${ODL_HOME}/bin/karaf diff --git a/opendaylight/carbon/pom.xml b/opendaylight/carbon/pom.xml index aab4f8e3..764598b5 100644 --- a/opendaylight/carbon/pom.xml +++ b/opendaylight/carbon/pom.xml @@ -1,23 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-opendaylight</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odl-carbon</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - opendaylight</name> + <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name> <description>Creates OpenDaylight container</description> + <organization> + <name>openECOMP</name> + </organization> <properties> - <image.name>onap/ccsdk-odl-image</image.name> + <image.name>onap/ccsdk-odl-carbon-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.opendaylight.version>0.6.1-Carbon</ccsdk.opendaylight.version> <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> @@ -160,7 +163,6 @@ </plugins> - </build> <profiles> @@ -215,8 +217,4 @@ </profile> </profiles> - <organization> - <name>openECOMP</name> - </organization> - <groupId>org.onap.ccsdk.distribution</groupId> </project> diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml index b14b1603..4eb2134c 100644 --- a/opendaylight/nitrogen/pom.xml +++ b/opendaylight/nitrogen/pom.xml @@ -1,23 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-opendaylight</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>distribution-odl-nitrogen</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - opendaylight</name> + <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name> <description>Creates OpenDaylight container</description> + <organization> + <name>ONAP</name> + </organization> <properties> - <image.name>onap/ccsdk-odl-nitrogen-image</image.name> + <image.name>onap/ccsdk-odl-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version> <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version> @@ -161,7 +163,6 @@ </plugins> - </build> <profiles> @@ -216,7 +217,4 @@ </profile> </profiles> - <organization> - <name>ONAP</name> - </organization> </project> diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 46d98bf5..d7cc1ed3 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>distribution-opendaylight</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - opendaylight</name> + <name>ccsdk-distribution :: opendaylight</name> <description>Creates OpenDaylight container</description> <modules> diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index c49549f9..b704bec9 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>0.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>platform-logic-asdcapi</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic : ASDC-API</name> + <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> <description>Contains platform-level service logic for the ASDC-API</description> - <build> <plugins> <plugin> @@ -53,5 +51,4 @@ </plugin> </plugins> </build> - </project> diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6cc968af..ca58f6da 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -1,22 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-platform-logic</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>platform-logic-installer</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic Installer</name> + <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> <description>Contains platform-level service logic installer</description> - + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-common</artifactId> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4</artifactId> + <version>${antlr.version}</version> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>${mariadb.connector.version}</version> + </dependency> + </dependencies> <build> <plugins> @@ -91,37 +115,5 @@ </executions> </plugin> </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-common</artifactId> - <version>${sdnctl.sli.version}</version> - </dependency> - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>${mariadb.connector.version}</version> - </dependency> - </dependencies> - </project> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 9dfa384f..f7b665af 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -1,20 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-root</artifactId> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>distribution-platform-logic</artifactId> + <version>0.2.1-SNAPSHOT</version> <packaging>pom</packaging> - <artifactId>distribution-platform-logic</artifactId> - <version>0.2.0-SNAPSHOT</version> - <name>Platform Logic </name> + <name>ccsdk-distribution :: platform-logic</name> <description>Contains platform-level service logic</description> + <organization> + <name>openECOMP</name> + </organization> + + <modules> + <module>asdc-api</module> + <module>sliapi</module> + <module>installer</module> + </modules> <properties> <application.name>platform-logic</application.name> @@ -22,13 +30,4 @@ <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> </properties> - - <modules> - <module>asdc-api</module> - <module>sliapi</module> - <module>installer</module> - </modules> - <organization> - <name>openECOMP</name> - </organization> </project> diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 93fd4744..19bc3588 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-platform-logic</artifactId> - <version>0.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.distribution</groupId> + <artifactId>distribution-platform-logic</artifactId> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>platform-logic-sliapi</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic : SLI-API</name> + <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name> <description>Contains platform-level service logic for the SLI-API</description> - <build> <plugins> <plugin> @@ -53,5 +51,4 @@ </plugin> </plugins> </build> - </project> @@ -1,22 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> <name>ccsdk-distribution</name> <description>Creates distributuon bundles for CCSDK</description> + <modules> + <module>platform-logic</module> + <module>ubuntu</module> + <module>opendaylight</module> + <module>odlsli</module> + <module>dgbuilder</module> + <module>dgbuilder-docker</module> + </modules> + <properties> <application.name>distribution</application.name> @@ -41,13 +49,4 @@ </plugin> </plugins> </build> - - <modules> - <module>platform-logic</module> - <module>ubuntu</module> - <module>opendaylight</module> - <module>odlsli</module> - <module>dgbuilder</module> - <module>dgbuilder-docker</module> - </modules> </project> diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index da4b4765..613766bd 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <artifactId>distribution-ubuntu</artifactId> - <version>0.2.0-SNAPSHOT</version> + <version>0.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Distribution - ubuntu</name> + <name>ccsdk-distribution :: ubuntu</name> <description>Creates base ubuntu Docker container</description> + <organization> + <name>openECOMP</name> + </organization> <properties> <image.name>onap/ccsdk-ubuntu-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> </properties> - <build> <plugins> @@ -83,7 +84,6 @@ </executions> </plugin> </plugins> - </build> <profiles> @@ -138,7 +138,4 @@ </build> </profile> </profiles> - <organization> - <name>openECOMP</name> - </organization> </project> diff --git a/version.properties b/version.properties index bf303c1b..26f5c6e3 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=2 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} |