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 <dtimoney@att.com>
Former-commit-id: e391e1e3ca8ea5385bb1f77ed7c4c83935451575
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 3476b6f..bb60714 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 4006af3..fadb812 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 e88658c..644d8f6 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 4605633..1d9f97e 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 24344d0..f609fbb 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 37db15d..c67c333 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 bdca385..56a5fe5 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 @@
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 @@
-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 @@
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 37329d7..c9110f8 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 06b13da..7705275 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 @@
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 @@
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 @@
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 @@
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 3a6071e..cbc856d 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 9a7ceef..c702b47 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>