diff options
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rw-r--r-- | admportal/pom.xml | 10 | ||||
| -rw-r--r-- | dgbuilder/pom.xml | 10 | ||||
| -rw-r--r-- | installation/admportal/pom.xml | 20 | ||||
| -rw-r--r-- | installation/admportal/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | installation/dgbuilder/pom.xml | 20 | ||||
| -rw-r--r-- | installation/pom.xml | 51 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 109 | ||||
| -rw-r--r-- | installation/sdnc/src/main/docker/Dockerfile | 21 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/installFeatures.sh | 59 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/installSdncDb.sh | 6 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/installZips.sh | 36 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/startODL.sh | 8 | ||||
| -rw-r--r-- | installation/ubuntu/pom.xml | 10 | ||||
| -rw-r--r-- | platform-logic/asdc-api/pom.xml | 8 | ||||
| -rw-r--r-- | platform-logic/installer/pom.xml | 10 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 8 | ||||
| -rw-r--r-- | platform-logic/sliapi/pom.xml | 8 | ||||
| -rw-r--r-- | platform-logic/vnfapi/pom.xml | 8 | ||||
| -rwxr-xr-x | pom.xml | 30 |
20 files changed, 136 insertions, 300 deletions
@@ -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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>admportal</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Admin Portal</name> <description>Admin Portal</description> @@ -29,7 +29,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> <version>${sdnctl.sli.version}</version> </dependency> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>dgbuilder</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Directed Graph Builder</name> <description>Directed Graph Builder</description> @@ -29,7 +29,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> <version>${sdnctl.sli.version}</version> </dependency> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-admportal</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Installation - admportal</name> <description>Creates admportal Docker container</description> <properties> - <image.name>openecomp/admportal-sdnc-image</image.name> + <image.name>onap/admportal-sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> </properties> @@ -130,7 +130,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory> <resources> <resource> <directory>../src/main/properties</directory> @@ -160,7 +160,7 @@ <executable>/usr/bin/unzip</executable> <arguments> <argument>-d</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> <argument>../../admportal/target/*.zip</argument> </arguments> </configuration> @@ -176,7 +176,7 @@ <executable>/bin/cp</executable> <arguments> <argument>../../admportal/config/admportal.json</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument> </arguments> </configuration> </execution> @@ -191,7 +191,7 @@ <executable>/bin/cp</executable> <arguments> <argument>../../admportal/config/admportal.log4js.json</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument> </arguments> </configuration> </execution> @@ -206,7 +206,7 @@ <configuration> <executable>/usr/bin/find</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> <argument>-name</argument> <argument>*.sh</argument> <argument>-exec</argument> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-dgbuilder</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Installation - dgbuilder</name> <description>Creates docker container for dgbuilder</description> <properties> - <image.name>openecomp/dgbuilder-sdnc-image</image.name> + <image.name>onap/dgbuilder-sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> </properties> @@ -141,7 +141,7 @@ <executable>/bin/mkdir</executable> <arguments> <argument>-p</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> </arguments> </configuration> </execution> @@ -155,7 +155,7 @@ <executable>/usr/bin/unzip</executable> <arguments> <argument>-d</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> <argument>../../dgbuilder/target/*.zip</argument> </arguments> </configuration> @@ -171,7 +171,7 @@ <arguments> <argument>-r</argument> <argument>../../dgbuilder</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> </arguments> </configuration> </execution> @@ -185,7 +185,7 @@ <configuration> <executable>/bin/bash</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc/dgbuilder/createReleaseDir.sh</argument> <argument>1702</argument> <argument>dguser</argument> <argument>change_email_id@dgbuilder.com</argument> @@ -202,7 +202,7 @@ <configuration> <executable>/usr/bin/find</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> <argument>-name</argument> <argument>*.sh</argument> <argument>-exec</argument> 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 @@ <?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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.openecomp.sdnc.oam</groupId> - <artifactId>sdnc-oam</artifactId> - <version>1.1.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>sdnc-oam</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.1.2-SNAPSHOT</version> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>installation</artifactId> + <version>1.2.0-SNAPSHOT</version> - <name>Installation</name> - <description>Installs SDN-C on local file system</description> + <name>Installation</name> + <description>Installs SDN-C on local file system</description> - <properties> - <application.name>installation</application.name> + <properties> + <application.name>installation</application.name> - <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> + <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> + <build.number>${maven.build.timestamp}</build.number> + <ccsdk.distribution.version>0.1.0-SNAPSHOT</ccsdk.distribution.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> -<modules> -<module>ubuntu</module> -<module>sdnc</module> -<module>admportal</module> -<module>dgbuilder</module> -</modules> + <modules> + <module>sdnc</module> + <module>admportal</module> + </modules> </project> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Installation - sdnc</name> <description>Creates SDN Controller Docker container</description> <properties> - <image.name>openecomp/sdnc-image</image.name> + <image.name>onap/sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.core.version>${project.version}</sdnc.core.version> - <sdnc.adaptors.version>${project.version}</sdnc.adaptors.version> - <sdnc.northbound.version>${project.version}</sdnc.northbound.version> - <sdnc.plugins.version>${project.version}</sdnc.plugins.version> - <sdnc.opendaylight.version>0.5.1-Boron-SR1</sdnc.opendaylight.version> - <sdnc.mysql-connector-java.version>5.1.39</sdnc.mysql-connector-java.version> + <sdnc.northbound.version>${project.version}</sdnc.northbound.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.opendaylight.integration</groupId> - <artifactId>distribution-karaf</artifactId> - <version>${sdnc.opendaylight.version}</version> - <type>tar.gz</type> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${sdnc.mysql-connector-java.version}</version> - <type>jar</type> - </dependency> - </dependencies> - </dependencyManagement> <build> <plugins> @@ -125,67 +104,6 @@ </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>get-odl-distribution</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.opendaylight.integration</groupId> - <artifactId>distribution-karaf</artifactId> - <version>${sdnc.opendaylight.version}</version> - <type>tar.gz</type> - - <overWrite>true</overWrite> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>get-mysql-connector-jar</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${sdnc.mysql-connector-java.version}</version> - <type>jar</type> - - <overWrite>true</overWrite> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - </artifactItem> - </artifactItems> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -218,7 +136,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/bin</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory> <resources> <resource> <directory>src/main/scripts</directory> @@ -257,7 +175,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory> <resources> <resource> <directory>src/main/resources</directory> @@ -276,7 +194,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory> <resources> <resource> <directory>../src/main/properties</directory> @@ -295,7 +213,7 @@ </goals><!-- here the phase you need --> <phase>validate</phase> <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/stores</outputDirectory> + <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory> <resources> <resource> <directory>../src/main/stores</directory> @@ -324,15 +242,12 @@ <configuration> <executable>/bin/bash</executable> <environmentVariables> - <SDNC_CORE_VERSION>${sdnc.core.version}</SDNC_CORE_VERSION> - <SDNC_ADAPTORS_VERSION>${sdnc.adaptors.version}</SDNC_ADAPTORS_VERSION> <SDNC_NORTHBOUND_VERSION>${sdnc.northbound.version}</SDNC_NORTHBOUND_VERSION> - <SDNC_PLUGINS_VERSION>${sdnc.plugins.version}</SDNC_PLUGINS_VERSION> <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION> </environmentVariables> <arguments> <argument>${basedir}/src/main/scripts/installZips.sh</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> </arguments> </configuration> </execution> @@ -346,7 +261,7 @@ <configuration> <executable>/usr/bin/find</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> <argument>-name</argument> <argument>*.sh</argument> <argument>-exec</argument> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ubuntu</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Installation - ubuntu</name> <description>Creates base ubuntu Docker container</description> <properties> - <image.name>openecomp/ubuntu-sdnc-image</image.name> + <image.name>onap/ubuntu-sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> </properties> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-asdcapi</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Platform Logic : ASDC-API</name> <description>Contains platform-level service logic for the ASDC-API</description> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-installer</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Platform Logic Installer</name> <description>Contains platform-level service logic installer</description> @@ -107,7 +107,7 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> <version>${sdnctl.sli.version}</version> </dependency> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Platform Logic </name> <description>Contains platform-level service logic</description> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-sliapi</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Platform Logic : SLI-API</name> <description>Contains platform-level service logic for the SLI-API</description> 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"> <parent> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-vnfapi</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Platform Logic : VNF-API</name> <description>Contains platform-level service logic for the VNF-API</description> @@ -3,42 +3,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.openecomp.sdnc.core</groupId> - <artifactId>root-boron-sr1</artifactId> - <version>1.1.0</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-carbon-sr1</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <groupId>org.openecomp.sdnc.oam</groupId> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> <name>SDN-C OAM</name> - <url>https://wiki.openecomp.org</url> + <url>https://wiki.onap.org</url> <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description> <issueManagement> <system>JIRA</system> - <url>https://jira.openecomp.org/</url> + <url>https://jira.onap.org/</url> </issueManagement> <scm> - <connection>scm:git:ssh://git@${openecomp.git.host}/sdnc-oam.git</connection> - <developerConnection>scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-oam.git</developerConnection> - <url>${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-oam/browse</url> + <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url> <tag>HEAD</tag> </scm> <ciManagement> <system>Jenkins</system> - <url>https://jenkins.openecomp.org/</url> + <url>https://jenkins.onap.org/</url> </ciManagement> <distributionManagement> <site> <id>sdnc-javadoc</id> - <url>dav:https://${openecomp.nexus.host}:${openecomp.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> + <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> </site> </distributionManagement> <profiles> @@ -101,9 +101,9 @@ <version>1.6.7</version> <extensions>true</extensions> <configuration> - <nexusUrl>https://${openecomp.nexus.host}</nexusUrl> - <stagingProfileId>${openecomp.nexus.staging.profile-id}</stagingProfileId> - <serverId>${openecomp.nexus.staging.server-id}</serverId> + <nexusUrl>https://${onap.nexus.host}</nexusUrl> + <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId> + <serverId>${onap.nexus.staging.server-id}</serverId> </configuration> </plugin> </plugins> @@ -118,7 +118,7 @@ <organization> <name>AT&T</name> </organization> - <version>1.1.2-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </project> |