Port ODL Oxygen to alpine 78/74678/3
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Fri, 14 Dec 2018 18:00:43 +0000 (13:00 -0500)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Fri, 14 Dec 2018 20:35:39 +0000 (15:35 -0500)
Add new alpine-based images for OpenDaylight Oxygen container.

Change-Id: I49eb198e39a4dd71736175876e2e1af0a85d5228
Issue-ID: CCSDK-841
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
32 files changed:
alpine/pom.xml [new file with mode: 0644]
alpine/src/main/docker/Dockerfile [new file with mode: 0644]
odlsli/odlsli-alpine/pom.xml [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/docker/Dockerfile [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/properties/aaiclient.properties [new file with mode: 0755]
odlsli/odlsli-alpine/src/main/properties/admportal.json [new file with mode: 0755]
odlsli/odlsli-alpine/src/main/properties/admportal.log4js.json [new file with mode: 0755]
odlsli/odlsli-alpine/src/main/properties/dblib.properties [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/properties/mdsal-resource.properties [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/properties/sql-resource.properties [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/properties/svclogic.properties [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/properties/svclogic.properties.sdnctldb01 [new file with mode: 0755]
odlsli/odlsli-alpine/src/main/resources/ansible-sources.list [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/resources/odlsli.dump [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/resources/org.ops4j.pax.logging.cfg [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/scripts/startODL.sh [new file with mode: 0644]
odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks [new file with mode: 0755]
odlsli/odlsli-ubuntu/pom.xml [new file with mode: 0644]
odlsli/odlsli-ubuntu/src/main/docker/Dockerfile [moved from odlsli/src/main/docker/Dockerfile with 97% similarity]
odlsli/pom.xml
odlsli/src/main/resources/odlsli.dump
opendaylight/oxygen/oxygen-alpine/pom.xml [new file with mode: 0644]
opendaylight/oxygen/oxygen-alpine/src/main/docker/Dockerfile [new file with mode: 0644]
opendaylight/oxygen/oxygen-ubuntu/pom.xml [new file with mode: 0644]
opendaylight/oxygen/oxygen-ubuntu/src/main/docker/Dockerfile [moved from opendaylight/oxygen/src/main/docker/Dockerfile with 100% similarity]
opendaylight/oxygen/pom.xml
pom.xml
ubuntu/pom.xml

diff --git a/alpine/pom.xml b/alpine/pom.xml
new file mode 100644 (file)
index 0000000..a60dd1a
--- /dev/null
@@ -0,0 +1,141 @@
+<?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-root</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-alpine</artifactId>
+    <version>0.4.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>
+    </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>
+                                println project.properties['ccsdk.project.version'];
+                                def versionArray;
+                                if ( project.properties['ccsdk.project.version'] != null ) {
+                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                }
+
+                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                } else {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                }
+
+                                println 'New Tag for docker:' +
+                                project.properties['project.docker.latesttag.version'];
+                            </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.26.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.version}</tag>
+                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.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/src/main/docker/Dockerfile b/alpine/src/main/docker/Dockerfile
new file mode 100644 (file)
index 0000000..4bd4d47
--- /dev/null
@@ -0,0 +1,14 @@
+# Base ubuntu with added packages needed for open ecomp
+FROM alpine:3.7
+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}
+
+# Add tools needed for OpenDaylight
+RUN apk update && apk add bash git openjdk8 maven mysql-client nodejs py-pip graphviz unzip rsync
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
new file mode 100644 (file)
index 0000000..c971da2
--- /dev/null
@@ -0,0 +1,531 @@
+<?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.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.distribution</groupId>
+       <artifactId>distribution-odlsli-alpine</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-distribution :: odlsli-alpine</name>
+       <description>Creates SDN Controller Docker container</description>
+       <organization>
+               <name>openECOMP</name>
+       </organization>
+
+       <properties>
+               <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
+               <ccsdk.project.version>${project.version}</ccsdk.project.version>
+               <ccsdk.features.version>${project.version}</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>
+       </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>mdsal-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>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>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>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>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>
+       </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>
+                                                               println project.properties['ccsdk.project.version'];
+                                                               def versionArray;
+                                                               if (project.properties['ccsdk.project.version'] != null ) {
+                                                                   versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                                               }
+
+                                                               if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                                               {
+                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                                               } else {
+                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                                               }
+
+                                                               println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                                                       </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>
+                                                                       </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.version}</tag>
+                                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                                                       <tag>${project.docker.latesttag.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-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
new file mode 100644 (file)
index 0000000..edd1f0f
--- /dev/null
@@ -0,0 +1,53 @@
+# Base ubuntu with added packages needed for open ecomp
+FROM onap/ccsdk-odl-oxygen-alpine-image:${project.version}
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+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 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_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 ANSIBLE_GPG_KEY ${ansible.gpg.key}
+
+# copy the opendaylight credentials
+COPY idmlight.db.mv.db $ODL_HOME/data
+
+
+# copy CCSDK mvn artifacts to ODL repository
+COPY system /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
+
+# 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 cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -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 echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+# Create odl user
+RUN adduser -S odl
+
+# Install ansible
+#COPY ansible-sources.list /etc/apt/sources.list.d
+#RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv ${ANSIBLE_GPG_KEY} && \
+#    gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \
+#    apk update && \
+#    apk add -y ansible
+
+# Install ansible-opendaylight
+#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight
+
+# Copy ccsdk install playbook
+#COPY install_ccsdk.yml /tmp
+
+# Install features in ODL
+#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml
+
+
+# copy deliverables to opt
+COPY opt /opt
+COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg
+
+
+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
new file mode 100755 (executable)
index 0000000..4f27206
--- /dev/null
@@ -0,0 +1,82 @@
+###
+# ============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
new file mode 100755 (executable)
index 0000000..8d567d0
--- /dev/null
@@ -0,0 +1,68 @@
+{
+  "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
new file mode 100755 (executable)
index 0000000..0f41e56
--- /dev/null
@@ -0,0 +1,169 @@
+{ 
+  "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
new file mode 100644 (file)
index 0000000..9506ac8
--- /dev/null
@@ -0,0 +1,38 @@
+###
+# ============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
new file mode 100644 (file)
index 0000000..d853747
--- /dev/null
@@ -0,0 +1,27 @@
+###
+# ============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/sql-resource.properties b/odlsli/odlsli-alpine/src/main/properties/sql-resource.properties
new file mode 100644 (file)
index 0000000..ac32f77
--- /dev/null
@@ -0,0 +1,23 @@
+###
+# ============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
new file mode 100644 (file)
index 0000000..54d667c
--- /dev/null
@@ -0,0 +1,29 @@
+###
+# ============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
new file mode 100755 (executable)
index 0000000..54d667c
--- /dev/null
@@ -0,0 +1,29 @@
+###
+# ============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
new file mode 100644 (file)
index 0000000..7e166f2
--- /dev/null
@@ -0,0 +1,2 @@
+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
new file mode 100644 (file)
index 0000000..c6b359d
Binary files /dev/null and b/odlsli/odlsli-alpine/src/main/resources/idmlight.db.mv.db differ
diff --git a/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml b/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
new file mode 100644 (file)
index 0000000..c478bfe
--- /dev/null
@@ -0,0 +1,15 @@
+---
+- 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
+          - 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
new file mode 100644 (file)
index 0000000..6f8217c
--- /dev/null
@@ -0,0 +1,1416 @@
+-- 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
new file mode 100644 (file)
index 0000000..ee35ef7
--- /dev/null
@@ -0,0 +1,92 @@
+################################################################################
+#
+#    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
new file mode 100644 (file)
index 0000000..603a3b4
--- /dev/null
@@ -0,0 +1,29 @@
+###
+# ============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
new file mode 100644 (file)
index 0000000..efd7fe0
--- /dev/null
@@ -0,0 +1,45 @@
+#!/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
new file mode 100644 (file)
index 0000000..4d60857
--- /dev/null
@@ -0,0 +1,65 @@
+#!/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
new file mode 100755 (executable)
index 0000000..28afd8f
Binary files /dev/null and b/odlsli/odlsli-alpine/src/main/stores/truststore.onap.client.jks differ
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
new file mode 100644 (file)
index 0000000..ba6ad07
--- /dev/null
@@ -0,0 +1,531 @@
+<?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.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.distribution</groupId>
+       <artifactId>distribution-odlsli-ubuntu</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-distribution :: odlsli</name>
+       <description>Creates SDN Controller Docker container</description>
+       <organization>
+               <name>openECOMP</name>
+       </organization>
+
+       <properties>
+               <image.name>onap/ccsdk-odlsli-image</image.name>
+               <ccsdk.project.version>${project.version}</ccsdk.project.version>
+               <ccsdk.features.version>${project.version}</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>
+       </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>mdsal-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>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>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>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>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>
+       </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>
+                                                               println project.properties['ccsdk.project.version'];
+                                                               def versionArray;
+                                                               if (project.properties['ccsdk.project.version'] != null ) {
+                                                                   versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                                               }
+
+                                                               if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                                               {
+                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                                               } else {
+                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                                               }
+
+                                                               println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                                                       </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>
+                                                                       </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.version}</tag>
+                                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                                                                       <tag>${project.docker.latesttag.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>
similarity index 97%
rename from odlsli/src/main/docker/Dockerfile
rename to odlsli/odlsli-ubuntu/src/main/docker/Dockerfile
index 8ba16f0..80cd95b 100644 (file)
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for open ecomp
-FROM onap/ccsdk-odl-oxygen-image:${project.version}
+FROM onap/ccsdk-odl-oxygen-ubuntu-image:${project.version}
 MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight
index 815d1b7..b4ebe1f 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>
-
-       <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
-       </parent>
-
-       <groupId>org.onap.ccsdk.distribution</groupId>
-       <artifactId>distribution-odlsli</artifactId>
-       <version>0.4.0-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>ccsdk-distribution :: odlsli</name>
-       <description>Creates SDN Controller Docker container</description>
-       <organization>
-               <name>openECOMP</name>
-       </organization>
-
-       <properties>
-               <image.name>onap/ccsdk-odlsli-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.features.version>${project.version}</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>
-       </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>mdsal-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>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>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>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>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>
-       </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>
-                                                               println project.properties['ccsdk.project.version'];
-                                                               def versionArray;
-                                                               if (project.properties['ccsdk.project.version'] != null ) {
-                                                                   versionArray = project.properties['ccsdk.project.version'].split('\\.');
-                                                               }
-
-                                                               if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-                                                               {
-                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                                               } else {
-                                                                   project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                                               }
-
-                                                               println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-                                                       </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>
-                                                                       </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.version}</tag>
-                                                                                       <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                                                                       <tag>${project.docker.latesttag.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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-root</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odlsli</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight</name>
+    <description>Creates OpenDaylight container</description>
+
+    <modules>
+           <module>odlsli-ubuntu</module>
+           <module>odlsli-alpine</module>
+    </modules>
 </project>
index 6f8217c..e6b6222 100644 (file)
@@ -865,6 +865,8 @@ CREATE TABLE `SVC_LOGIC` (
   `mode` varchar(5) NOT NULL,
   `active` varchar(1) NOT NULL,
   `graph` longblob,
+  `modified_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `md5sum` varchar(128) DEFAULT NULL,
   PRIMARY KEY (`module`,`rpc`,`version`,`mode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/opendaylight/oxygen/oxygen-alpine/pom.xml b/opendaylight/oxygen/oxygen-alpine/pom.xml
new file mode 100644 (file)
index 0000000..8746f89
--- /dev/null
@@ -0,0 +1,221 @@
+<?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-opendaylight</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-oxygen-alpine</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
+    <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-odl-oxygen-alpine-image</image.name>
+        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.opendaylight.version>0.8.3</ccsdk.opendaylight.version>
+        <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+       <docker.push.phase>deploy</docker.push.phase>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.integration</groupId>
+                <artifactId>karaf</artifactId>
+                <version>${ccsdk.opendaylight.version}</version>
+                <type>tar.gz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${ccsdk.mariadb-connector-java.version}</version>
+                <type>jar</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <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>
+                                println project.properties['ccsdk.project.version'];
+                                def versionArray;
+                                if (project.properties['ccsdk.project.version'] != null ) {
+                                versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                }
+
+                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                {
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                } else {
+                                project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
+                                }
+
+                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>get-odl-distribution</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.integration</groupId>
+                                    <artifactId>karaf</artifactId>
+                                    <version>${ccsdk.opendaylight.version}</version>
+                                    <type>tar.gz</type>
+
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>get-mariadb-connector-jar</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.mariadb.jdbc</groupId>
+                                    <artifactId>mariadb-java-client</artifactId>
+                                    <version>${ccsdk.mariadb-connector-java.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <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.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.version}</tag>
+                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.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/opendaylight/oxygen/oxygen-alpine/src/main/docker/Dockerfile b/opendaylight/oxygen/oxygen-alpine/src/main/docker/Dockerfile
new file mode 100644 (file)
index 0000000..dc7736d
--- /dev/null
@@ -0,0 +1,22 @@
+# Base ubuntu with added packages needed for open ecomp
+FROM onap/ccsdk-alpine-image:${project.version}
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
+ENV ODL_HOME /opt/opendaylight/current
+
+# copy the opendaylight tar and expand
+COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/
+RUN mkdir -p /opt/odl \
+    && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/odl \
+    && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \
+    && mv /opt/odl/karaf-${ccsdk.opendaylight.version} /opt/opendaylight \
+    && ln -s  /opt/opendaylight /opt/opendaylight/karaf-${ccsdk.opendaylight.version} \
+    && ln -s /opt/opendaylight /opt/opendaylight/current
+
+# workaround till we get proxy working
+RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
+COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
+
+# ENTRYPOINT exec /opt/opendaylight/bin/karaf
+EXPOSE 8181
diff --git a/opendaylight/oxygen/oxygen-ubuntu/pom.xml b/opendaylight/oxygen/oxygen-ubuntu/pom.xml
new file mode 100644 (file)
index 0000000..f0b7a00
--- /dev/null
@@ -0,0 +1,221 @@
+<?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-opendaylight</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>distribution-odl-oxygen-ubuntu</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
+    <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
+
+    <properties>
+        <image.name>onap/ccsdk-odl-oxygen-ubuntu-image</image.name>
+        <ccsdk.project.version>${project.version}</ccsdk.project.version>
+        <ccsdk.opendaylight.version>0.8.3</ccsdk.opendaylight.version>
+        <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+       <docker.push.phase>deploy</docker.push.phase>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.integration</groupId>
+                <artifactId>karaf</artifactId>
+                <version>${ccsdk.opendaylight.version}</version>
+                <type>tar.gz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.mariadb.jdbc</groupId>
+                <artifactId>mariadb-java-client</artifactId>
+                <version>${ccsdk.mariadb-connector-java.version}</version>
+                <type>jar</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <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>
+                                println project.properties['ccsdk.project.version'];
+                                def versionArray;
+                                if (project.properties['ccsdk.project.version'] != null ) {
+                                versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                }
+
+                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                {
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                } else {
+                                project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
+                                }
+
+                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>get-odl-distribution</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.opendaylight.integration</groupId>
+                                    <artifactId>karaf</artifactId>
+                                    <version>${ccsdk.opendaylight.version}</version>
+                                    <type>tar.gz</type>
+
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>get-mariadb-connector-jar</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.mariadb.jdbc</groupId>
+                                    <artifactId>mariadb-java-client</artifactId>
+                                    <version>${ccsdk.mariadb-connector-java.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <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.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.version}</tag>
+                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.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>
index 10d06f4..4f057a9 100644 (file)
     <version>0.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
+    <name>ccsdk-distribution :: opendaylight</name>
     <description>Creates OpenDaylight container</description>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 
-    <properties>
-        <image.name>onap/ccsdk-odl-oxygen-image</image.name>
-        <ccsdk.project.version>${project.version}</ccsdk.project.version>
-        <ccsdk.opendaylight.version>0.8.3</ccsdk.opendaylight.version>
-        <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
-        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-       <docker.push.phase>deploy</docker.push.phase>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.integration</groupId>
-                <artifactId>karaf</artifactId>
-                <version>${ccsdk.opendaylight.version}</version>
-                <type>tar.gz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.mariadb.jdbc</groupId>
-                <artifactId>mariadb-java-client</artifactId>
-                <version>${ccsdk.mariadb-connector-java.version}</version>
-                <type>jar</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <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>
-                                println project.properties['ccsdk.project.version'];
-                                def versionArray;
-                                if (project.properties['ccsdk.project.version'] != null ) {
-                                versionArray = project.properties['ccsdk.project.version'].split('\\.');
-                                }
-
-                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-                                {
-                                project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-                                } else {
-                                project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
-                                }
-
-                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>get-odl-distribution</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.opendaylight.integration</groupId>
-                                    <artifactId>karaf</artifactId>
-                                    <version>${ccsdk.opendaylight.version}</version>
-                                    <type>tar.gz</type>
-
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>get-mariadb-connector-jar</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.mariadb.jdbc</groupId>
-                                    <artifactId>mariadb-java-client</artifactId>
-                                    <version>${ccsdk.mariadb-connector-java.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <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.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.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
-                                            <tag>${project.docker.latesttag.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>
+    <modules>
+           <module>oxygen-ubuntu</module>
+           <module>oxygen-alpine</module>
+    </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index c45251b..812dc72 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,54 +1,57 @@
        <?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>
+<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.2.0-SNAPSHOT</version>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
-    <artifactId>distribution-root</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.distribution</groupId>
+       <artifactId>distribution-root</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-    <name>ccsdk-distribution</name>
-    <description>Creates distributuon bundles for CCSDK</description>
+       <name>ccsdk-distribution</name>
+       <description>Creates distributuon bundles for CCSDK</description>
 
-    <modules>
-        <module>platform-logic</module>
-        <module>dependencies</module>
-        <module>ubuntu</module>
-        <module>opendaylight</module>
-        <module>odlsli</module>
-        <module>dgbuilder</module>
-        <module>dgbuilder-docker</module>
-       <module>ansible-server</module>
-    </modules>
+       <modules>
+               <module>platform-logic</module>
+               <module>dependencies</module>
+               <module>alpine</module>
+               <module>ubuntu</module>
+               <module>opendaylight</module>
+               <module>odlsli</module>
+               <module>dgbuilder</module>
+               <module>dgbuilder-docker</module>
+               <module>ansible-server</module>
+       </modules>
 
-    <properties>
-        <application.name>distribution</application.name>
+       <properties>
+               <application.name>distribution</application.name>
 
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <build.number>${maven.build.timestamp}</build.number>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+               <build.number>${maven.build.timestamp}</build.number>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+       </properties>
 
-    <build>
-        <plugins>
-           <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <nexusUrl>https://${onap.nexus.host}</nexusUrl>
-                    <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-                    <serverId>${onap.nexus.staging.server-id}</serverId>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+                                       <serverId>${onap.nexus.staging.server-id}</serverId>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
 </project>
index 9ebc3f1..fb655b0 100644 (file)
@@ -94,7 +94,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.26.0</version>
                         <inherited>false</inherited>
                         <configuration>
 
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
                                             <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use