Roll to initial Honolulu snapshot 24/112624/2 master
authorDan Timoney <dtimoney@att.com>
Mon, 14 Sep 2020 15:30:34 +0000 (11:30 -0400)
committerDan Timoney <dtimoney@att.com>
Mon, 14 Sep 2020 15:32:05 +0000 (11:32 -0400)
Roll to initial Honolulu snapshot version

Change-Id: I3a293d15680045917e817fe2e19b42f7d2c72819
Issue-ID: CCSDK-2742
Signed-off-by: Dan Timoney <dtimoney@att.com>
152 files changed:
.gitignore
.readthedocs.yaml [new file with mode: 0644]
INFO.yaml
alpine/java11/pom.xml [new file with mode: 0644]
alpine/java11/src/main/docker/Dockerfile [new file with mode: 0644]
alpine/java8/pom.xml [new file with mode: 0644]
alpine/java8/src/main/docker/Dockerfile [moved from alpine/src/main/docker/Dockerfile with 80% similarity]
alpine/pom.xml
ansible-server/pom.xml
ansible-server/src/main/Dockerfile
ansible-server/src/main/ansible-server/RestServer.py
ansible-server/src/main/ansible-server/startAnsibleServer.sh
dependencies/pom.xml
dgbuilder-docker/pom.xml
dgbuilder-docker/src/main/docker/Dockerfile
dgbuilder/pom.xml
dgbuilder/tools/splitFlows.sh
docs/.gitignore [new file with mode: 0644]
docs/_static/css/ribbon.css [new file with mode: 0644]
docs/_static/css/theme_overrides.css [new file with mode: 0644]
docs/_static/favicon.ico [new file with mode: 0755]
docs/_static/logo_onap_2017.png [new file with mode: 0644]
docs/conf.py [new file with mode: 0644]
docs/conf.yaml [new file with mode: 0644]
docs/index.rst
docs/release-notes.rst
docs/requirements-docs.txt [new file with mode: 0644]
docs/sli/architecture.rst
docs/sli/offeredapis.rst
docs/tox.ini [new file with mode: 0644]
odlsli/odlsli-alpine/pom.xml
odlsli/odlsli-alpine/src/main/docker/Dockerfile
odlsli/odlsli-alpine/src/main/properties/aaiclient.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/admportal.json [deleted file]
odlsli/odlsli-alpine/src/main/properties/admportal.log4js.json [deleted file]
odlsli/odlsli-alpine/src/main/properties/dblib.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/mdsal-resource.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/rpc-message-sliapi-execute.vt [deleted file]
odlsli/odlsli-alpine/src/main/properties/sdnr-oofpcipoc-api-dg.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/sql-resource.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/svclogic.properties [deleted file]
odlsli/odlsli-alpine/src/main/properties/svclogic.properties.sdnctldb01 [deleted file]
odlsli/odlsli-alpine/src/main/resources/ansible-sources.list [deleted file]
odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db [deleted file]
odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml [deleted file]
odlsli/odlsli-alpine/src/main/resources/odlsli.dump [deleted file]
odlsli/odlsli-alpine/src/main/resources/org.ops4j.pax.logging.cfg [deleted file]
odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh [deleted file]
odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh [deleted file]
odlsli/odlsli-alpine/src/main/scripts/startODL.sh [deleted file]
odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks [deleted file]
odlsli/odlsli-ubuntu/pom.xml [deleted file]
odlsli/odlsli-ubuntu/src/main/docker/Dockerfile [deleted file]
odlsli/pom.xml
odlsli/src/main/properties/ran-slice-api-dg.properties [new file with mode: 0644]
odlsli/src/main/properties/sdnr-CMNotify-api-dg.properties [new file with mode: 0644]
odlsli/src/main/resources/idmlight.db.mv.db
opendaylight/neon/neon-alpine/pom.xml
opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
opendaylight/neon/neon-alpine/src/main/odlscripts/configure-cluster-ipdetect.sh [new file with mode: 0755]
opendaylight/neon/neon-alpine/src/main/odlscripts/configure_cluster.sh [new file with mode: 0755]
opendaylight/neon/neon-alpine/src/main/odlscripts/custom_shard_config.txt [new file with mode: 0755]
opendaylight/neon/neon-alpine/src/main/odlscripts/set_persistence.sh [new file with mode: 0755]
opendaylight/neon/pom.xml
opendaylight/pom.xml
opendaylight/sodium/pom.xml [new file with mode: 0644]
opendaylight/sodium/sodium-alpine/pom.xml [new file with mode: 0644]
opendaylight/sodium/sodium-alpine/src/main/docker/Dockerfile [new file with mode: 0644]
platform-logic/a1Adapter-api/pom.xml
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyInstance.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_createPolicyType.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deleteA1Policy.json [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyInstance.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_deletePolicyType.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1Policy.json [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyStatus.json [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getA1PolicyType.json [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getHealthCheck.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstance.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyInstances.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyType.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getPolicyTypes.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_getStatus.json [deleted file]
platform-logic/a1Adapter-api/src/main/json/A1-ADAPTER-API_putA1Policy.json [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/resources/graph.versions
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyInstance.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_createPolicyType.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deleteA1Policy.xml [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyInstance.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_deletePolicyType.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1Policy.xml [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyStatus.xml [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getA1PolicyType.xml [new file with mode: 0644]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getHealthCheck.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstance.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyInstances.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyType.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getPolicyTypes.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_getStatus.xml [deleted file]
platform-logic/a1Adapter-api/src/main/xml/A1-ADAPTER-API_putA1Policy.xml [new file with mode: 0644]
platform-logic/asdc-api/pom.xml
platform-logic/cMNotify-api/pom.xml [new file with mode: 0644]
platform-logic/cMNotify-api/src/main/json/CM-NOTIFY-API_nbrlist-change-notification.json [new file with mode: 0644]
platform-logic/cMNotify-api/src/main/resources/graph.versions [new file with mode: 0644]
platform-logic/cMNotify-api/src/main/xml/CM-NOTIFY-API_nbrlist-change-notification.xml [new file with mode: 0644]
platform-logic/installer/pom.xml
platform-logic/oofpcipoc-api/pom.xml
platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_configuration-phy-cell-id.json
platform-logic/oofpcipoc-api/src/main/json/oofpcipoc-api_generic-neighbor-configuration.json
platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_configuration-phy-cell-id.xml
platform-logic/oofpcipoc-api/src/main/xml/oofpcipoc-api_generic-neighbor-configuration.xml
platform-logic/pom.xml
platform-logic/ran-slice-api/pom.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_activateRANSliceInstance.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_configNotification.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_configureCU.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_configureDU.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_configureNearRTRIC.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_configureRANSliceInstance.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_deactivateRANSliceInstance.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_determineRANSliceResources.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_instantiateRANSlice.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/json/ran-slice-api_terminateRANSliceInstance.json [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/resources/graph.versions [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_activateRANSliceInstance.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_configNotification.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_configureCU.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_configureDU.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_configureNearRTRIC.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_configureRANSliceInstance.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_deactivateRANSliceInstance.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_determineRANSliceResources.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml [new file with mode: 0644]
platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance.xml [new file with mode: 0644]
platform-logic/restapi-templates/pom.xml
platform-logic/restapi-templates/src/main/json/CMNotify-add-nbr-to-configdb-per-nbrlist-change-notif.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-config-response-template.json
platform-logic/restapi-templates/src/main/json/oofpcipoc-dmaap-publish-template.json
platform-logic/sliapi/pom.xml
pom.xml
releases/0.7.0-container.yaml [new file with mode: 0644]
releases/0.7.0.yaml [new file with mode: 0644]
releases/0.7.1-container.yaml [new file with mode: 0644]
releases/0.7.1.yaml [new file with mode: 0644]
releases/1.0.0-container.yaml [new file with mode: 0644]
releases/1.0.0.yaml [new file with mode: 0644]
releases/1.0.1-container.yaml [new file with mode: 0644]
releases/1.0.1.yaml [new file with mode: 0644]
saltstack-server/pom.xml
saltstack-server/src/main/docker/Dockerfile
ubuntu/pom.xml
version.properties

index 91f026b..4ca286c 100755 (executable)
@@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs
 .checkstyle
 maven-eclipse.xml
 workspace
+.vscode
 
 ## Compilation Files ##
 *.class
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644 (file)
index 0000000..3797dc8
--- /dev/null
@@ -0,0 +1,20 @@
+---
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+# Required
+version: 2
+
+formats:
+  - htmlzip
+
+build:
+  image: latest
+
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements-docs.txt
+
+sphinx:
+  configuration: docs/conf.py
index 37ac38e..733ade3 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,7 +1,7 @@
 ---
 project: 'ccsdk-distribution'
 project_creation_date: '2017-08-08'
-lifecycle_state: 'Incubation'
+lifecycle_state: 'Mature'
 project_category: ''
 project_lead: &onap_releng_ptl
     name: 'Dan Timoney'
diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml
new file mode 100644 (file)
index 0000000..465d498
--- /dev/null
@@ -0,0 +1,128 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-alpine-root</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-j11-alpine</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: alpine :: java11</name>
+    <description>Creates base alpine Docker container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-alpine-j11-image</image.name>
+        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+        <base.image>onap/integration-java11</base.image>
+        <base.image.version>7.1.0</base.image.version>
+    </properties>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>     
+                            <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.28.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>              
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+
+                            <execution>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile
new file mode 100644 (file)
index 0000000..d7077f3
--- /dev/null
@@ -0,0 +1,17 @@
+# Base alpine with added packages needed for open ecomp
+FROM ${base.image}:${base.image.version}
+MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
+
+ARG HTTP_PROXY
+ARG HTTPS_PROXY
+
+ENV HTTP_PROXY  ${HTTP_PROXY}
+ENV http_proxy  ${HTTP_PROXY}
+ENV HTTPS_PROXY ${HTTPS_PROXY}
+ENV https_proxy ${HTTPS_PROXY}
+
+ENV JAVA_HOME /opt/java/openjdk
+# Add tools needed for OpenDaylight
+USER root
+RUN apk update && apk --no-cache add bash git  maven mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
+USER onap
\ No newline at end of file
diff --git a/alpine/java8/pom.xml b/alpine/java8/pom.xml
new file mode 100644 (file)
index 0000000..86da252
--- /dev/null
@@ -0,0 +1,126 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-alpine-root</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-alpine</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: alpine</name>
+    <description>Creates base alpine Docker container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-alpine-image</image.name>
+        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+    </properties>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>     
+                            <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.28.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>              
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+
+                            <execution>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
similarity index 80%
rename from alpine/src/main/docker/Dockerfile
rename to alpine/java8/src/main/docker/Dockerfile
index 2e29c4d..8dde928 100644 (file)
@@ -10,5 +10,6 @@ ENV http_proxy  ${HTTP_PROXY}
 ENV HTTPS_PROXY ${HTTPS_PROXY}
 ENV https_proxy ${HTTPS_PROXY}
 
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
 # Add tools needed for OpenDaylight
-RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs python3 graphviz unzip rsync nss
+RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs python3 graphviz unzip rsync nss
\ No newline at end of file
index a4617b2..1e1dea2 100644 (file)
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-alpine</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <artifactId>distribution-alpine-root</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: alpine</name>
-    <description>Creates base alpine Docker container</description>
-    <organization>
-        <name>openECOMP</name>
-    </organization>
+    <name>ccsdk-distribution :: opendaylight</name>
+    <description>Creates OpenDaylight container</description>
 
-    <properties>
-        <image.name>onap/ccsdk-alpine-image</image.name>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-    </properties>
-
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>     
-                            <source>${basedir}/../src/main/scripts/TagVersion.groovy</source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>copy-dockerfile</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/docker</directory>
-                                    <includes>
-                                        <include>Dockerfile</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>docker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.28.0</version>
-                        <inherited>false</inherited>
-                        <configuration>
-
-                            <images>
-                                <image>
-                                    <name>${image.name}</name>
-                                    <build>
-                                        <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <tags>
-                                            <tag>${project.docker.latestminortag.version}</tag>
-                                            <tag>${project.docker.latestfulltag.version}</tag>              
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>generate-images</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-
-                            <execution>
-                                <id>push-images</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <modules>
+        <module>java8</module>
+        <module>java11</module>
+    </modules>
 </project>
index 33a8c98..164c9cb 100644 (file)
@@ -4,14 +4,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
+               <version>2.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>ansible-server</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>ccsdk :: distribution :: ${project.artifactId}</name>
        <description>Creates ansible-server Docker container</description>
index 2751a48..9536a64 100644 (file)
@@ -1,23 +1,30 @@
-FROM alpine:3.8
+FROM onap/integration-python:7.0.1
 
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 ARG PIP_TAG=18.0
 
 WORKDIR /opt/
 
+ENV http_proxy ${http_proxy}
+ENV https_proxy ${https_proxy}
+ENV PIP_EXTRA_OPTS ${https_proxy:+"--trusted-host pypi.org --trusted-host files.pythonhosted.org --proxy=${https_proxy}"}
+ENV PIP_EXTRA_OPTS ${PIP_EXTRA_OPTS:-""}
+
+USER root
 COPY ansible-server/requirements.txt ansible-server/requirements.txt
 
+RUN echo "https_proxy is ${https_proxy} ; PIP_EXTRA_OPTS is ${PIP_EXTRA_OPTS}"
+
 RUN apk add --no-cache curl \
                        iputils \
                        bash \
-                       openssh-client \
-                       python3 &&\
+                       openssh-client &&\
     apk add --no-cache --virtual .build-deps build-base \
                                              libffi-dev \
                                              openssl-dev \
                                              python3-dev &&\
-    pip3 install --no-cache-dir --upgrade pip==$PIP_TAG && \
-    pip3 install --no-cache-dir -r ansible-server/requirements.txt &&\
+    pip3 install --no-cache-dir --upgrade pip ${PIP_EXTRA_OPTS} && \
+    pip3 install --no-cache-dir -r ansible-server/requirements.txt ${PIP_EXTRA_OPTS} &&\
     apk del .build-deps
 
 RUN addgroup -S ansible && adduser -S ansible -G ansible
index 483b832..3f42bfe 100755 (executable)
@@ -329,6 +329,13 @@ def process_pnf_playbook(input_json, Id, EnvParameters, time_now):
     cherrypy.log("Request Decode: EnvParameters    " + json.dumps(EnvParameters))
     cherrypy.log("Request Decode: PlaybookName     " + PlaybookName)
 
+    for key in EnvParameters:
+        value = EnvParameters[key]
+        if isinstance(value, (list, dict)):
+            valueStr = json.dumps(value)
+            # Need to dump two times to keep the backslash and double quotes, add backslash and single quotes for spaces
+            EnvParameters[key] = "\\'" + json.dumps(valueStr)[1:-1] + "\\'"
+
     str_uuid = str(uuid.uuid4())
 
     HomeDir = os.path.dirname(os.path.realpath("~/"))
index 2853aca..172ae53 100755 (executable)
@@ -2,5 +2,5 @@
 exec &> >(tee -a "/var/log/ansible-server.log")
 
 cd /opt/onap/ccsdk
-exec /usr/bin/python3 RestServer.py
+exec /usr/local/bin/python3 RestServer.py
 
index bd0f1c0..7c37869 100755 (executable)
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution:: dependencies</name>
             <artifactId>jackson-module-jsonSchema</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
         <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
             <groupId>org.glassfish.jersey.security</groupId>
             <artifactId>oauth1-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-2.3</artifactId>
+            <version>2.3_1</version>
+        </dependency>
     </dependencies>
 
     <build>
index 79f9409..2b5b55c 100644 (file)
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.7.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder-docker</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder-docker</name>
index 9acb7a5..974647e 100644 (file)
@@ -1,18 +1,26 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-ubuntu-image:${project.docker.latestfulltag.version}
+# Base standard ONAP java base image with added packages needed for nodered
+FROM onap/ccsdk-alpine-j11-image:${project.docker.latestfulltag.version}
 MAINTAINER CCSDK  Team (onap-discuss@lists.onap.org)
 
 # Create non-root user
-RUN addgroup --system dgbuilder && adduser --system --ingroup dgbuilder dgbuilder
+USER root
+RUN addgroup -S dgbuilder && adduser -S dgbuilder -G dgbuilder
+
+RUN apk --no-cache add curl
+#RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN apk add gcc g++ make ncurses
 
 # copy onap
 COPY --chown=dgbuilder:dgbuilder opt /opt
+RUN apk update && apk add yarn nodejs
+RUN node --version
 WORKDIR /opt/onap/ccsdk/dgbuilder
 # Set the proxy if needed
 # RUN npm config set proxy http://your.proxy.com:8080
-RUN cd /opt/onap/ccsdk/dgbuilder/ && npm install
+RUN cd /opt/onap/ccsdk/dgbuilder/ && npm config set strict-ssl false && npm install
 
 #ENTRYPOINT /bin/bash /opt/onap/ccsdk/dgbuilder/start sdnc1.0
 
 USER dgbuilder
 EXPOSE 3100
+
index 9eea0cb..d5f6f91 100644 (file)
@@ -5,12 +5,12 @@
        <parent>
             <groupId>org.onap.ccsdk.distribution</groupId>
             <artifactId>distribution-root</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder</name>
                                        <execution>
                                        <phase>generate-sources</phase>
                                        <configuration>
-                                       <tasks>
+                                       <target>
                                                <exec executable="${project.basedir}/build_pom_for_yang_compile">
                                                        <!--<arg value="${odlparent-carbon-sr1-version}"/>-->
                                                </exec>
-                                       </tasks>
+                                       </target>
                                        </configuration>
                                        <goals>
                                                <goal>run</goal>
index ccb70cf..79fd450 100755 (executable)
@@ -1,3 +1,4 @@
+#!/bin/sh
 if [ "$#" != "2" ]
 then
        echo "Usage: $0 full_path_to_flows_json_file full_path_to_output_dir"
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644 (file)
index 0000000..43ca5b6
--- /dev/null
@@ -0,0 +1,3 @@
+/.tox
+/_build/*
+/__pycache__/*
diff --git a/docs/_static/css/ribbon.css b/docs/_static/css/ribbon.css
new file mode 100644 (file)
index 0000000..6008cb1
--- /dev/null
@@ -0,0 +1,63 @@
+.ribbon {
+  z-index: 1000;
+  background-color: #a00;
+  overflow: hidden;
+  white-space: nowrap;
+  position: fixed;
+  top: 25px;
+  right: -50px;
+  -webkit-transform: rotate(45deg);
+     -moz-transform: rotate(45deg);
+      -ms-transform: rotate(45deg);
+       -o-transform: rotate(45deg);
+          transform: rotate(45deg);
+  -webkit-box-shadow: 0 0 10px #888;
+     -moz-box-shadow: 0 0 10px #888;
+          box-shadow: 0 0 10px #888;
+
+}
+
+.ribbon a {
+  border: 1px solid #faa;
+  color: #fff;
+  display: block;
+  font: bold 81.25% 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  margin: 1px 0;
+  padding: 10px 50px;
+  text-align: center;
+  text-decoration: none;
+  text-shadow: 0 0 5px #444;
+  transition: 0.5s;
+}
+
+.ribbon a:hover {
+  background: #c11;
+  color: #fff;
+}
+
+
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+   .wy-table-responsive table td, .wy-table-responsive table th {
+      /* !important prevents the common CSS stylesheets from overriding
+         this as on RTD they are loaded after this stylesheet */
+      white-space: normal !important;
+   }
+
+   .wy-table-responsive {
+      overflow: visible !important;
+   }
+}
+
+@media screen and (max-width: 767px) {
+    .wy-table-responsive table td {
+        white-space: nowrap;
+    }
+}
+
+/* fix width of the screen */
+
+.wy-nav-content {
+    max-width: none;
+}
diff --git a/docs/_static/css/theme_overrides.css b/docs/_static/css/theme_overrides.css
new file mode 100644 (file)
index 0000000..174fade
--- /dev/null
@@ -0,0 +1,13 @@
+/* override table width restrictions */
+@media screen and (min-width: 767px) {
+
+   .wy-table-responsive table td {
+      /* !important prevents the common CSS stylesheets from overriding
+         this as on RTD they are loaded after this stylesheet */
+      white-space: normal !important;
+   }
+
+   .wy-table-responsive {
+      overflow: visible !important;
+   }
+}
\ No newline at end of file
diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico
new file mode 100755 (executable)
index 0000000..cb712eb
Binary files /dev/null and b/docs/_static/favicon.ico differ
diff --git a/docs/_static/logo_onap_2017.png b/docs/_static/logo_onap_2017.png
new file mode 100644 (file)
index 0000000..5d064f4
Binary files /dev/null and b/docs/_static/logo_onap_2017.png differ
diff --git a/docs/conf.py b/docs/conf.py
new file mode 100644 (file)
index 0000000..e9db161
--- /dev/null
@@ -0,0 +1,16 @@
+from docs_conf.conf import *
+
+branch = 'latest'
+master_doc = 'index'
+
+linkcheck_ignore = [
+    'http://localhost',
+]
+
+intersphinx_mapping = {}
+
+html_last_updated_fmt = '%d-%b-%y %H:%M'
+
+def setup(app):
+    app.add_css_file("css/ribbon.css")
+    app.add_css_file("css/theme_overrides.css")
diff --git a/docs/conf.yaml b/docs/conf.yaml
new file mode 100644 (file)
index 0000000..ab59281
--- /dev/null
@@ -0,0 +1,7 @@
+---
+project_cfg: onap
+project: onap
+
+# Change this to ReleaseBranchName to modify the header
+default-version: latest
+#
index 14a0026..da961b2 100644 (file)
@@ -1,4 +1,5 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. _master_index:
 
 Common Controller Software Development Kit
 ------------------------------------------
index 72b394b..5dc1981 100644 (file)
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-Release Notes
-#############
-
-Version 0.5.4 / 0.6.3
-*********************
-:Release Date: 2019-09-30
-
-El Alto release
-
-**Artifact Versions**
-
-The CCSDK El Alto release includes artifacts for both OpenDaylight Fluorine SR2 (version 0.5.4) and
-OpenDaylight Neon SR1 (version 0.6.3).
-
-Note: CCSDK support for Ubuntu-based OpenDaylight containers is deprecated.  Ubuntu-based containers are provided
-for ODL Fluorine, but not for Neon.
-
-The following table lists the CCSDK docker containers and their versions.
-
-+--------------------------------------+---------------------------------------------------+----------------------+
-| Image name                           |  Description                                      | Version(s)           |
-+======================================+===================================================+======================+
-| onap/ccsdk-alpine-image              | Base Alpine Linux image for CCSDK                 | 0.5.4 (ODL Fluorine) |
-|                                      |                                                   | 0.6.3 (ODL Neon)     |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-ansible-server-image      | Ansible server image                              | 0.5.4 (ODL Fluorine) |
-|                                      |                                                   | 0.6.3 (ODL Neon)     |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-apps-ms-neng              | Naming microservice                               | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-blueprints-processor      | CDS blueprint processor                           | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-cds-ui                    | CDS web interface                                 | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-cds-ui-server             | CDS user interface back end                       | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-commandexecutor           | CDS command executor                              | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-controllerblueprint       | CDS controller blueprints                         | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-dgbuilder-image           | Directed graph builder                            | 0.5.4 (ODL Fluorine) |
-|                                      |                                                   | 0.6.3 (ODL Neon)     |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-odl-fluorine-alpine-image | Alpine based OpenDaylight Fluorine SR2 image      | 0.5.4                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-odl-fluorine-ubuntu-image | Ubuntu based OpenDaylight Fluorine SR2 image      | 0.5.4                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-odl-neon-alpine-image     | Alpine based OpenDaylight Neon SR1 image          | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-odlsli-alpine-image       | Alpine based OpenDaylight image with CCSDK        | 0.5.4 (ODL Fluorine) |
-|                                      | libraries installed                               | 0.6.3 (ODL Neon)     |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-odlsli-image              | Ubuntu based OpenDaylight image with CCSDK        | 0.5.4 (ODL Fluorine) |
-|                                      | libraries installed. DEPRECATED (see note above)  |                      |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-saltstack-server-image    | Saltstack server                                  | 0.5.4 (ODL Fluorine) |
-|                                      |                                                   | 0.6.3 (ODL Neon)     |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-sdclistener               | CDS SDC listener                                  | 0.6.4                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-| onap/ccsdk-ubuntu-image              | Base Ubuntu image for CCSDK                       | 0.5.4                |
-|                                      |                                                   | 0.6.3                |
-+--------------------------------------+---------------------------------------------------+----------------------+
-
-**New Features**
-
-There are no new use cases or functional requirements in the El Alto release.  The focus of this release is on bug
-fixes, with a particular emphasis fon security fixes.  However, there are new non-functional user stories that were
-in El Alto.
-
-The full list of CCSDK user stories for El Alto may be found at <https://jira.onap.org/issues/?filter=12041>.
-
-The following table lists some of the most significant user stories:
-
-+--------------+----------------------------------------------------+
-| Jira #       | Abstract                                           |
-+==============+====================================================+
-| CCSDK-1387   | Upgrade to OpenDaylight Neon SR1                   |
-+--------------+----------------------------------------------------+
-| CCSDK-1033   | Support for NETCONF Notifications in CCSDK/SDNC    |
-+--------------+----------------------------------------------------+
-
-
-**Bug Fixes**
-The full list of bug fixes in the El Alto release may be found at <https://jira.onap.org/issues/?filter=12018>
-
-The following table summarizes some of the most significant issues addressed:
-
-+--------------+----------------------------------------------------+
-| Jira #       | Abstract                                           |
-+==============+====================================================+
-| [CCSDK-1445] | loading jdbc driver Exception in ccsdk             |
-+--------------+----------------------------------------------------+
-| [CCSDK-1443] | cds blueprint processor does not start             |
-+--------------+----------------------------------------------------+
-| [CCSDK-1240] | CVE-20190-3795 : spring-data-core vulnerability    |
-+--------------+----------------------------------------------------+
-| [CCSDK-1239] | CVE-2019-3797 : spring-data vulnerability          |
-+--------------+----------------------------------------------------+
-| [CCSDK-1238] | Multiple CVEs - commons-compress                   |
-+--------------+----------------------------------------------------+
-| [CCSDK-1117] | Remove runtime internet dependency for dgbuilder   |
-+--------------+----------------------------------------------------+
-| [CCSDK-991]  | Upgrade to spring-core 2.8.6 or higher             |
-+--------------+----------------------------------------------------+
-| [CCSDK-988]  | Multiple CVEs - spring-expression < 4.3.17.RELEASE |
-+--------------+----------------------------------------------------+
-| [CCSDK-441]  | Spring 3 vulnerability CVE-2018-1270               |
-+--------------+----------------------------------------------------+
+.. This work is licensed under a Creative Commons Attribution 4.0
+   International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) ONAP Project and its contributors
+.. _release_notes:
 
-**Known Issues**
-
-The full list of known issues in CCSDK may be found in the ONAP Jira at <https://jira.onap.org/issues/?filter=11341>
-
-**Security Notes**
-
-*Fixed Security Issues*
-
-        * In default deployment CCSDK (cds-ui) exposes HTTP port 30497 outside of cluster. [`OJSI-196 <https://jira.onap.org/browse/OJSI-196>`_]
-
-*Known Security Issues*
-
-        * In default deployment CCSDK (netbox-nginx) exposes HTTP port 30420 outside of cluster. [`OJSI-160 <https://jira.onap.org/browse/OJSI-160>`_]
-        * In default deployment CCSDK (cds-blueprints-processor-http) exposes HTTP port 30499 outside of cluster. [`OJSI-197 <https://jira.onap.org/browse/OJSI-197>`_]
-
-*Known Vulnerabilities in Used Modules*
-
-Quick Links:
- - `CCSDK project page <https://wiki.onap.org/display/DW/Common+Controller+SDK+Project>`_
-
- - `Passing Badge information for CCSDK <https://bestpractices.coreinfrastructure.org/en/projects/1630>`_
-
- - `Project Vulnerability Review Table for CCSDK <https://wiki.onap.org/pages/viewpage.action?pageId=51282469>`_
-
-
-Version 0.4.4/0.4.5
 *******************
-:Release Date: 2019-06-13
-
-Note: The Dublin version for most CCSDK repositories is 0.4.4, except for CDS which is version
-0.4.5
-
-**New Features**
-
-The full list of Dublin epics and user stories for CCSDK may be found at <https://jira.onap.org/issues/?filter=11802>.
-
-The following list summarizes some of the most significant epics:
-
-+-------------+------------------------------------------------+
-| Jira #      | Abstract                                       |
-+=============+================================================+
-| [CCSDK-575] | Improve E2E Process Automation                 |
-+-------------+------------------------------------------------+
-| [CCSDK-840] | S3P - Footprint Optimization                   |
-+-------------+------------------------------------------------+
-| [CCSDK-859] | Update to OpenDaylight Fluorine                |
-+-------------+------------------------------------------------+
-| [CCSDK-929] | 5G Use Case                                    |
-+-------------+------------------------------------------------+
-| [CCSDK-930] | CCVPN Use Case Extension                       |
-+-------------+------------------------------------------------+
-
-
-**Bug Fixes**
-The full list of bug fixes in the CCSDK Dublin release may be found at <https://jira.onap.org/issues/?filter=11804>
-
-**Known Issues**
-The full list of known issues in CCSDK may be found in the ONAP Jira at <https://jira.onap.org/issues/?filter=11341>
-
-**Security Notes**
-
-*Fixed Security Issues*
-
-*Known Security Issues*
-
-        * In default deployment CCSDK (netbox-nginx) exposes HTTP port 30420 outside of cluster. [`OJSI-160 <https://jira.onap.org/browse/OJSI-160>`_]
-        * In default deployment CCSDK (cds-ui) exposes HTTP port 30497 outside of cluster. [`OJSI-196 <https://jira.onap.org/browse/OJSI-196>`_]
-        * In default deployment CCSDK (cds-blueprints-processor-http) exposes HTTP port 30499 outside of cluster. [`OJSI-197 <https://jira.onap.org/browse/OJSI-197>`_]
-
-*Known Vulnerabilities in Used Modules*
-
-Quick Links:
- - `CCSDK project page <https://wiki.onap.org/display/DW/Common+Controller+SDK+Project>`_
-
- - `Passing Badge information for CCSDK <https://bestpractices.coreinfrastructure.org/en/projects/1630>`_
-
- - `Project Vulnerability Review Table for CCSDK Dublin <https://wiki.onap.org/pages/viewpage.action?pageId=51282469>`_
-
-Version: 0.3.3
-**************
-
-:Release Date: 2019-01-30
-
-** Bug Fixes **
-The following bugs are fixed in the CCSDK Casablanca January 2019 maintenance release:
-
-+-------------+-------------------------------------------------------------------------------+
-| Jira #      | Abstract                                                                      |
-+=============+===============================================================================+
-| [CCSDK-727] | Do not prepend "sub" for subnet net id                                        |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-728] | Self serve DG adjustement for unassign                                        |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-740] | Restore inventory-response-item definition to the original version            |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-765] | Upgrade jackson version to 2.8.9                                              |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-777] | Release version contains some snapshots                                       |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-843] | Compile error due to old snapshot dependency                                  |
-+-------------+-------------------------------------------------------------------------------+
-| [CCSDK-935] | restapicall JsonParser failed if response contains : as part of response body |
-+-------------+-------------------------------------------------------------------------------+
-
-**Known Issues**
-The full list of known issues in CCSDK may be found in the ONAP Jira at <https://jira.onap.org/issues/?filter=11341>
-
-Quick Links:
-   - `CCSDK project page <https://wiki.onap.org/display/DW/Common+Controller+SDK+Project>`_
-
-   - `Passing Badge information for CCSDK <https://bestpractices.coreinfrastructure.org/en/projects/1630>`_
-
-   - `Project Vulnerability Review Table for CCSDK Casablanca Maintenance Release <https://wiki.onap.org/pages/viewpage.action?pageId=45300857>`_
-
-Version: 0.3.2
-**************
-
-:Release Date: 2018-11-30
-
-**New Features**
-
-The full list of Casablanca epics and user stories for CCSDK maybe be found at <https://jira.onap.org/issues/?filter=11516>.
-
-The following list summarizes some of the most significant epics:
+CCSDK Release Notes
+*******************
 
-+-------------+------------------------------------------------+
-| Jira #      | Abstract                                       |
-+=============+================================================+
-| [CCSDK-279] | Update to OpenDaylight Oxygen release          |
-+-------------+------------------------------------------------+
-| [CCSDK-357] | Develop Controller Design Studio in Casablanca |
-+-------------+------------------------------------------------+
-| [CCSDK-324] | Enhancements to support CCVPN use case         |
-+-------------+------------------------------------------------+
-| [CCSDK-288] | Usability Enhancements                         |
-+-------------+------------------------------------------------+
 
-**Bug Fixes**
-The full list of bug fixes in the CCSDK Casablanca release may be found at <https://jira.onap.org/issues/?filter=11544>
+Abstract
+========
 
-**Known Issues**
-The full list of known issues in CCSDK may be found in the ONAP Jira at <https://jira.onap.org/issues/?filter=11341>
+This document provides the release notes for the Frankfurt release of the Common Controller Software
+Development Kit (CCSDK).
 
-Quick Links:
- - `CCSDK project page <https://wiki.onap.org/display/DW/Common+Controller+SDK+Project>`_
+Summary
+=======
 
- - `Passing Badge information for CCSDK <https://bestpractices.coreinfrastructure.org/en/projects/1630>`_
+The Frankfurt release of CCSDK introduces new functionality to support PNFs (Physical Network Functions), extends support
+for Netconf/TLS to support CMPv2, and extends CDS to act as an agent in self-serve control loops.
 
- - `Project Vulnerability Review Table for CCSDK Casablanca <https://wiki.onap.org/pages/viewpage.action?pageId=45300857>`_
 
-Version: 0.2.4
-**************
+Release Data
+============
 
++-------------------------+-------------------------------------------+
+| **Project**             | CCSDK                                     |
+|                         |                                           |
++-------------------------+-------------------------------------------+
+| **Docker images**       | See :ref:`dockercontainers` section below |
++-------------------------+-------------------------------------------+
+| **Release designation** | Frankfurt                                 |
+|                         |                                           |
++-------------------------+-------------------------------------------+
+| **Release date**        | 06/04/2020                                |
+|                         |                                           |
++-------------------------+-------------------------------------------+
 
-:Release Date: 2018-06-07
 
+New features
+------------
 
+The CCSDK Frankfurt release includes the following features:
 
-**New Features**
+* First phase of OpenDaylight separation (Jira `CCSDK-8 <https://jira.onap.org/browse/CCSDK-8>`_), currently targeted for completion in Guilin
+* Integration of CDS as an actor in Control loops (Jira `CCSDK-1898 <https://jira.onap.org/browse/CCSDK-1898>`_)
+* ORAN-compliant A1 adaptor (Jira `CCSDK-1796 <https://jira.onap.org/browse/CCSDK-1796>`_)
+* Multi-Domain Optical Service (Jira `CCSDK-1828 <https://jira.onap.org/browse/CCSDK-1828>`_)
+* Python 2 -> Python 3 migration (Jira `CCSDK-1905 <https://jira.onap.org/browse/CCSDK-1905>`_)
 
-The full list of Beijing Epics and user stories for CCSDK may be found at <https://jira.onap.org/issues/?filter=10792>.  The following
-list summarizes some of the more critical features:
 
-+--------------+-----------------------------------------------------------------------------------------------+
-| Jira #       | Abstract                                                                                      |
-+==============+===============================================================================================+
-| [CCSDK-222]  | Ansible server support <https://jira.onap.org/browse/CCSDK-222>                               |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-191]  | enable fast loading of graphs <https://jira.onap.org/browse/CCSDK-191>                        |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-179]  | Upgrade CCSDK ODL containers to Nitrogen <https://jira.onap.org/browse/CCSDK-179>             |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-177]  | Upgrade sli/northbound to Nitrogen <https://jira.onap.org/browse/CCSDK-177>                   |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-176]  | Upgrade sli/adaptors to Nitrogen <https://jira.onap.org/browse/CCSDK-176>                     |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-175]  | Upgrade sli/core to Nitrogen <https://jira.onap.org/browse/CCSDK-175>                         |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-174]  | Update ccsdk parent to support Nitrogen parent poms <https://jira.onap.org/browse/CCSDK-174>  |
-+--------------+-----------------------------------------------------------------------------------------------+
-| [CCSDK-172]  | Ability to call Ansible playbook from directed graph <https://jira.onap.org/browse/CCSDK-172> |
-+--------------+-----------------------------------------------------------------------------------------------+
+For the complete list of `CCSDK Frankfurt release epics <https://jira.onap.org/issues/?filter=12316>`_ and 
+`CCSDK Frankfurt release user stories <https://jira.onap.org/issues/?filter=12319>`_ , please see the `ONAP Jira`_.
 
-**Bug Fixes**
+**Bug fixes**
 
-The full list of bug fixes in the CCSDK Beijing release may be found at <https://jira.onap.org/issues/?filter=11117>
+The full list of `bugs fixed in the CCSDK Frankfurt release <https://jira.onap.org/issues/?filter=12320>`_ is maintained on the `ONAP Jira`_.
 
 **Known Issues**
 
-+--------------+-----------------------------------------------------------------------------------------------------+
-| Jira #       | Abstract                                                                                            |
-+==============+=====================================================================================================+
-| [CCSDK-136]  | pgaas is dependent on location\_prefix being all lowercase <https://jira.onap.org/browse/CCSDK-136> |
-+--------------+-----------------------------------------------------------------------------------------------------+
-
-**Security Notes**
-
-CCSDK code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and determined to be false positive. The CCSDK open Critical security vulnerabilities and their risk assessment have been documented as part of the `project <https://wiki.onap.org/pages/viewpage.action?pageId=28379011>`_.
-
-Quick Links:
- - `CCSDK project page <https://wiki.onap.org/display/DW/Common+Controller+SDK+Project>`_
+The full list of `known issues in CCSDK <https://jira.onap.org/issues/?filter=11341>`_ is maintained on the `ONAP Jira`_.
+
+Deliverables
+------------
+
+Software Deliverables
+~~~~~~~~~~~~~~~~~~~~~
+
+.. _dockercontainers:
+
+Docker Containers
+`````````````````
+
+The following table lists the docker containers comprising the CCSDK Frankfurt 
+release along with the current stable Frankfurt version/tag.  Each of these is
+available on the ONAP nexus3 site (https://nexus3.onap.org) and can be downloaded
+with the following command::
+
+   docker pull nexus3.onap.org:10001/{image-name}:{version}
+
+
+Note: users that want to use the latest in-development Frankfurt version may use the
+tag 0.7-STAGING-latest to pull the latest daily Frankfurt build
+
++-----------------------------------+--------------------------------------------+---------+
+| Image name                        | Description                                | Version |
++===================================+============================================+=========+
+| onap/ccsdk-alpine-image           | Base Alpine Linux image for CCSDK          | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-ansible-server-image   | Ansible server image                       | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-apps-ms-neng           | Naming microservice                        | 0.7.1   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-blueprints-processor   | CDS blueprint processor                    | 0.7.5   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-cds-ui                 | CDS web interface                          | 0.7.5   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-cds-ui-server          | CDS user interface back end                | 0.7.5   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-commandexecutor        | CDS command executor                       | 0.7.5   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-controllerblueprint    | CDS controller blueprints                  | 0.7.5   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-dgbuilder-image        | Directed graph builder                     | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-odl-neon-alpine-image  | Alpine based OpenDaylight Neon SR1 image   | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-odlsli-alpine-image    | Alpine based OpenDaylight image with CCSDK | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-saltstack-server-image | Saltstack server                           | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-sdclistener            | CDS SDC listener                           | 0.7.3   |
++-----------------------------------+--------------------------------------------+---------+
+| onap/ccsdk-ubuntu-image           | Base Ubuntu image for CCSDK                | 0.7.4   |
++-----------------------------------+--------------------------------------------+---------+
+
+Maven Artifacts
+```````````````
+In addition to docker containers, CCSDK also provides libraries that are intended to be used by
+client applications (e.g. APPC, SDNC) as maven dependencies.
+
+
+ccsdk/parent
+^^^^^^^^^^^^
+Many CCSDK clients need to be able to inherit settings from third party parent poms provided
+by OpenDaylight or springboot, and therefore are unable to use the standard ONAP parent pom.
+The CCSDK parent repository provides its own version of parent poms whose contents are consistent
+with ONAP standard settings (as defined in oparent), but whose parent is the OpenDaylight or 
+springboot parent, so that clients can effectively merge both sets of settings.
+
+The following table lists the parent poms provided by CCSDK and the current stable
+Frankfurt version of each.
+
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| groupId               | artifactId                   | version | Description                                                                                      |
++=======================+==============================+=========+==================================================================================================+
+| org.onap.ccsdk.parent | binding-parent               | 1.5.7   | Parent used in place of OpenDaylight binding-parent                                              |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | bundle-parent                | 1.5.7   | Parent used in place of OpenDaylight bundle-parent                                               |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | client-parent                | 1.5.7   | Parent used for projects that create client libraries for OpenDaylight APIs                      |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | dependencies-bom             | 1.5.7   | Bill of Materials POM that defines versions of third party libraries used outside ODL container. |
+|                       |                              |         | Intended to be imported in dependencyManagement section.                                         |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | dependencies-odl-bom         | 1.5.7   | Bill of Materials POM that defines versions of third party libraries used within ODL container.  |
+|                       |                              |         | Intended to be imported in dependencyManagement section.                                         |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | feature-repo-parent          | 1.5.7   | Parent used in place of OpenDaylight feature-repo-parent                                         |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | karaf4-parent                | 1.5.7   | Parent used in place of OpenDaylight karaf4-parent                                               |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | mdsal-it-parent              | 1.5.7   | Parent used in place of OpenDaylight mdsal-it-parent                                             |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | odlparent                    | 1.5.7   | Parent used in place of OpenDaylight odlparent                                                   |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | odlparent-lite               | 1.5.7   | Parent used in place of OpenDaylight odlparent-lite                                              |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | single-feature-parent        | 1.5.7   | Parent used in place of OpenDaylight single-feature-parent                                       |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | spring-boot-1-starter-parent | 1.5.7   | Parent used in place of spring-boot-starter-parent for Springboot 1.x.                           |
+|                       |                              |         | *NOTE* This is deprecated and will be removed in Guilin, since springboot 1.x should no          |
+|                       |                              |         | longer be used due to security issues                                                            |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | spring-boot-starter-parent   | 1.5.7   | Parent used in place of spring-boot-starter-parent for Springboot 2.x                            |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+| org.onap.ccsdk.parent | standalone-parent            | 1.5.7   | Parent used for projects that have no need for other third party parent poms                     |
++-----------------------+------------------------------+---------+--------------------------------------------------------------------------------------------------+
+
+ccsdk/sli/core
+^^^^^^^^^^^^^^
+The ccsdk/sli/core library provides base functionality needed by the Service Logic Interpreter (SLI), which is the engine that runs directed graphs.  It also
+provides a number of libraries that can be used by other CCSDK client projects.  
+
+The following table lists the maven artifacts provided for use by CCSDK client
+projects.
+
++-------------------------+-------------------------+---------+--------------------------------------------+
+| groupId                 | artifactId              | version | Description                                |
++=========================+=========================+=========+============================================+
+| org.onap.ccsdk.sli.core | dblib-provider          | 0.7.2   | Database access library                    |
++-------------------------+-------------------------+---------+--------------------------------------------+
+| org.onap.ccsdk.sli.core | sli-common              | 0.7.2   | Common SLI data objects                    |
++-------------------------+-------------------------+---------+--------------------------------------------+
+| org.onap.ccsdk.sli.core | sli-provider-base       | 0.7.2   | ODL-independent SLI implementation objects |
++-------------------------+-------------------------+---------+--------------------------------------------+
+| org.onap.ccsdk.sli.core | sli-provider            | 0.7.2   | ODL-dependent SLI implementation objects   |
++-------------------------+-------------------------+---------+--------------------------------------------+
+| org.onap.ccsdk.sli.core | sliPluginUtils-provider | 0.7.2   | Utilities for use in SLI adaptors/plugins  |
++-------------------------+-------------------------+---------+--------------------------------------------+
+| org.onap.ccsdk.sli.core | utils-provider          | 0.7.2   | Utilities                                  |
++-------------------------+-------------------------+---------+--------------------------------------------+
+
+ccsdk/sli/adaptors
+^^^^^^^^^^^^^^^^^^
+The ccsdk/sli/adaptors library provides interface adaptors meant to be used in resource nodes in directed graphs.
+
+The following table lists the maven artifacts provided for use by CCSDK client
+projects.
+
++-----------------------------+------------------------------+---------+--------------------------------+
+| groupId                     | artifactId                   | version | Description                    |
++=============================+==============================+=========+================================+
+| org.onap.ccsdk.sli.adaptors | aai-service-provider         | 0.7.3   | A&AI interface adaptor         |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | ansible-adapter-bundle       | 0.7.3   | Ansible interface adaptor      |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | mdsal-resource-provider      | 0.7.3   | MD-SAL interface adaptor       |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | netbox-client-provider       | 0.7.3   | netbox interface adaptor       |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | resource-assignment-provider | 0.7.3   | resource allocator             |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | saltstack-adaptor-provider   | 0.7.3   | saltstack interface adaptor    |
++-----------------------------+------------------------------+---------+--------------------------------+
+| org.onap.ccsdk.sli.adaptors | sql-resource-provider        | 0.7.3   | SQL database interface adaptor |
++-----------------------------+------------------------------+---------+--------------------------------+
+
+ccsdk/sli/northbound
+^^^^^^^^^^^^^^^^^^^^
+The ccsdk/sli/northbound library contains the code for northbound interfaces which typically invoke
+the SLI.
+
+The following table lists the maven artifacts provided for use by CCSDK client projects.
+
++-------------------------------+---------------------+---------+-----------------------------------------+
+| groupId                       | artifactId          | version | Description                             |
++===============================+=====================+=========+=========================================+
+| org.onap.ccsdk.sli.northbound | asdcApi-provider    | 0.7.4   | ODL-based SDC interface                 |
++-------------------------------+---------------------+---------+-----------------------------------------+
+| org.onap.ccsdk.sli.northbound | dataChange-provider | 0.7.4   | A&AI data change notification interface |
++-------------------------------+---------------------+---------+-----------------------------------------+
+| org.onap.ccsdk.sli.northbound | dmaap-listener      | 0.7.4   | DMaaP listener interface                |
++-------------------------------+---------------------+---------+-----------------------------------------+
+| org.onap.ccsdk.sli.northbound | lcm-provider        | 0.7.4   | Life Cycle Management event interface   |
++-------------------------------+---------------------+---------+-----------------------------------------+
+| org.onap.ccsdk.sli.northbound | ueb-listener        | 0.7.4   | SDC event listener                      |
++-------------------------------+---------------------+---------+-----------------------------------------+
+
+ccsdk/sli/plugins
+^^^^^^^^^^^^^^^^^
+The ccsdk/sli/northbound library contains the code for plugins meant to be called from an 'execute' node
+in a directed graph.
+
+The following table lists the maven artifacts provided for use by CCSDK client projects.
+
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+| groupId                    | artifactId                 | version | Description                                           |
++============================+============================+=========+=======================================================+
+| org.onap.ccsdk.sli.plugins | properties-node-provider   | 0.7.2   | Used to load a properties file for use in             |
+|                            |                            |         | a directed graph                                      |
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+| org.onap.ccsdk.sli.plugins | restapi-call-node-provider | 0.7.2   | Used to call a generic REST API from a directed       |
+|                            |                            |         | graph                                                 |
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+| org.onap.ccsdk.sli.plugins | restconf-client-provider   | 0.7.2   | Used to call a RESTCONF API from a directed graph     |
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+| org.onap.ccsdk.sli.plugins | sshapi-call-node           | 0.7.2   | Used to invoke an SSH interface from a directed graph |
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+| org.onap.ccsdk.sli.plugins | template-node-provider     | 0.7.2   | Provides velocity template support                    |
++----------------------------+----------------------------+---------+-------------------------------------------------------+
+
+Documentation Deliverables
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `CDS user guide`_
+* `SDN Controller for Radio user guide`_
+* `ccsdk/sli/core Javadoc`_
+* `ccsdk/sli/adaptors Javadoc`_
+* `ccsdk/sli/northbound Javadoc`_
+* `ccsdk/sli/plugins Javadoc`_
+
+Known Limitations, Issues and Workarounds
+=========================================
+
+System Limitations
+------------------
+
+No system limitations noted.
+
+
+Known Vulnerabilities
+---------------------
+
+Any known vulnerabilities for ONAP are tracked in the `ONAP Jira`_ in the OJSI project.  Any outstanding OJSI issues that
+pertain to CCSDK are listed in the :ref:`secissues` section below.
+
+
+Workarounds
+-----------
+
+Not applicable.
 
- - `Passing Badge information for CCSDK <https://bestpractices.coreinfrastructure.org/en/projects/1630>`_
 
- - `Project Vulnerability Review Table for CCSDK Beijing <https://wiki.onap.org/pages/viewpage.action?pageId=28379011>`_
+Security Notes
+--------------
 
-**Upgrade Notes**
+Fixed Security Issues
+~~~~~~~~~~~~~~~~~~~~~
 
-N/A
+The following security issues have been addressed in the Frankfurt CCSDK release:
+
+* `OSJI-197 <https://jira.onap.org/browse/OJSI-197>`_ : cds-blueprints-processor-http exposes plain text HTTP endpoint using port 30499
+* `CCSDK-2149 <https://jira.onap.org/browse/CCSDK-2149>`_ : Pods still run as root
+* `CCSDK-1910 <https://jira.onap.org/browse/CCSDK-1910>`_ : Password removal from OOM Helm charts
 
-**Deprecation Notes**
+With these fixes, CCSDK no longer exposes any external http ports and no CCSDK pod runs as root.
 
-N/A
+.. _secissues :
 
-**Other**
+Known Security Issues
+~~~~~~~~~~~~~~~~~~~~~
 
-N/A
+There is currently only one known CCSDK security issue, related to a third party application (netbox) that CCSDK uses:
 
+* `OJSI-160 <https://jira.onap.org/browse/OJSI-160>`_ : netbox-nginx exposes plain text HTTP endpoint using port 30420
 
-Version: 0.1.0
-**************
 
 
-:Release Date: 2017-11-16
+Test Results
+============
+Not applicable
 
 
+References
+==========
 
-**New Features**
-
-The Common Controller SDK provides the following functionality :
-   - Service Logic Interpreter
-   - Database access library (dblib)
-   - Service Logic test api (sliapi)
-   - MD-SAL data query adaptor
-   - SQL query adaptor
-   - Resource allocator
-   - SDC interface
-   - DMAAP interface
-   - REST API adaptor
-
-
-**Bug Fixes**
-
-**Known Issues**
-   - `CCSDK-110 <https://jira.onap.org/browse/CCSDK-110>`_ Resolve license issues in dashboard project
-   - `CCSDK-136 <https://jira.onap.org/browse/CCSDK-136>`_ pgaas is dependent on location_prefix being all lowercase
-   - `CCSDK-137 <https://jira.onap.org/browse/CCSDK-137>`_ isolate deprecated methods
-
-**Security Issues**
-   You may want to include a reference to CVE (Common Vulnerabilities and Exposures) `CVE <https://cve.mitre.org>`_
-
+For more information on the ONAP Frankfurt release, please see:
 
-**Upgrade Notes**
+#. `ONAP Home Page`_
+#. `ONAP Documentation`_
+#. `ONAP Release Downloads`_
+#. `ONAP Wiki Page`_
 
-**Deprecation Notes**
 
-**Other**
+.. _`ONAP Home Page`: https://www.onap.org
+.. _`ONAP Wiki Page`: https://wiki.onap.org
+.. _`ONAP Documentation`: https://docs.onap.org
+.. _`ONAP Release Downloads`: https://git.onap.org
+.. _`ONAP Jira`: https://jira.onap.org
+.. _`CDS user guide`: https://docs.onap.org/en/frankfurt/submodules/ccsdk/cds.git/docs/index.html
+.. _`SDN Controller for Radio user guide`: https://docs.onap.org/en/frankfurt/submodules/ccsdk/features.git/docs/guides/onap-user/home.html
+.. _`ccsdk/sli/core Javadoc`: https://nexus.onap.org/service/local/repositories/javadoc/content/org.onap.ccsdk/sli/core/frankfurt/index.html
+.. _`ccsdk/sli/adaptors Javadoc`: https://nexus.onap.org/service/local/repositories/javadoc/content/org.onap.ccsdk/sli/adaptors/frankfurt/index.html
+.. _`ccsdk/sli/northbound Javadoc`: https://nexus.onap.org/service/local/repositories/javadoc/content/org.onap.ccsdk/sli/northbound/frankfurt/index.html
+.. _`ccsdk/sli/plugins Javadoc`: https://nexus.onap.org/service/local/repositories/javadoc/content/org.onap.ccsdk/sli/plugins/frankfurt/index.html
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
new file mode 100644 (file)
index 0000000..b3188dd
--- /dev/null
@@ -0,0 +1,15 @@
+tox
+Sphinx
+doc8
+docutils
+setuptools
+six
+sphinx_rtd_theme>=0.4.3
+sphinxcontrib-blockdiag
+sphinxcontrib-needs>=0.2.3
+sphinxcontrib-nwdiag
+sphinxcontrib-seqdiag
+sphinxcontrib-swaggerdoc
+sphinxcontrib-plantuml
+sphinx_bootstrap_theme
+lfdocs-conf
index a211cc6..2c16d83 100644 (file)
@@ -1,5 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
+.. _architecture:
 
 Architecture
 ============
index 9a78535..8b22f6e 100644 (file)
@@ -1,5 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
+.. _offeredapis:
 
 Offered APIs
 ============
diff --git a/docs/tox.ini b/docs/tox.ini
new file mode 100644 (file)
index 0000000..edac8c3
--- /dev/null
@@ -0,0 +1,22 @@
+[tox]
+minversion = 1.6
+envlist = docs,
+skipsdist = true
+
+[testenv:docs]
+basepython = python3
+deps = -r{toxinidir}/requirements-docs.txt
+commands =
+    sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html
+    echo "Generated docs available in {toxinidir}/_build/html"
+whitelist_externals =
+    echo
+    git
+    sh
+
+[testenv:docs-linkcheck]
+basepython = python3
+#deps = -r{toxinidir}/requirements-docs.txt
+commands = echo "Link Checking not enforced"
+#commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./ {toxinidir}/_build/linkcheck
+whitelist_externals = echo
index 8dc9956..a9d0629 100644 (file)
 <?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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
 
-       <groupId>org.onap.ccsdk.distribution</groupId>
-       <artifactId>distribution-odlsli-alpine</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.distribution</groupId>
+    <artifactId>distribution-odlsli-alpine</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-       <name>ccsdk-distribution :: odlsli-alpine</name>
-       <description>Creates Alpine-based ODLSLI Docker container</description>
-       <organization>
-               <name>openECOMP</name>
-       </organization>
+    <name>ccsdk-distribution :: odlsli-alpine</name>
+    <description>Creates Alpine-based ODLSLI Docker container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
 
-       <properties>
-           <base.image.name>onap/ccsdk-odl-neon-alpine-image</base.image.name>
-               <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.features.version>0.7.0-SNAPSHOT</ccsdk.features.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-               <opendaylight.root>opt/opendaylight</opendaylight.root>
-               <docker.push.phase>deploy</docker.push.phase>
-               <docker.verbose>true</docker.verbose>
-               <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040</odl.features.extra>
-               <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
-               <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
+    <properties>
+        <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
+        <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
+        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <opendaylight.root>opt/opendaylight</opendaylight.root>
+        <docker.push.phase>deploy</docker.push.phase>
+        <docker.verbose>true</docker.verbose>
+        <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
+        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040
+        </odl.features.extra>
+        <ccsdk.odl.features>
+            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
+        </ccsdk.odl.features>
+        <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
 
-               <ccsdk.sli.core.version>0.7.0-SNAPSHOT</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.7.0-SNAPSHOT</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.7.0-SNAPSHOT</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.7.0-SNAPSHOT</ccsdk.sli.plugins.version>
-       </properties>
+        <ccsdk.features.version>1.1.0-SNAPSHOT</ccsdk.features.version>
+        <ccsdk.sli.core.version>1.1.0-SNAPSHOT</ccsdk.sli.core.version>
+        <ccsdk.sli.adaptors.version>1.1.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+        <ccsdk.sli.northbound.version>1.1.0-SNAPSHOT</ccsdk.sli.northbound.version>
+        <ccsdk.sli.plugins.version>1.1.0-SNAPSHOT</ccsdk.sli.plugins.version>
+        <ccsdk.oran.a1adapter.version>1.1.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
+    </properties>
 
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>dependencies</artifactId>
-                       <version>${project.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>dblib-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>filters-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sliapi-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sliPluginUtils-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>utils-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>slicore-features-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>aai-service-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-        <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>ansible-adapter-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>base-http-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>mdsal-resource-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                   <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
-                   <artifactId>publisher.installer</artifactId>
-                   <version>${ccsdk.sli.adaptors.version}</version>
-                   <classifier>repo</classifier>
-                   <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>netbox-client-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>resource-assignment-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>saltstack-adapter-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>sql-resource-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>sliadaptors-features-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>dependencies</artifactId>
+            <version>${project.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>asdcApi-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>lcm-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>slinorthbound-features-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>properties-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restapi-call-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>template-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restconf-client-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>sshapi-call-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>sliplugins-features-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>features-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>blueprints-processor-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                       <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>aafshiro-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-      <artifactId>sdnr-northbound-features-installer</artifactId>
-      <version>${ccsdk.features.version}</version>
-      <classifier>repo</classifier>
-      <type>zip</type>
-    </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-                       <artifactId>oofpcipoc-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-                       <artifactId>a1Adapter-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>dblib-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>filters-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliapi-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliPluginUtils-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>slicore-features-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>aai-service-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>ansible-adapter-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>base-http-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>mdsal-resource-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+            <artifactId>publisher.installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>netbox-client-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>resource-assignment-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>saltstack-adapter-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>sql-resource-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>sliadaptors-features-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
 
-       <build>
-       <extensions>
-               <extension>
-                       <!-- this extension is required by wagon in order to pass the proxy -->
-                       <groupId>org.apache.maven.wagon</groupId>
-                       <artifactId>wagon-http-lightweight</artifactId>
-                       <version>2.2</version>
-               </extension>
-       </extensions>
-               <plugins>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>asdcApi-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>lcm-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>slinorthbound-features-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>properties-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>restapi-call-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>template-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>restconf-client-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>sshapi-call-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>sliplugins-features-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features</groupId>
+            <artifactId>features-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features</groupId>
+            <artifactId>aafshiro-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>sdnr-northbound-features-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.oran</groupId>
+            <artifactId>a1-adapter-northbound-installer</artifactId>
+            <version>${ccsdk.oran.a1adapter.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>oofpcipoc-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.oran</groupId>
+            <artifactId>a1-adapter-installer</artifactId>
+            <version>${ccsdk.oran.a1adapter.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>CMNotify-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>ranSlice-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <extensions>
+            <extension>
+                <!-- this extension is required by wagon in order to pass the proxy -->
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-http-lightweight</artifactId>
+                <version>2.2</version>
+            </extension>
+        </extensions>
+        <plugins>
 
-                       <plugin>
-                               <groupId>org.codehaus.groovy.maven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>validate</phase>
-                                               <goals>
-                                                       <goal>execute</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
 
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
 
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dockerfile</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/docker</directory>
-                                                                       <includes>
-                                                                               <include>Dockerfile</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>copy-scripts</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/scripts</directory>
-                                                                       <includes>
-                                                                               <include>*.sh</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
+                    <execution>
+                        <id>copy-scripts</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/scripts</directory>
+                                    <includes>
+                                        <include>*.sh</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
 
-                                       <execution>
-                                               <id>copy-odl-resources</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>idmlight.db.mv.db</include>
-                                                                               <include>org.ops4j.pax.logging.cfg</include>
-                                                                               <include>install_ccsdk.yml</include>
-                                                                               <include>ansible-sources.list</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-config</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>org.ops4j.pax.logging.cfg</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-data</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>*.dump</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-properties</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/properties</directory>
-                                                                       <includes>
-                                                                               <include>*.properties</include>
-                                                                               <include>*.vt</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-keystores</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/stores</directory>
-                                                                       <includes>
-                                                                               <include>*.jks</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>3.0.2</version>
-                               <executions>
-                                       <execution>
-                                               <id>unpack features</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>unpack-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <excludeTransitive>true</excludeTransitive>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>unpack dgs</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>unpack</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${project.groupId}</groupId>
-                                                                       <artifactId>platform-logic-installer</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>zip</type>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>exec-maven-plugin</artifactId>
-                               <version>1.5.0</version>
-                               <executions>
+                    <execution>
+                        <id>copy-odl-resources</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/resources</directory>
+                                    <includes>
+                                        <include>idmlight.db.mv.db</include>
+                                        <include>org.ops4j.pax.logging.cfg</include>
+                                        <include>install_ccsdk.yml</include>
+                                        <include>ansible-sources.list</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-config</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/resources</directory>
+                                    <includes>
+                                        <include>org.ops4j.pax.logging.cfg</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-data</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/resources</directory>
+                                    <includes>
+                                        <include>*.dump</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-properties</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties
+                            </outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/properties</directory>
+                                    <includes>
+                                        <include>*.properties</include>
+                                        <include>*.vt</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-keystores</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../src/main/stores</directory>
+                                    <includes>
+                                        <include>*.jks</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>unpack features</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack dgs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>platform-logic-installer</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
 
-                                       <execution>
-                                               <id>change shell permissions</id>
-                                               <phase>process-sources</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <executable>/usr/bin/find</executable>
-                                                       <arguments>
-                                                               <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                                               <argument>-name</argument>
-                                                               <argument>*.sh</argument>
-                                                               <argument>-exec</argument>
-                                                               <argument>chmod</argument>
-                                                               <argument>+x</argument>
-                                                               <argument>{}</argument>
-                                                               <argument>;</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+                    <execution>
+                        <id>change shell permissions</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>/usr/bin/find</executable>
+                            <arguments>
+                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
+                                <argument>-name</argument>
+                                <argument>*.sh</argument>
+                                <argument>-exec</argument>
+                                <argument>chmod</argument>
+                                <argument>+x</argument>
+                                <argument>{}</argument>
+                                <argument>;</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
 
-               </plugins>
-       </build>
+        </plugins>
+    </build>
 
-       <profiles>
-               <profile>
-                       <id>docker</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>io.fabric8</groupId>
-                                               <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.28.0</version>
-                                               <inherited>false</inherited>
-                                               <configuration>
-                                                       <images>
-                                                               <image>
-                                                                       <name>${image.name}</name>
-                                                                       <build>
-                                                                               <cleanup>try</cleanup>
-                                                                               <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                                               <dockerFile>Dockerfile</dockerFile>
-                                                                               <tags>
-                                                                                       <tag>${project.docker.latestminortag.version}</tag>
-                                                                                       <tag>${project.docker.latestfulltag.version}</tag>
-                                                                                       <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                                                               </tags>
-                                                                       </build>
-                                                               </image>
-                                                       </images>
-                                               </configuration>
-                                               <executions>
-                                                       <execution>
-                                                               <id>generate-images</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>build</goal>
-                                                               </goals>
-                                                       </execution>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.28.0</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${image.name}</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${project.docker.latestminortag.version}</tag>
+                                            <tag>${project.docker.latestfulltag.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
 
-                                                       <execution>
-                                                               <id>push-images</id>
-                                                               <phase>${docker.push.phase}</phase>
-                                                               <goals>
-                                                                       <goal>build</goal>
-                                                                       <goal>push</goal>
-                                                               </goals>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
+                            <execution>
+                                <id>push-images</id>
+                                <phase>${docker.push.phase}</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
index 024043b..e8fa5ef 100644 (file)
@@ -2,10 +2,8 @@
 ## START OF STAGE0 ##
 FROM ${base.image.name}:${project.docker.latestfulltag.version} AS stage0
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
-
 # copy the opendaylight credentials
+USER root
 COPY idmlight.db.mv.db $ODL_HOME/data
 
 # copy CCSDK mvn artifacts to ODL repository
@@ -17,20 +15,20 @@ COPY opt /opt
 COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg
 ## END OF STAGE0 ##
 
-
 FROM ${base.image.name}:${project.docker.latestfulltag.version}
 
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+LABEL maintainer="CCSDK  Team (onap-ccsdk@lists.onap.org)"
+USER root
 
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-ENV ODL_HOME /opt/opendaylight
 ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
+ENV CCSDKFEATUREVERSION ${ccsdk.features.version}
 ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
 ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
 ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features
 ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features
 ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
 ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
+ENV A1ADAPTER_NORTHBOUND_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features
 ENV ANSIBLE_GPG_KEY ${ansible.gpg.key}
 ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 
@@ -49,9 +47,8 @@ COPY --from=stage0 --chown=odl:odl /opt /opt
 
 # Add CCSDK repositories to boot repositories
 RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
-RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${A1ADAPTER_NORTHBOUND_REPO}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
 USER odl
 ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh
-EXPOSE 8181
diff --git a/odlsli/odlsli-alpine/src/main/properties/aaiclient.properties b/odlsli/odlsli-alpine/src/main/properties/aaiclient.properties
deleted file mode 100755 (executable)
index 4f27206..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-###
-# ============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=========================================================
-###
-
-#
-# Configuration file for A&AI Client
-#
-
-#
-# Certificate keystore and truststore
-#
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/ccsdk/data/stores/truststore.onap.client.jks
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
-org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
-
-org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC
-org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC
-
-org.onap.ccsdk.sli.adaptors.aai.application=openECOMP
-#
-# Configuration file for A&AI Client
-#
-org.onap.ccsdk.sli.adaptors.aai.uri=https://aai.api.simpledemo.onap.org:8443
-connection.timeout=60000
-read.timeout=60000
-
-# query
-org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v14/search/sdn-zone-query
-org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v14/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
-org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v14/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
-
-# named query
-org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query
-
-#update
-org.onap.ccsdk.sli.adaptors.aai.update=/aai/v14/actions/update
-
-# UBB Notify
-org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v14/actions/notify
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information
-
-# P-Interfaces
-org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v14/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
-org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v14/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
-
-# VNF IMAGES
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v14/service-design-and-creation/vnf-images
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v14/service-design-and-creation/vnf-images/vnf-image/{att-uuid}
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v14/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
-
-# service instance
-org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v14/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
-org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
-
-# VNF IMAGES QUERY
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v14/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
-
-#
-# Formatting
-#
-org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s
-org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type
-org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id
-org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type
diff --git a/odlsli/odlsli-alpine/src/main/properties/admportal.json b/odlsli/odlsli-alpine/src/main/properties/admportal.json
deleted file mode 100755 (executable)
index 8d567d0..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "MainMenu": "gamma",
-  "dbConnLimit": "100",
-  "home": "/opt/admportal",
-  "sslEnabled": "false",
-  "nonSslPort": "8843",
-  "ConexusNetworkPort": "8443",
-  "AppNetworkPort": "8543",
-  "clusterPort": "8443",
-  "serviceHomingServiceType": "SDN-ETHERNET-INTERNET",
-  "passwordKey": "QtfJMKggVk",
-  "preloadImportDirectory": "C:/data/csv",
-  "clusterPrefixURL": "/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-",
-  "clusterMidURL": "-shard-",
-  "clusterSuffixURL": "-config,type=DistributedConfigDatastore",
-  "shards": [
-    "default",
-    "inventory",
-    "topology"
-  ],
-  "dbFabric": "false",
-  "ip-addresses": {
-    "lo": "127.0.0.1",
-    "eth0": "127.0.0.1",
-    "docker0": "172.17.0.1",
-    "virbr0": "192.168.122.1"
-  },
-  "svclogicPropertiesDb01": "/opt/onap/sdnc/data/properties/svclogic.properties.sdnctldb01",
-  "databases": [
-    "dbhost|sdnctldb01"
-  ],
-  "dbFabricServer": "localhost",
-  "dbFabricPort": "32275",
-  "dbFabricGroupId": "hagroup1",
-  "dbFabricUser": "admin",
-  "dbFabricPassword": "admin",
-  "dbFabricDB": "mysql",
-  "dbUser": "sdnctl",
-  "dbPassword": "gamma",
-  "dbName": "sdnctl",
-  "odlProtocol": "http",
-  "odlHost": "sdnhost",
-  "odlConexusHost": "sdnhost",
-  "odlPort": "8181",
-  "odlConexusPort": "8181",
-  "odlUser": "admin",
-  "odlPasswd": "admin",
-  "ConexusNetwork_sslCert": "",
-  "ConexusNetwork_sslKey": "",
-  "AppNetwork_sslCert": "",
-  "AppNetwork_sslKey": "",
-  "hostnameList": [
-    {
-      "hname": "localhost"
-    }
-  ],
-  "shard_list": [
-    {
-      "shard_name": "default"
-    },
-    {
-      "shard_name": "inventory"
-    },
-    {
-      "shard_name": "topology"
-    }
-  ]
-}
diff --git a/odlsli/odlsli-alpine/src/main/properties/admportal.log4js.json b/odlsli/odlsli-alpine/src/main/properties/admportal.log4js.json
deleted file mode 100755 (executable)
index 0f41e56..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-{ 
-  "appenders": [ 
-       {
-               "category": "accesslog",
-               "type"    : "file",
-               "absolute": true,
-               "filename": "/opt/admportal/logs/accesslog.log"
-       },
-       {
-        "category" : "usertrace",
-        "type"     : "file",
-               "absolute" : true,
-        "filename" : "/opt/admportal/logs/usertrace.log"
-    },
-    { 
-        "category": "tracelog", 
-        "type"    : "dateFile", 
-        "absolute": true, 
-        "filename": "/opt/admportal/logs/tracelog.log",
-        "pattern": "-yyyy-MM-dd", 
-        "alwaysIncludePattern": true, 
-        "backups"  : 14
-    },
-       {
-        "category" : "tunnel",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/tunnel.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-        "category" : "preload",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/preload.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-               "category" : "eipam",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/eipam.log",
-        "pattern"  : "-yyyy-MM-dd", 
-        "alwaysIncludePattern": true, 
-               "backups"  : 14
-       }, 
-       {
-        "category" : "instar",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/instar.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-               "category" : "app",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/app.log",
-        "pattern"  : "-yyyy-MM-dd", 
-        "alwaysIncludePattern": true, 
-               "backups"  : 14
-       }, 
-       {
-               "category" : "csp",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/csp.log",
-        "pattern"  : "-yyyy-MM-dd", 
-        "alwaysIncludePattern": true, 
-               "backups"  : 14
-       }, 
-       {
-               "category" : "db",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/db.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-               "category" : "admin",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/admin.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-               "category" : "resalloc",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/resalloc.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-        "category" : "logs",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/applogs.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-               "category" : "sla",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/sla.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-               "category" : "gamma",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/gamma.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-               "category" : "odl",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/odl.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       }, 
-       {
-        "category" : "mobility",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/mobility.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-        "category" : "ucpe",
-        "type"     : "dateFile",
-        "absolute" : true,
-        "filename" : "/opt/admportal/logs/ucpe.log",
-        "pattern"  : "-yyyy-MM-dd",
-        "alwaysIncludePattern": true,
-        "backups"  : 14
-    },
-       {
-               "category" : "user",
-               "type"     : "dateFile",
-        "absolute" : true, 
-               "filename" : "/opt/admportal/logs/user.log",
-               "pattern"  : "-yyyy-MM-dd",
-               "alwaysIncludePattern": true,
-               "backups"  : 14
-       } 
-  ] 
-}
diff --git a/odlsli/odlsli-alpine/src/main/properties/dblib.properties b/odlsli/odlsli-alpine/src/main/properties/dblib.properties
deleted file mode 100644 (file)
index 9506ac8..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-###
-# ============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=========================================================
-###
-
-# dblib.properrties
-org.onap.ccsdk.sli.dbtype=jdbc
-
-org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
-org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
-org.onap.ccsdk.sli.jdbc.database=sdnctl
-org.onap.ccsdk.sli.jdbc.user=sdnctl
-org.onap.ccsdk.sli.jdbc.password=gamma
-org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01
-org.onap.ccsdk.sli.jdbc.connection.timeout=50
-org.onap.ccsdk.sli.jdbc.request.timeout=100
-org.onap.ccsdk.sli.jdbc.limit.init=10
-org.onap.ccsdk.sli.jdbc.limit.min=10
-org.onap.ccsdk.sli.jdbc.limit.max=20
-org.onap.dblib.connection.recovery=false
-
diff --git a/odlsli/odlsli-alpine/src/main/properties/mdsal-resource.properties b/odlsli/odlsli-alpine/src/main/properties/mdsal-resource.properties
deleted file mode 100644 (file)
index d853747..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-###
-# ============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=========================================================
-###
-
-org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-user=admin
-org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-passwd=admin
-org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-host=localhost
-org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-protocol=http
-org.onap.ccsdk.sli.adaptors.resource.mdsal.sdnc-port=8181
-
diff --git a/odlsli/odlsli-alpine/src/main/properties/rpc-message-sliapi-execute.vt b/odlsli/odlsli-alpine/src/main/properties/rpc-message-sliapi-execute.vt
deleted file mode 100644 (file)
index 1cdd65e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       "input": {
-               "module-name": "oofpcipoc-api",
-               "rpc-name": $rpc_name,
-               "mode": "sync",
-               "sli-parameter": $sli_parameters
-       }
-}
\ No newline at end of file
diff --git a/odlsli/odlsli-alpine/src/main/properties/sdnr-oofpcipoc-api-dg.properties b/odlsli/odlsli-alpine/src/main/properties/sdnr-oofpcipoc-api-dg.properties
deleted file mode 100644 (file)
index d80bb5c..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-restapi.templateDir=/opt/onap/ccsdk/restapi/templates
-controller.url=http://sdnc.onap:8282
-controller.user=admin
-controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-ransim-mounted=false
-
-restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
-restapi.trustStorePassword=adminadmin
-restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12
-restapi.keyStorePassword=adminadmin
-restapi.connection-oof-url=http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route
-naming.gen-name.url=http://neng-serv:8080
-naming.gen-name.user=ccsdkapps
-naming.gen-name.pwd=ccsdkapps
-
-
-#Patch Targets
-oofpcipoc.patch.pci.target=/oofpcipoc:phy-cell-id-in-use
-oofpcipoc.patch.pci.target2=/oofpcipoc:fap-service[oofpcipoc:alias='{alias}']/oofpcipoc:x-0005b9-lte
-
-
-# Templates
-restapi.pci-patch.templatefile=oofpcipoc-pci-patch.json
-restapi.neighbor-add.templatefile=oofpcipoc-addNeighbor.json
-restapi.neighbor-delete.templatefile=oofpcipoc-deleteNeighbor.json
-restapi.generic-neighbor-patch.template=oofpcipoc-generic-neighbor-patch.json
-restapi.add-nbr-to-configdb-per-notif.template=oofpcipoc-add-nbr-to-configdb-per-nbrlist-change-notif.json
-restapi.dmaap-publish.template=oofpcipoc-dmaap-publish-template.json
-
-# URLs without Netconf Mount of Ran Simulator
-restapi.config=/restconf/config
-restapi.radio-access=/restconf/config/oofpcipoc:radio-access
-restapi.fap-service=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}
-restapi.x-005b9-lte=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/x-0005b9-lte
-restapi.lte-ran-neighbor-list-in-use=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
-restapi.lte-ran-neighbor-in-use=/restconf/config/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
-
-# URLs with Netconf Mount of Ran Simulator
-restapi.config.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/
-restapi.radio-access.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access
-restapi.fap-service.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}
-restapi.x-005b9-lte.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/x-0005b9-lte
-restapi.lte-ran-neighbor-list-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
-restapi.lte-ran-neighbor-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/oofpcipoc:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
-
-#URLs for ConfigDB
-restapi.configdb.add-nbrlist-change-per-notif=/createNbr/{cellId}
-configdb.url=http://10.12.6.45:8080/api/sdnc-config-db/v3
-
-#DMAAP Publish
-dmaap-message-router.url=message-router.onap:3904/events
-oofpcipoc-dmaap.nbrlist-change.topic=/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
-
-oofpcipoc-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459
-oofpcipoc-dmaap.aai=
-oofpcipoc-dmaap.version=1.0.2
-oofpcipoc-dmaap.nbrlistchange.action=NeighborListModified
diff --git a/odlsli/odlsli-alpine/src/main/properties/sql-resource.properties b/odlsli/odlsli-alpine/src/main/properties/sql-resource.properties
deleted file mode 100644 (file)
index ac32f77..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-###
-# ============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=========================================================
-###
-
-org.openecomp.sdnc.resource.sql.cryptkey=QtfJMKggVk
-
diff --git a/odlsli/odlsli-alpine/src/main/properties/svclogic.properties b/odlsli/odlsli-alpine/src/main/properties/svclogic.properties
deleted file mode 100644 (file)
index 54d667c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-###
-# ============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=========================================================
-###
-
-org.onap.ccsdk.sli.dbtype = dblib
-#Note : the next 4 fields are only used if org.onap.ccsdk.sli.dbtype = jdbc
-org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.onap.ccsdk.sli.jdbc.database=sdnctl
-org.onap.ccsdk.sli.jdbc.user=sdnctl
-org.onap.ccsdk.sli.jdbc.password=gamma
-
-org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
diff --git a/odlsli/odlsli-alpine/src/main/properties/svclogic.properties.sdnctldb01 b/odlsli/odlsli-alpine/src/main/properties/svclogic.properties.sdnctldb01
deleted file mode 100755 (executable)
index 54d667c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-###
-# ============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=========================================================
-###
-
-org.onap.ccsdk.sli.dbtype = dblib
-#Note : the next 4 fields are only used if org.onap.ccsdk.sli.dbtype = jdbc
-org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.onap.ccsdk.sli.jdbc.database=sdnctl
-org.onap.ccsdk.sli.jdbc.user=sdnctl
-org.onap.ccsdk.sli.jdbc.password=gamma
-
-org.xml.sax.driver=org.apache.xerces.parsers.SAXParser
diff --git a/odlsli/odlsli-alpine/src/main/resources/ansible-sources.list b/odlsli/odlsli-alpine/src/main/resources/ansible-sources.list
deleted file mode 100644 (file)
index 7e166f2..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main 
-deb-src http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main 
\ No newline at end of file
diff --git a/odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db b/odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db
deleted file mode 100644 (file)
index c6b359d..0000000
Binary files a/odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db and /dev/null differ
diff --git a/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml b/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
deleted file mode 100644 (file)
index e09eceb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- hosts: all
-  become: yes
-  roles:
-    - role: ansible-opendaylight
-      # ODL is already installed, so no need to specify installation method.  Specify extra features to install
-      extra_features:
-          - odl-restconf-all 
-          - odl-mdsal-all
-          - odl-mdsal-apidocs
-          - odl-daexim-all
-          - odl-restconf-nb-rfc8040
-          - ccsdk-sli-core-all
-          - ccsdk-sli-adaptors-all
-          - ccsdk-sli-northbound-all
-          - ccsdk-sli-plugins-all
\ No newline at end of file
diff --git a/odlsli/odlsli-alpine/src/main/resources/odlsli.dump b/odlsli/odlsli-alpine/src/main/resources/odlsli.dump
deleted file mode 100644 (file)
index 6f8217c..0000000
+++ /dev/null
@@ -1,1416 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.22, for Linux (x86_64)
---
--- Host: sdnctldb01    Database: sdnctl
--- ------------------------------------------------------
--- Server version      5.6.27-enterprise-commercial-advanced-log
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN;
-SET @@SESSION.SQL_LOG_BIN= 0;
-
---
--- Table structure for table `ALLOCATION_ITEM`
---
-
-DROP TABLE IF EXISTS `ALLOCATION_ITEM`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ALLOCATION_ITEM` (
-  `allocation_item_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_id` bigint(20) NOT NULL,
-  `application_id` varchar(50) NOT NULL,
-  `resource_set_id` varchar(200) NOT NULL,
-  `resource_union_id` varchar(200) NOT NULL,
-  `resource_share_group_list` varchar(200) DEFAULT NULL,
-  `lt_used` bigint(20) DEFAULT NULL,
-  `ll_label` varchar(50) DEFAULT NULL,
-  `rr_used` varchar(200) DEFAULT NULL,
-  `allocation_time` datetime NOT NULL,
-  PRIMARY KEY (`allocation_item_id`),
-  UNIQUE KEY `allocation_item_id` (`allocation_item_id`),
-  UNIQUE KEY `IX2_ALLOCATION_ITEM` (`resource_id`,`resource_set_id`),
-  KEY `IX1_ALLOCATION_ITEM` (`resource_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=10104 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `DATA_OBJECT_MAPPING`
---
-
-DROP TABLE IF EXISTS `DATA_OBJECT_MAPPING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DATA_OBJECT_MAPPING` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `data_object_key` varchar(100) NOT NULL,
-  `data_object_type` varchar(50) NOT NULL,
-  `service_type` varchar(50) NOT NULL,
-  `data_object_key2` varchar(100) NOT NULL,
-  `data_object_key2_type` varchar(50) NOT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DATA_OBJECT_MAPPING` (`data_object_key`,`data_object_type`,`service_type`),
-  KEY `IX2_DATA_OBJECT_MAPPING` (`service_type`,`data_object_key2`,`data_object_key2_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `DEVICE2CONNECTION_MAPPING`
---
-
-DROP TABLE IF EXISTS `DEVICE2CONNECTION_MAPPING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DEVICE2CONNECTION_MAPPING` (
-  `vnf_host_name` varchar(100) NOT NULL,
-  `e2e_vpn_key` varchar(30) NOT NULL,
-  `service_type` varchar(30) NOT NULL,
-  `connection_id` bigint(20) NOT NULL,
-  PRIMARY KEY (`vnf_host_name`,`e2e_vpn_key`,`service_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `DEVICE2IPADDRESS_CONSUMPTION`
---
-
-DROP TABLE IF EXISTS `DEVICE2IPADDRESS_CONSUMPTION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DEVICE2IPADDRESS_CONSUMPTION` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `device_id` varchar(100) NOT NULL,
-  `device_type` varchar(30) NOT NULL,
-  `ip_version` varchar(10) NOT NULL,
-  `consumption_key` varchar(100) NOT NULL,
-  `logical_interface_service_id` varchar(100) NOT NULL,
-  `address_type` varchar(30) NOT NULL,
-  `ip_consumed` varchar(50) NOT NULL,
-  `vnf_type` varchar(30) NOT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DEVICEIPADDRESS_CONSUMPTION` (`device_id`,`device_type`,`ip_version`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `DEVICE2IPADDRESS_MAPPING`
---
-
-DROP TABLE IF EXISTS `DEVICE2IPADDRESS_MAPPING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `DEVICE2IPADDRESS_MAPPING` (
-  `serial_key` int(11) NOT NULL AUTO_INCREMENT,
-  `device_id` varchar(100) NOT NULL,
-  `device_type` varchar(30) NOT NULL,
-  `secondary_key` varchar(100) NOT NULL,
-  `secondary_key_type` varchar(30) NOT NULL,
-  `address` varchar(50) NOT NULL,
-  `address_type` varchar(30) NOT NULL,
-  `ip_version` varchar(10) NOT NULL,
-  `length` int(11) NOT NULL,
-  `status` varchar(30) NOT NULL,
-  PRIMARY KEY (`serial_key`),
-  KEY `IX1_DEVICE2IPADDRESS_MAPPING` (`device_id`,`device_type`,`secondary_key`,`secondary_key_type`,`address`,`address_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `EIPAM_IP_ASSIGNMENTS`
---
-
-DROP TABLE IF EXISTS `EIPAM_IP_ASSIGNMENTS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EIPAM_IP_ASSIGNMENTS` (
-  `plan_name` varchar(40) NOT NULL,
-  `client_key` varchar(100) NOT NULL,
-  `service_type` varchar(40) NOT NULL,
-  `ip_address` varchar(40) DEFAULT NULL,
-  `prefix_length` int(2) DEFAULT NULL,
-  `status` varchar(20) DEFAULT NULL,
-  `service_instance_id` varchar(80) DEFAULT NULL,
-  `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `prev_status` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`plan_name`,`client_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `EIPAM_IP_SUBNETS`
---
-
-DROP TABLE IF EXISTS `EIPAM_IP_SUBNETS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EIPAM_IP_SUBNETS` (
-  `entity_id` int(6) NOT NULL,
-  `service_type` varchar(40) NOT NULL,
-  `plan_name` varchar(40) NOT NULL,
-  `address_family` varchar(10) NOT NULL,
-  `ip_address` varchar(40) NOT NULL,
-  `prefix_length` int(3) NOT NULL,
-  `status` varchar(20) NOT NULL,
-  `last_modified_ts` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  PRIMARY KEY (`entity_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `EIPAM_IP_SUBNET_KEYS`
---
-
-DROP TABLE IF EXISTS `EIPAM_IP_SUBNET_KEYS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EIPAM_IP_SUBNET_KEYS` (
-  `entity_id` int(6) NOT NULL,
-  `key_name` varchar(255) NOT NULL,
-  `key_value` varchar(50) NOT NULL,
-  `level` int(2) NOT NULL,
-  PRIMARY KEY (`entity_id`,`key_name`,`key_value`,`level`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `EIPAM_REQUEST_KEY`
---
-
-DROP TABLE IF EXISTS `EIPAM_REQUEST_KEY`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `EIPAM_REQUEST_KEY` (
-  `key_name_1` varchar(50) NOT NULL,
-  `address_family` varchar(4) NOT NULL,
-  `serial_key` int(2) NOT NULL AUTO_INCREMENT,
-  `plan_name` varchar(50) NOT NULL,
-  `request_length` int(2) NOT NULL,
-  `pools_length` int(2) NOT NULL,
-  `plan_length` int(2) NOT NULL,
-  `key_name_0` varchar(50) NOT NULL,
-  `key_name_type_0` varchar(255) NOT NULL,
-  `key_name_type_1` varchar(255) NOT NULL,
-  `prefix_length` int(2) NOT NULL,
-  `group_flag` char(1) NOT NULL,
-  `address_type` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`key_name_1`,`address_family`),
-  UNIQUE KEY `IX1_EIPAM_REQUEST_KEY` (`serial_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_L3_NETWORK`
---
-
-DROP TABLE IF EXISTS `GENERIC_L3_NETWORK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_L3_NETWORK` (
-  `network_id` varchar(80) NOT NULL,
-  `network_name` varchar(80) DEFAULT NULL,
-  `network_type` varchar(80) DEFAULT NULL,
-  `network_role` varchar(80) DEFAULT NULL,
-  `network_technology` varchar(80) DEFAULT NULL,
-  `neutron_network_id` varchar(80) DEFAULT NULL,
-  `is_bound_to_vpn` tinyint(1) DEFAULT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `service_id` varchar(80) NOT NULL,
-  `tenant_id` varchar(80) NOT NULL,
-  `physical_location_id` varchar(20) DEFAULT NULL,
-  `network_role_instance` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_L3_NETWORK_SUBNET`
---
-
-DROP TABLE IF EXISTS `GENERIC_L3_NETWORK_SUBNET`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_L3_NETWORK_SUBNET` (
-  `network_id` varchar(80) NOT NULL,
-  `subnet_id` varchar(80) NOT NULL,
-  `neutron_subnet_id` varchar(80) DEFAULT NULL,
-  `gateway_address` varchar(45) NOT NULL,
-  `network_start_address` varchar(45) NOT NULL,
-  `cidr_mask` varchar(20) NOT NULL,
-  `ip_version` char(1) NOT NULL,
-  `orchestration_status` varchar(64) NOT NULL,
-  `dhcp_enabled` tinyint(1) NOT NULL,
-  `dhcp_start` varchar(45) DEFAULT NULL,
-  `dhcp_end` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`network_id`,`subnet_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_L3_NETWORK_VPN_BINDING`
---
-
-DROP TABLE IF EXISTS `GENERIC_L3_NETWORK_VPN_BINDING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_L3_NETWORK_VPN_BINDING` (
-  `network_id` varchar(80) NOT NULL,
-  `vpn_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_id`,`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vnf_name` varchar(80) NOT NULL,
-  `vnf_type` varchar(200) NOT NULL,
-  `vnf_name2` varchar(80) DEFAULT NULL,
-  `service_id` varchar(80) NOT NULL,
-  `equipment_role` varchar(80) NOT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `prov_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `regional_resource_zone` varchar(80) DEFAULT NULL,
-  `operational_state` varchar(80) DEFAULT NULL,
-  `license_key` varchar(80) DEFAULT NULL,
-  `ipv4_oam_address` varchar(20) DEFAULT NULL,
-  `ipv4_loopback0_address` varchar(20) DEFAULT NULL,
-  `nm_lan_v6_address` varchar(40) DEFAULT NULL,
-  `management_v6_address` varchar(40) DEFAULT NULL,
-  `management_option` varchar(45) DEFAULT NULL,
-  `vcpu` varchar(45) DEFAULT NULL,
-  `vmemory` varchar(45) DEFAULT NULL,
-  `vdisk` varchar(45) DEFAULT NULL,
-  `vcpu_units` varchar(45) DEFAULT NULL,
-  `vmemory_units` varchar(45) DEFAULT NULL,
-  `vdisk_units` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_L3_NETWORK`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_L3_NETWORK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_L3_NETWORK` (
-  `vnf_id` varchar(80) NOT NULL,
-  `network_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`network_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_LICENSE_MANAGEMENT`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_LICENSE_MANAGEMENT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_LICENSE_MANAGEMENT` (
-  `vnf_id` varchar(80) NOT NULL,
-  `att_uuid` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_LINTERFACE`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_LINTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_LINTERFACE` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `interface_role` varchar(45) DEFAULT NULL,
-  `v6_wan_link_ip` varchar(45) DEFAULT NULL,
-  `selflink` varchar(128) DEFAULT NULL,
-  `interface_id` varchar(45) DEFAULT NULL,
-  `macaddr` varchar(64) DEFAULT NULL,
-  `network_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`),
-  KEY `FK_GENERIC_VNF_LINTERFACE_GENERIC_VNF_IDX` (`vnf_id`),
-  CONSTRAINT `FK_GENERIC_VNF_LINTERFACE_GENERIC_VNF` FOREIGN KEY (`vnf_id`) REFERENCES `GENERIC_VNF` (`vnf_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_PSERVER`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_PSERVER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_PSERVER` (
-  `vnf_id` varchar(64) NOT NULL,
-  `hostname` varchar(255) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`hostname`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_SERVICE_INSTANCE`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_SERVICE_INSTANCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_SERVICE_INSTANCE` (
-  `vnf_id` varchar(64) NOT NULL,
-  `service_instance_id` varchar(255) NOT NULL,
-  `relationship_key` varchar(64) NOT NULL,
-  `relationship_value` varchar(64) DEFAULT NULL,
-  `global_customer_id` varchar(255) DEFAULT NULL,
-  `service_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`service_instance_id`,`relationship_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_VNF_IMAGE`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_VNF_IMAGE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_VNF_IMAGE` (
-  `vnf_id` varchar(64) NOT NULL,
-  `att_uuid` varchar(255) NOT NULL,
-  PRIMARY KEY (`vnf_id`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VNF_VSERVER`
---
-
-DROP TABLE IF EXISTS `GENERIC_VNF_VSERVER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VNF_VSERVER` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vserver_id` varchar(128) NOT NULL,
-  `tenant_id` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `GENERIC_VPN_BINDING`
---
-
-DROP TABLE IF EXISTS `GENERIC_VPN_BINDING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GENERIC_VPN_BINDING` (
-  `vpn_id` varchar(80) NOT NULL,
-  `vpn_name` varchar(80) NOT NULL,
-  `global_route_target` varchar(80) NOT NULL,
-  PRIMARY KEY (`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `HOSTNAME`
---
-
-DROP TABLE IF EXISTS `HOSTNAME`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `HOSTNAME` (
-  `hostname` varchar(21) NOT NULL,
-  `parent_hostname` varchar(21) DEFAULT NULL,
-  `cust_id` int(11) NOT NULL,
-  `loc_id` int(11) NOT NULL,
-  `site_sequence` varchar(2) NOT NULL,
-  `server_sequence` varchar(2) NOT NULL,
-  `activation_code` varchar(11) DEFAULT NULL,
-  `vnf_sequence` varchar(2) DEFAULT NULL,
-  `vendor_code` varchar(1) NOT NULL,
-  `virtual_device_type` varchar(2) DEFAULT NULL,
-  `device_sequence` varchar(3) DEFAULT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`hostname`),
-  KEY `IN1_HOSTNAME` (`cust_id`),
-  KEY `IN2_HOSTNAME` (`loc_id`),
-  KEY `IN3_HOSTNAME` (`vendor_code`),
-  KEY `IN4_HOSTNAME` (`parent_hostname`),
-  CONSTRAINT `FK1_HOSTNAME` FOREIGN KEY (`cust_id`) REFERENCES `CUSTOMER` (`cust_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK2_HOSTNAME` FOREIGN KEY (`loc_id`) REFERENCES `LOCATION` (`loc_id`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK3_HOSTNAME` FOREIGN KEY (`vendor_code`) REFERENCES `VENDOR_CODE` (`vendor_code`) ON DELETE NO ACTION ON UPDATE NO ACTION,
-  CONSTRAINT `FK4_HOSTNAME` FOREIGN KEY (`parent_hostname`) REFERENCES `HOSTNAME` (`hostname`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `IPV4_ADDRESS_POOL`
---
-
-DROP TABLE IF EXISTS `IPV4_ADDRESS_POOL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `IPV4_ADDRESS_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `universe` varchar(40) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `ipv4_addr` varchar(20) NOT NULL,
-  PRIMARY KEY (`ipv4_addr`,`universe`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `LINTERFACE_VLAN`
---
-
-DROP TABLE IF EXISTS `LINTERFACE_VLAN`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LINTERFACE_VLAN` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `vlan_id_inner` varchar(64) DEFAULT NULL,
-  `vlan_id_outer` varchar(64) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`),
-  KEY `FK_LINTERFACE_VLAN_GENERIC_VNF_LINTERFACE_IDX` (`vnf_id`,`interface_name`),
-  CONSTRAINT `FK_LINTERFACE_VLAN_GENERIC_VNF_LINTERFACE` FOREIGN KEY (`vnf_id`, `interface_name`) REFERENCES `GENERIC_VNF_LINTERFACE` (`vnf_id`, `interface_name`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `LOCATION`
---
-
-DROP TABLE IF EXISTS `LOCATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `LOCATION` (
-  `loc_id` int(11) NOT NULL AUTO_INCREMENT,
-  `address` varchar(150) NOT NULL,
-  `city_code_id` int(11) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`loc_id`),
-  KEY `IN1_LOCATION_IDX` (`city_code_id`),
-  CONSTRAINT `FK1_LOCATION` FOREIGN KEY (`city_code_id`) REFERENCES `CITY_CODE` (`city_code_id`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=112 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `MAX_PORT_SPEED`
---
-
-DROP TABLE IF EXISTS `MAX_PORT_SPEED`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `MAX_PORT_SPEED` (
-  `max_port_speed_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `image_file_name` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `interface_name` varchar(100) NOT NULL,
-  `max_speed` bigint(20) NOT NULL,
-  `unit` varchar(10) NOT NULL,
-  PRIMARY KEY (`max_port_speed_id`),
-  UNIQUE KEY `max_port_speed_id` (`max_port_speed_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `MAX_SERVER_SPEED`
---
-
-DROP TABLE IF EXISTS `MAX_SERVER_SPEED`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `MAX_SERVER_SPEED` (
-  `max_server_speed_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `server_model` varchar(50) NOT NULL,
-  `evc_count` smallint(6) NOT NULL,
-  `max_speed` bigint(20) NOT NULL,
-  `unit` varchar(10) NOT NULL,
-  `description` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`max_server_speed_id`),
-  UNIQUE KEY `max_server_speed_id` (`max_server_speed_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
-
---
--- Table structure for table `NETWORK_PROFILE`
---
-
-DROP TABLE IF EXISTS `NETWORK_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NETWORK_PROFILE` (
-  `network_type` varchar(100) NOT NULL,
-  `technology` varchar(100) NOT NULL,
-  PRIMARY KEY (`network_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `NETWORK_ROLE_VPN_BINDING`
---
-
-DROP TABLE IF EXISTS `NETWORK_ROLE_VPN_BINDING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NETWORK_ROLE_VPN_BINDING` (
-  `network_role` varchar(80) NOT NULL,
-  `vpn_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`network_role`,`vpn_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `NODE_TYPES`
---
-
-DROP TABLE IF EXISTS `NODE_TYPES`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `NODE_TYPES` (
-  `nodetype` varchar(80) NOT NULL,
-  PRIMARY KEY (`nodetype`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `PARAMETERS`
---
-
-DROP TABLE IF EXISTS `PARAMETERS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PARAMETERS` (
-  `name` varchar(100) NOT NULL,
-  `value` varchar(24) NOT NULL,
-  `category` varchar(24) DEFAULT NULL,
-  `memo` varchar(128) DEFAULT NULL,
-  PRIMARY KEY (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `PHYSICAL_LINK`
---
-
-DROP TABLE IF EXISTS `PHYSICAL_LINK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PHYSICAL_LINK` (
-  `link_name` varchar(255) NOT NULL,
-  `speed_value` varchar(64) DEFAULT NULL,
-  `speed_units` varchar(64) DEFAULT NULL,
-  `circuit_id` varchar(255) NOT NULL,
-  `dual_mode` varchar(64) NOT NULL,
-  PRIMARY KEY (`link_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `PHYSICAL_LINK_PINTERFACE`
---
-
-DROP TABLE IF EXISTS `PHYSICAL_LINK_PINTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PHYSICAL_LINK_PINTERFACE` (
-  `link_name` varchar(255) NOT NULL,
-  `hostname` varchar(255) NOT NULL,
-  `port_name_ft` varchar(255) NOT NULL,
-  PRIMARY KEY (`link_name`,`hostname`,`port_name_ft`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `PINTERFACE`
---
-
-DROP TABLE IF EXISTS `PINTERFACE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PINTERFACE` (
-  `hostname` varchar(255) NOT NULL,
-  `port_name_ft` varchar(255) NOT NULL,
-  `interface_name` varchar(255) DEFAULT '',
-  `physical_speed` varchar(255) DEFAULT '',
-  `physical_units` varchar(255) DEFAULT '',
-  `port_description` varchar(255) DEFAULT '',
-  PRIMARY KEY (`hostname`,`port_name_ft`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `PORTAL_USERS`
---
-
-DROP TABLE IF EXISTS `PORTAL_USERS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PORTAL_USERS` (
-  `email` varchar(64) NOT NULL,
-  `password` varbinary(255) NOT NULL,
-  `privilege` char(1) NOT NULL,
-  PRIMARY KEY (`email`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `PSERVER`
---
-
-DROP TABLE IF EXISTS `PSERVER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `PSERVER` (
-  `hostname` varchar(255) NOT NULL,
-  `ptnii_equip_name` varchar(255) DEFAULT '',
-  `number_of_cpus` varchar(255) DEFAULT '',
-  `disk_in_gigabytes` varchar(255) DEFAULT '',
-  `ram_in_megabytes` varchar(255) DEFAULT '',
-  `equip_type` varchar(255) DEFAULT '',
-  `equip_vendor` varchar(255) DEFAULT '',
-  `equip_model` varchar(255) DEFAULT '',
-  `fqdn` varchar(255) DEFAULT '',
-  `pserver_selflink` varchar(255) DEFAULT '',
-  `ipv4_oam_address` varchar(40) DEFAULT NULL,
-  `serial_number` varchar(255) DEFAULT '',
-  `pserver_id` varchar(255) DEFAULT '',
-  `internet_topology` varchar(40) DEFAULT '',
-  `aic_site_id` varchar(100) DEFAULT '',
-  `in_maint` varchar(5) DEFAULT '',
-  `pserver_name2` varchar(255) DEFAULT '',
-  `purpose` varchar(255) DEFAULT '',
-  PRIMARY KEY (`hostname`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RANGE_RULE`
---
-
-DROP TABLE IF EXISTS `RANGE_RULE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RANGE_RULE` (
-  `range_rule_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `range_name` varchar(50) NOT NULL,
-  `service_model` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `equipment_level` varchar(50) NOT NULL,
-  `equipment_expression` varchar(2000) NOT NULL,
-  `ranges` varchar(100) NOT NULL,
-  PRIMARY KEY (`range_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RESOURCE`
---
-
-DROP TABLE IF EXISTS `RESOURCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE` (
-  `resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `asset_id` varchar(100) NOT NULL,
-  `resource_name` varchar(50) NOT NULL,
-  `resource_type` enum('Limit','Label','Range') NOT NULL,
-  `lt_used` bigint(20) DEFAULT NULL,
-  `ll_label` varchar(50) DEFAULT NULL,
-  `ll_reference_count` smallint(6) DEFAULT NULL,
-  `rr_used` varchar(4000) DEFAULT NULL,
-  PRIMARY KEY (`resource_id`),
-  UNIQUE KEY `resource_id` (`resource_id`),
-  UNIQUE KEY `IX1_RESOURCE` (`asset_id`,`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RESOURCE_LOAD`
---
-
-DROP TABLE IF EXISTS `RESOURCE_LOAD`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE_LOAD` (
-  `resource_load_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_id` bigint(20) NOT NULL,
-  `application_id` varchar(20) NOT NULL,
-  `resource_load_time` datetime NOT NULL,
-  `resource_expiration_time` datetime DEFAULT NULL,
-  PRIMARY KEY (`resource_load_id`),
-  UNIQUE KEY `resource_load_id` (`resource_load_id`),
-  UNIQUE KEY `IX2_RESOURCE_LOAD` (`resource_id`,`application_id`),
-  KEY `IX1_RESOURCE_LOAD` (`resource_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RESOURCE_LOCK`
---
-
-DROP TABLE IF EXISTS `RESOURCE_LOCK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE_LOCK` (
-  `resource_lock_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_name` varchar(50) NOT NULL,
-  `lock_holder` varchar(100) NOT NULL,
-  `lock_count` smallint(6) NOT NULL,
-  `lock_time` datetime NOT NULL,
-  `expiration_time` datetime NOT NULL,
-  PRIMARY KEY (`resource_lock_id`),
-  UNIQUE KEY `resource_lock_id` (`resource_lock_id`),
-  UNIQUE KEY `IX1_RESOURCE_LOCK` (`resource_name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2951 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RESOURCE_RULE`
---
-
-DROP TABLE IF EXISTS `RESOURCE_RULE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE_RULE` (
-  `resource_rule_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_name` varchar(50) NOT NULL,
-  `service_model` varchar(50) NOT NULL,
-  `end_point_position` varchar(50) NOT NULL,
-  `service_expression` varchar(2000) NOT NULL,
-  `equipment_level` varchar(50) NOT NULL,
-  `equipment_expression` varchar(2000) NOT NULL,
-  `allocation_expression` varchar(2000) NOT NULL,
-  `soft_limit_expression` varchar(2000) NOT NULL,
-  `hard_limit_expression` varchar(2000) NOT NULL,
-  PRIMARY KEY (`resource_rule_id`),
-  UNIQUE KEY `resource_rule_id` (`resource_rule_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `RESOURCE_THRESHOLD`
---
-
-DROP TABLE IF EXISTS `RESOURCE_THRESHOLD`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `RESOURCE_THRESHOLD` (
-  `resource_threshold_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `resource_rule_id` bigint(20) NOT NULL,
-  `threshold_expression` varchar(2000) NOT NULL,
-  `threshold_message` varchar(2000) NOT NULL,
-  PRIMARY KEY (`resource_threshold_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `SERVICE_RESOURCE`
---
-
-DROP TABLE IF EXISTS `SERVICE_RESOURCE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `SERVICE_RESOURCE` (
-  `service_resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `service_instance_id` varchar(80) NOT NULL,
-  `service_status` enum('Active','Pending') NOT NULL,
-  `service_change_number` smallint(6) NOT NULL,
-  `resource_set_id` varchar(100) NOT NULL,
-  `resource_union_id` varchar(100) NOT NULL,
-  PRIMARY KEY (`service_instance_id`,`service_change_number`),
-  UNIQUE KEY `service_resource_id` (`service_resource_id`),
-  KEY `IX1_SERVICE_RESOURCE` (`service_instance_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2203 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `SVC_LOGIC`
---
-
-DROP TABLE IF EXISTS `SVC_LOGIC`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `SVC_LOGIC` (
-  `module` varchar(80) NOT NULL,
-  `rpc` varchar(80) NOT NULL,
-  `version` varchar(40) NOT NULL,
-  `mode` varchar(5) NOT NULL,
-  `active` varchar(1) NOT NULL,
-  `graph` longblob,
-  PRIMARY KEY (`module`,`rpc`,`version`,`mode`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `TENANT`
---
-
-DROP TABLE IF EXISTS `TENANT`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `TENANT` (
-  `tenant_id` varchar(255) NOT NULL,
-  `tenant_name` varchar(255) NOT NULL,
-  `service_instance_id` varchar(255) NOT NULL,
-  PRIMARY KEY (`tenant_id`,`tenant_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `THRESHOLD_NOTIFICATION`
---
-
-DROP TABLE IF EXISTS `THRESHOLD_NOTIFICATION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `THRESHOLD_NOTIFICATION` (
-  `resource_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `threshold_expression` varchar(2000) DEFAULT NULL,
-  `threshold_message` varchar(500) DEFAULT NULL,
-  PRIMARY KEY (`resource_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
-
---
--- Table structure for table `VENDOR_CODE`
---
-
-DROP TABLE IF EXISTS `VENDOR_CODE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VENDOR_CODE` (
-  `vendor_code` varchar(1) NOT NULL,
-  `vendor` varchar(45) DEFAULT NULL,
-  PRIMARY KEY (`vendor_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_ID_POOL`
---
-
-DROP TABLE IF EXISTS `VLAN_ID_POOL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_ID_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `svc_instance_id` varchar(80) DEFAULT NULL,
-  `availability_zone` varchar(100) DEFAULT NULL,
-  `vplspe_name` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`vlan_id`,`aic_site_id`,`purpose`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_L3INTERFACE_IPV4_ADDRESS`
---
-
-DROP TABLE IF EXISTS `VLAN_L3INTERFACE_IPV4_ADDRESS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_L3INTERFACE_IPV4_ADDRESS` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `l3_interface_ipv4_address` varchar(64) NOT NULL,
-  `l3_interface_ipv4_prefix_length` varchar(45) DEFAULT NULL,
-  `vlan_id_inner` varchar(45) DEFAULT NULL,
-  `vlan_id_outer` varchar(45) DEFAULT NULL,
-  `is_floating` varchar(1) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`,`l3_interface_ipv4_address`),
-  KEY `FK_VLAN_L3INTERFACE_IPV4_ADDRESS_LINTERFACE_VLAN_IDX` (`vnf_id`,`interface_name`),
-  CONSTRAINT `FK_VLAN_L3INTERFACE_IPV4_ADDRESS_LINTERFACE_VLAN` FOREIGN KEY (`vnf_id`, `interface_name`, `vlan_interface`) REFERENCES `LINTERFACE_VLAN` (`vnf_id`, `interface_name`, `vlan_interface`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_L3INTERFACE_IPV6_ADDRESS`
---
-
-DROP TABLE IF EXISTS `VLAN_L3INTERFACE_IPV6_ADDRESS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_L3INTERFACE_IPV6_ADDRESS` (
-  `vnf_id` varchar(80) NOT NULL,
-  `interface_name` varchar(255) NOT NULL,
-  `vlan_interface` varchar(255) NOT NULL,
-  `l3_interface_ipv6_address` varchar(64) NOT NULL,
-  `l3_interface_ipv6_prefix_length` varchar(45) DEFAULT NULL,
-  `vlan_id_inner` varchar(45) DEFAULT NULL,
-  `vlan_id_outer` varchar(45) DEFAULT NULL,
-  `is_floating` varchar(1) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`,`interface_name`,`vlan_interface`,`l3_interface_ipv6_address`),
-  KEY `FK_VLAN_L3INTERFACE_IPV6_ADDRESS_LINTERFACE_VLAN_IDX` (`vnf_id`,`interface_name`,`vlan_interface`),
-  CONSTRAINT `FK_VLAN_L3INTERFACE_IPV6_ADDRESS_LINTERFACE_VLAN` FOREIGN KEY (`vnf_id`, `interface_name`, `vlan_interface`) REFERENCES `LINTERFACE_VLAN` (`vnf_id`, `interface_name`, `vlan_interface`) ON DELETE NO ACTION ON UPDATE NO ACTION
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_PLAN_ID`
---
-
-DROP TABLE IF EXISTS `VLAN_PLAN_ID`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_PLAN_ID` (
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `vlan_plan_id_count` int(4) NOT NULL,
-  PRIMARY KEY (`vlan_plan_id_count`,`plan_type`,`purpose`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_POOL`
---
-
-DROP TABLE IF EXISTS `VLAN_POOL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_POOL` (
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `vlan_plan_id` varchar(100) NOT NULL,
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `status` varchar(40) NOT NULL,
-  `reserved_id` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`aic_site_id`,`availability_zone`,`vlan_plan_id`,`plan_type`,`purpose`,`vlan_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VLAN_RANGES`
---
-
-DROP TABLE IF EXISTS `VLAN_RANGES`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VLAN_RANGES` (
-  `vlan_plan_id` varchar(100) NOT NULL,
-  `plan_type` varchar(40) NOT NULL,
-  `purpose` varchar(40) NOT NULL,
-  `range_start` int(4) NOT NULL,
-  `range_end` int(4) NOT NULL,
-  `generated` char(1) DEFAULT NULL,
-  PRIMARY KEY (`vlan_plan_id`,`plan_type`,`purpose`,`range_start`,`range_end`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VM_NETWORKS`
---
-
-DROP TABLE IF EXISTS `VM_NETWORKS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VM_NETWORKS` (
-  `vnf_type` varchar(200) NOT NULL,
-  `vm_type` varchar(45) NOT NULL,
-  `network_role` varchar(45) NOT NULL,
-  `assign_ips` tinyint(1) NOT NULL,
-  `assign_macs` tinyint(1) NOT NULL,
-  `assign_floating_ip` tinyint(1) NOT NULL,
-  `ip_count` int(11) DEFAULT NULL,
-  PRIMARY KEY (`vnf_type`,`vm_type`,`network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VM_PROFILE`
---
-
-DROP TABLE IF EXISTS `VM_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VM_PROFILE` (
-  `vnf_type` varchar(200) NOT NULL,
-  `vm_type` varchar(45) NOT NULL,
-  `vm_count` int(11) NOT NULL,
-  PRIMARY KEY (`vnf_type`,`vm_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF`
---
-
-DROP TABLE IF EXISTS `VNF`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF` (
-  `vnf_id` varchar(80) NOT NULL,
-  `vnf_name` varchar(80) NOT NULL,
-  `vnf_type` varchar(10) NOT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `availability_zone` varchar(80) DEFAULT NULL,
-  `aic_site_id` varchar(80) DEFAULT NULL,
-  `oam_ipv4_address` varchar(20) DEFAULT NULL,
-  `vnf_name2` varchar(80) DEFAULT NULL,
-  `vpe_id` varchar(80) NOT NULL,
-  `ipv4_loopback0_address` varchar(80) DEFAULT NULL,
-  `license_key` varchar(256) DEFAULT NULL,
-  `entitlement_resource_uuid` varchar(256) DEFAULT NULL,
-  PRIMARY KEY (`vnf_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_IMAGE`
---
-
-DROP TABLE IF EXISTS `VNF_IMAGE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_IMAGE` (
-  `application_vendor` varchar(255) NOT NULL,
-  `application_version` varchar(255) NOT NULL,
-  `att_uuid` varchar(255) NOT NULL,
-  `application` varchar(255) DEFAULT NULL,
-  `selflink` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`application_vendor`,`application_version`,`att_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_MODEL_LICENSES`
---
-
-DROP TABLE IF EXISTS `VNF_MODEL_LICENSES`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_MODEL_LICENSES` (
-  `att_part_number` varchar(255) NOT NULL,
-  `license_assignment_group` varchar(255) NOT NULL,
-  `license_required` tinyint(1) DEFAULT NULL,
-  `entitlement_assignment_group` varchar(255) DEFAULT NULL,
-  `entitlement_required` tinyint(1) DEFAULT NULL,
-  `feature_group_uuid` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`att_part_number`,`license_assignment_group`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_MODEL_LICENSE_FEATURES`
---
-
-DROP TABLE IF EXISTS `VNF_MODEL_LICENSE_FEATURES`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_MODEL_LICENSE_FEATURES` (
-  `att_part_number` varchar(255) NOT NULL,
-  `license_assignment_group` varchar(255) NOT NULL,
-  `feature` varchar(255) NOT NULL,
-  PRIMARY KEY (`att_part_number`,`license_assignment_group`,`feature`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_NETWORKS`
---
-
-DROP TABLE IF EXISTS `VNF_NETWORKS`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_NETWORKS` (
-  `vnf_type` varchar(200) NOT NULL,
-  `network_role` varchar(45) NOT NULL,
-  PRIMARY KEY (`vnf_type`,`network_role`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_NETWORK_CONNECTION`
---
-
-DROP TABLE IF EXISTS `VNF_NETWORK_CONNECTION`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_NETWORK_CONNECTION` (
-  `connection_uuid` varchar(80) NOT NULL,
-  `vnf_id` varchar(80) NOT NULL,
-  `connection_id` varchar(80) DEFAULT NULL,
-  `connection_type` varchar(20) DEFAULT NULL,
-  `neutron_network_id` varchar(80) DEFAULT NULL,
-  `neutron_network_name` varchar(80) DEFAULT NULL,
-  `orchestration_status` varchar(20) DEFAULT NULL,
-  `switch_id` varchar(40) DEFAULT NULL,
-  `heat_stack_id` varchar(80) DEFAULT NULL,
-  `mso_catalog_key` varchar(80) DEFAULT NULL,
-  `provider_network` varchar(80) DEFAULT NULL,
-  `port_group_id` varchar(80) DEFAULT NULL,
-  `port_group_name` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`connection_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_NETWORK_CONNECTION_VLAN`
---
-
-DROP TABLE IF EXISTS `VNF_NETWORK_CONNECTION_VLAN`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_NETWORK_CONNECTION_VLAN` (
-  `vlan_uuid` varchar(80) NOT NULL,
-  `vlan_id` int(4) NOT NULL,
-  `vlan_type` varchar(5) NOT NULL,
-  `connection_uuid` varchar(80) DEFAULT NULL,
-  PRIMARY KEY (`vlan_uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VNF_PROFILE`
---
-
-DROP TABLE IF EXISTS `VNF_PROFILE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_PROFILE` (
-  `vnf_type` varchar(200) NOT NULL,
-  `availability_zone_count` int(11) NOT NULL,
-  `equipment_role` varchar(80) NOT NULL,
-  PRIMARY KEY (`vnf_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VPE_LOCK`
---
-
-DROP TABLE IF EXISTS `VPE_LOCK`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VPE_LOCK` (
-  `vpe_name` varchar(20) NOT NULL,
-  `vpn_lock` varchar(20) NOT NULL,
-  PRIMARY KEY (`vpe_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VPE_POOL`
---
-
-DROP TABLE IF EXISTS `VPE_POOL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VPE_POOL` (
-  `vpe_name` varchar(20) NOT NULL,
-  `ipv4_oam_address` varchar(20) NOT NULL,
-  `loopback0_ipv4_address` varchar(20) NOT NULL,
-  `provisioning_status` varchar(10) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `vlan_id_outer` varchar(20) NOT NULL,
-  `vendor` varchar(20) NOT NULL,
-  `physical_intf_name` varchar(40) NOT NULL,
-  `physical_intf_speed` varchar(20) NOT NULL,
-  `physical_intf_units` varchar(20) NOT NULL,
-  `vpe_uuid` varchar(80) DEFAULT NULL,
-  `vpe_id` varchar(80) NOT NULL,
-  `image_filename` varchar(100) DEFAULT NULL,
-  `as_number` varchar(20) NOT NULL,
-  `loopback5000` varchar(16) DEFAULT NULL,
-  `loopback10` varchar(16) DEFAULT NULL,
-  PRIMARY KEY (`aic_site_id`,`vpe_name`,`availability_zone`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VPLSPE_POOL`
---
-
-DROP TABLE IF EXISTS `VPLSPE_POOL`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VPLSPE_POOL` (
-  `vplspe_name` varchar(20) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `availability_zone` varchar(100) NOT NULL,
-  `physical_intf_name` varchar(40) NOT NULL,
-  `physical_intf_speed` varchar(20) NOT NULL,
-  `physical_intf_units` varchar(20) NOT NULL,
-  `loopback0_ipv4_address` varchar(20) NOT NULL,
-  `vlan_id_outer` varchar(20) NOT NULL,
-  `vplspe_uuid` varchar(80) DEFAULT NULL,
-  `image_filename` varchar(100) DEFAULT NULL,
-  `provisioning_status` varchar(10) DEFAULT NULL,
-  `vendor` varchar(20) DEFAULT NULL,
-  PRIMARY KEY (`vplspe_name`,`aic_site_id`,`availability_zone`,`physical_intf_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VSERVER`
---
-
-DROP TABLE IF EXISTS `VSERVER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VSERVER` (
-  `tenant_id` varchar(40) NOT NULL,
-  `vserver_id` varchar(40) NOT NULL,
-  `aic_site_id` varchar(100) NOT NULL,
-  `vendor` varchar(20) NOT NULL,
-  `image_name` varchar(100) NOT NULL,
-  `vnf_type` varchar(10) NOT NULL,
-  `vnf_id` varchar(80) NOT NULL,
-  PRIMARY KEY (`tenant_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VSERVER2`
---
-
-DROP TABLE IF EXISTS `VSERVER2`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VSERVER2` (
-  `tenant_id` varchar(255) NOT NULL,
-  `vserver_id` varchar(128) NOT NULL,
-  `vserver_name` varchar(255) NOT NULL,
-  `vserver_name2` varchar(255) DEFAULT NULL,
-  `prov_status` varchar(20) DEFAULT NULL,
-  `selflink` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`tenant_id`,`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `VSERVER_PSERVER`
---
-
-DROP TABLE IF EXISTS `VSERVER_PSERVER`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VSERVER_PSERVER` (
-  `vserver_id` varchar(128) NOT NULL,
-  `pserver_hostname` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`vserver_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `WAN_COMBO_ALLOWABLE`
---
-
-DROP TABLE IF EXISTS `WAN_COMBO_ALLOWABLE`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `WAN_COMBO_ALLOWABLE` (
-  `combo_sequence` int(11) NOT NULL AUTO_INCREMENT,
-  `internet_topology` varchar(20) DEFAULT NULL,
-  `wan1` varchar(40) DEFAULT NULL,
-  `wan2` varchar(40) DEFAULT NULL,
-  `new_start_release` char(5) DEFAULT NULL,
-  `description` varchar(128) NOT NULL,
-  PRIMARY KEY (`combo_sequence`),
-  UNIQUE KEY `IX1_WAN_COMBO_ALLOWABLE` (`internet_topology`,`wan1`,`wan2`)
-) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `emp1000`
---
-
-DROP TABLE IF EXISTS `emp1000`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `emp1000` (
-  `firstName` varchar(20) DEFAULT NULL,
-  `lastName` varchar(20) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `linda`
---
-
-DROP TABLE IF EXISTS `linda`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `linda` (
-  `c1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `testit`
---
-
-DROP TABLE IF EXISTS `testit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `testit` (
-  `c1` varchar(12) DEFAULT NULL,
-  `c2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `testtable`
---
-
-DROP TABLE IF EXISTS `testtable`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `testtable` (
-  `city_code_id` int(11) NOT NULL AUTO_INCREMENT,
-  `city_code` varchar(3) NOT NULL,
-  `city` varchar(150) NOT NULL,
-  `state` varchar(10) NOT NULL,
-  `country_code` varchar(10) NOT NULL,
-  PRIMARY KEY (`city_code_id`),
-  KEY `IN1_testtable` (`city`,`state`,`country_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=37756 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-SET @@SESSION.SQL_LOG_BIN = @MYSQLDUMP_TEMP_LOG_BIN;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2016-11-23 16:01:55
diff --git a/odlsli/odlsli-alpine/src/main/resources/org.ops4j.pax.logging.cfg b/odlsli/odlsli-alpine/src/main/resources/org.ops4j.pax.logging.cfg
deleted file mode 100644 (file)
index ee35ef7..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You 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.
-#
-################################################################################
-
-# Common pattern layout for appenders
-log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %X{currentGraph} - %X{nodeId} | %m%n
-
-# Root logger
-log4j2.rootLogger.level = INFO
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#log4j2.rootLogger.type = asyncRoot
-#log4j2.rootLogger.includeLocation = false
-log4j2.rootLogger.appenderRef.RollingFile.ref = RollingFile
-log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
-log4j2.rootLogger.appenderRef.Console.ref = Console
-log4j2.rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-log4j2.rootLogger.appenderRef.Console.filter.threshold.level = ${karaf.log.console:-OFF}
-
-# Loggers configuration
-
-# Spifly logger
-log4j2.logger.spifly.name = org.apache.aries.spifly
-log4j2.logger.spifly.level = WARN
-
-# Security audit logger
-log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit
-log4j2.logger.audit.level = INFO
-log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
-
-# Appenders configuration
-
-# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
-log4j2.appender.console.type = Console
-log4j2.appender.console.name = Console
-log4j2.appender.console.layout.type = PatternLayout
-log4j2.appender.console.layout.pattern = ${log4j2.pattern}
-
-# Rolling file appender
-log4j2.appender.rolling.type = RollingRandomAccessFile
-log4j2.appender.rolling.name = RollingFile
-log4j2.appender.rolling.fileName = ${karaf.data}/log/karaf.log
-log4j2.appender.rolling.filePattern = ${karaf.data}/log/karaf.log.%i
-# uncomment to not force a disk flush
-#log4j2.appender.rolling.immediateFlush = false
-log4j2.appender.rolling.append = true
-log4j2.appender.rolling.layout.type = PatternLayout
-log4j2.appender.rolling.layout.pattern = ${log4j2.pattern}
-log4j2.appender.rolling.policies.type = Policies
-log4j2.appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.rolling.policies.size.size = 16MB
-
-# Audit file appender
-log4j2.appender.audit.type = RollingRandomAccessFile
-log4j2.appender.audit.name = AuditRollingFile
-log4j2.appender.audit.fileName = ${karaf.data}/security/audit.log
-log4j2.appender.audit.filePattern = ${karaf.data}/security/audit.log.%i
-log4j2.appender.audit.append = true
-log4j2.appender.audit.layout.type = PatternLayout
-log4j2.appender.audit.layout.pattern = ${log4j2.pattern}
-log4j2.appender.audit.policies.type = Policies
-log4j2.appender.audit.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.audit.policies.size.size = 8MB
-
-# OSGi appender
-log4j2.appender.osgi.type = PaxOsgi
-log4j2.appender.osgi.name = PaxOsgi
-log4j2.appender.osgi.filter = *
-
-
-# help with identification of maven-related problems with pax-url-aether
-#log4j2.logger.aether.name = shaded.org.eclipse.aether
-#log4j2.logger.aether.level = TRACE
-#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
-#log4j2.logger.http-headers.level = DEBUG
-#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
-#log4j2.logger.maven.level = TRACE
diff --git a/odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh b/odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh
deleted file mode 100644 (file)
index 603a3b4..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : CCSDK
-# ================================================================================
-# Copyright (C) 2018 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}
-if [ ! -f ${ODL_HOME}/etc/host.key ]
-then
-       echo "Installing karaf host key"
-       umask 022
-    mv ${ODL_HOME}/etc/org.apache.karaf.shell.cfg ${ODL_HOME}/etc/org.apache.karaf.shell.cfg.sav
-    cat ${ODL_HOME}/etc/org.apache.karaf.shell.cfg.sav | sed -e "s/hostKeyFormat = simple/hostKeyFormat = PEM/" > ${ODL_HOME}/etc/org.apache.karaf.shell.cfg
-    openssl genrsa -out /opt/opendaylight/current/etc/host.key 4096
-fi
\ No newline at end of file
diff --git a/odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh b/odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh
deleted file mode 100644 (file)
index efd7fe0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/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=========================================================
-###
-
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
-
-SDNC_DB_USER=${SDNC_DB_USER:-sdnctl}
-SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma}
-SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl}
-
-
-# Create tablespace and user account
-mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql <<-END
-CREATE DATABASE ${SDNC_DB_DATABASE};
-CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}';
-CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}';
-GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION;
-commit;
-END
-
-if [ -f ${CCSDK_HOME}/data/odlsli.dump ]
-then
-mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump
-fi
diff --git a/odlsli/odlsli-alpine/src/main/scripts/startODL.sh b/odlsli/odlsli-alpine/src/main/scripts/startODL.sh
deleted file mode 100644 (file)
index 4d60857..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/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=========================================================
-###
-
-
-# Install SDN-C platform components if not already installed and start container
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
-INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
-
-
-#
-# Wait for database
-#
-echo "Waiting for mysql"
-until mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-echo -e "\nmysql ready"
-
-if [ ! -d ${INSTALLED_DIR} ]
-then
-    mkdir -p ${INSTALLED_DIR}
-fi
-
-if [ ! -f ${INSTALLED_DIR}/.installed ]
-then
-    echo "Installing SDN-C database"
-    ${CCSDK_HOME}/bin/installSdncDb.sh
-    # echo "Installing OpenDaylight host key"
-    # ${CCSDK_HOME}/bin/installOdlHostKey.sh
-    if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ]
-    then
-        echo "Installing directed graphs"
-        ${CCSDK_HOME}/svclogic/bin/install.sh
-    fi
-    echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
-fi
-
-exec ${ODL_HOME}/bin/karaf server
diff --git a/odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks b/odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks
deleted file mode 100755 (executable)
index 28afd8f..0000000
Binary files a/odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks and /dev/null differ
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
deleted file mode 100644 (file)
index 270902a..0000000
+++ /dev/null
@@ -1,588 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.5.1-SNAPSHOT</version>
-               <relativePath/>
-       </parent>
-
-       <groupId>org.onap.ccsdk.distribution</groupId>
-       <artifactId>distribution-odlsli-ubuntu</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>ccsdk-distribution :: odlsli-ubuntu</name>
-       <description>Creates Ubuntu-based ODLSLI  Docker container</description>
-       <organization>
-               <name>openECOMP</name>
-       </organization>
-
-       <properties>
-           <base.image.name>onap/ccsdk-odl-fluorine-ubuntu-image</base.image.name>
-               <image.name>onap/ccsdk-odlsli-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.features.version>0.6.0</ccsdk.features.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-               <opendaylight.root>opt/opendaylight</opendaylight.root>
-               <docker.push.phase>deploy</docker.push.phase>
-               <docker.verbose>true</docker.verbose>
-               <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-               <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra>
-               <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
-               <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-
-               <ccsdk.sli.core.version>0.6.0</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.6.0</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.6.0</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.6.0</ccsdk.sli.plugins.version>
-       </properties>
-
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>dependencies</artifactId>
-                       <version>${project.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>dblib-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>filters-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sli-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sliapi-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>sliPluginUtils-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>utils-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.core</groupId>
-                       <artifactId>slicore-features-installer</artifactId>
-                       <version>${ccsdk.sli.core.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>aai-service-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-        <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>ansible-adapter-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>base-http-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>mdsal-resource-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
-                       <artifactId>publisher.installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>netbox-client-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>resource-assignment-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>saltstack-adapter-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>sql-resource-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                       <artifactId>sliadaptors-features-installer</artifactId>
-                       <version>${ccsdk.sli.adaptors.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>asdcApi-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>dataChange-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>lcm-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.northbound</groupId>
-                       <artifactId>slinorthbound-features-installer</artifactId>
-                       <version>${ccsdk.sli.northbound.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>properties-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restapi-call-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>template-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>restconf-client-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>sshapi-call-node-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                       <artifactId>sliplugins-features-installer</artifactId>
-                       <version>${ccsdk.sli.plugins.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>features-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>blueprints-processor-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-                       <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features</groupId>
-                       <artifactId>aafshiro-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-      <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-      <artifactId>sdnr-northbound-features-installer</artifactId>
-      <version>${ccsdk.features.version}</version>
-      <classifier>repo</classifier>
-      <type>zip</type>
-    </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-                       <artifactId>oofpcipoc-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-                       <artifactId>a1Adapter-installer</artifactId>
-                       <version>${ccsdk.features.version}</version>
-                       <classifier>repo</classifier>
-                       <type>zip</type>
-               </dependency>
-       </dependencies>
-
-       <build>
-       <extensions>
-               <extension>
-                       <!-- this extension is required by wagon in order to pass the proxy -->
-                       <groupId>org.apache.maven.wagon</groupId>
-                       <artifactId>wagon-http-lightweight</artifactId>
-                       <version>2.2</version>
-               </extension>
-       </extensions>
-               <plugins>
-
-
-                       <plugin>
-                               <groupId>org.codehaus.groovy.maven</groupId>
-                               <artifactId>gmaven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>validate</phase>
-                                               <goals>
-                                                       <goal>execute</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-
-
-                       <plugin>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dockerfile</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>src/main/docker</directory>
-                                                                       <includes>
-                                                                               <include>Dockerfile</include>
-                                                                       </includes>
-                                                                       <filtering>true</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>copy-scripts</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/scripts</directory>
-                                                                       <includes>
-                                                                               <include>*.sh</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-
-                                       <execution>
-                                               <id>copy-odl-resources</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>idmlight.db.mv.db</include>
-                                                                               <include>org.ops4j.pax.logging.cfg</include>
-                                                                               <include>install_ccsdk.yml</include>
-                                                                               <include>ansible-sources.list</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-config</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>org.ops4j.pax.logging.cfg</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-data</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/resources</directory>
-                                                                       <includes>
-                                                                               <include>*.dump</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-properties</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/properties</directory>
-                                                                       <includes>
-                                                                               <include>*.properties</include>
-                                                                               <include>*.vt</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy-keystores</id>
-                                               <goals>
-                                                       <goal>copy-resources</goal>
-                                               </goals><!-- here the phase you need -->
-                                               <phase>validate</phase>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
-                                                       <resources>
-                                                               <resource>
-                                                                       <directory>../src/main/stores</directory>
-                                                                       <includes>
-                                                                               <include>*.jks</include>
-                                                                       </includes>
-                                                                       <filtering>false</filtering>
-                                                               </resource>
-                                                       </resources>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>3.0.2</version>
-                               <executions>
-                                       <execution>
-                                               <id>unpack features</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>unpack-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                       <excludeTransitive>true</excludeTransitive>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>unpack dgs</id>
-                                               <phase>generate-sources</phase>
-                                               <goals>
-                                                       <goal>unpack</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>${project.groupId}</groupId>
-                                                                       <artifactId>platform-logic-installer</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>zip</type>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>exec-maven-plugin</artifactId>
-                               <version>1.5.0</version>
-                               <executions>
-
-                                       <execution>
-                                               <id>change shell permissions</id>
-                                               <phase>process-sources</phase>
-                                               <goals>
-                                                       <goal>exec</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <executable>/usr/bin/find</executable>
-                                                       <arguments>
-                                                               <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                                               <argument>-name</argument>
-                                                               <argument>*.sh</argument>
-                                                               <argument>-exec</argument>
-                                                               <argument>chmod</argument>
-                                                               <argument>+x</argument>
-                                                               <argument>{}</argument>
-                                                               <argument>;</argument>
-                                                       </arguments>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-
-               </plugins>
-       </build>
-
-       <profiles>
-               <profile>
-                       <id>docker</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>io.fabric8</groupId>
-                                               <artifactId>docker-maven-plugin</artifactId>
-                                               <version>0.16.5</version>
-                                               <inherited>false</inherited>
-                                               <configuration>
-                                                       <images>
-                                                               <image>
-                                                                       <name>${image.name}</name>
-                                                                       <build>
-                                                                               <cleanup>try</cleanup>
-                                                                               <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                                                               <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
-                                                                               <tags>
-                                                                                       <tag>${project.docker.latestminortag.version}</tag>
-                                                                                       <tag>${project.docker.latestfulltag.version}</tag>
-                                                                                       <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                                                               </tags>
-                                                                       </build>
-                                                               </image>
-                                                       </images>
-                                               </configuration>
-                                               <executions>
-                                                       <execution>
-                                                               <id>generate-images</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>build</goal>
-                                                               </goals>
-                                                       </execution>
-
-                                                       <execution>
-                                                               <id>push-images</id>
-                                                               <phase>${docker.push.phase}</phase>
-                                                               <goals>
-                                                                       <goal>build</goal>
-                                                                       <goal>push</goal>
-                                                               </goals>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile
deleted file mode 100644 (file)
index 546b4f3..0000000
--- a/