X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=be951d2db80a893b5b058860003db47e1d6bc12b;hb=3e0ba3015118b87223fdc6d5e876536fd4ac847b;hp=baa3c978c030f90f5a92d5a54ca680e2dff1fab5;hpb=7fd600fe973a184d9755d5606fecff64dd1a4e56;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index baa3c978..be951d2d 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>1.4.2</version>
+        <groupId>org.onap.sdnc.oam</groupId>
+        <artifactId>installation</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc</artifactId>
-    <version>1.7.2-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
         <image.name>onap/sdnc-aaf-image</image.name>
         <standalone.image.name>onap/sdnc-image</standalone.image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.7.2</sdnc.northbound.version>
-        <ccsdk.docker.version>0.6.2</ccsdk.docker.version>
-        <ccsdk.features.version>0.6.2</ccsdk.features.version>
+        <sdnc.northbound.version>2.1.1-SNAPSHOT</sdnc.northbound.version>
+        <ccsdk.docker.version>1.1.1-SNAPSHOT-latest</ccsdk.docker.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
-        <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
+        <sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
-        <docker.verbose>true</docker.verbose>
+        <docker.verbose>true</docker.verbose> 
+        <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>
 
@@ -38,52 +41,29 @@
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>generic-resource-api-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>vnfapi-installer</artifactId>
+            <artifactId>optical-service-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnftools-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>sdnc-northbound-features-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>oofpcipoc-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>sdnr-northbound-features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
             <classifier>repo</classifier>
-            <type>zip</type>
         </dependency>
     </dependencies>
 
@@ -137,6 +117,82 @@
                            </images>
                           </configuration>
                     </execution>
+                    <execution>
+                        <id>start-it-instance</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>mariadb:10.5</name>
+                                    <alias>sdnc-db</alias>
+                                    <run>
+                                        <env>
+                                            <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                            <MYSQL_USER>sdnctl</MYSQL_USER>
+                                            <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
+                                            <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                        </env>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>sdnc</name>
+                                            <alias>dbhost</alias>
+                                            <alias>sdnctldb01</alias>
+                                            <alias>sdnctldb02</alias>
+                                        </network>
+                                        <ports>
+                                            <port>sdncdb.port:3306</port>
+                                        </ports>
+                                        <log>
+                                            <enabled>true</enabled>
+                                        </log>
+                                    </run>
+                                </image>
+                                <image>
+                                    <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
+                                    <alias>sdnc-container</alias>
+                                    <run>
+                                        <env>
+                                            <ODL_ADMIN_PASSWORD>admin</ODL_ADMIN_PASSWORD>
+                                            <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                            <MYSQL_USER>sdnctl</MYSQL_USER>
+                                            <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
+                                            <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                            <SDNC_CONFIG_DIR>/opt/onap/sdnc/data/properties</SDNC_CONFIG_DIR>
+                                            <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
+                                        </env>
+                                        <dependsOn>
+                                            <container>sdnc-db</container>
+                                        </dependsOn>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>sdnc</name>
+                                            <alias>sdnc</alias>
+                                        </network>&gt;
+                                        <ports>
+                                            <port>sdnc.port:8181</port>
+                                        </ports>
+                                        <wait>
+                                            <log>all warp coils are now operating at peak efficiency</log>
+                                            <time>120000</time>
+                                        </wait>
+                                        <log>
+                                            <enabled>true</enabled>
+                                        </log>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-it-instance</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                     <execution>
                       <id>push-images</id>
                       <phase>${docker.push.phase}</phase>
@@ -291,6 +347,7 @@
                                     <directory>src/main/resources</directory>
                                     <includes>
                                         <include>*.dump</include>
+                                        <include>oauth-aaa-app-config.xml</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -396,8 +453,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
                     <execution>
@@ -422,9 +479,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <goals>
+                      <goal>integration-test</goal>
+                      <goal>verify</goal>
+                    </goals>
+                  </execution>
+                </executions>
+                <configuration>
+                  <skipITs>false</skipITs>
+                  <environmentVariables>
+                    <SDNC_PORT>${sdnc.port}</SDNC_PORT>
+                  </environmentVariables>
+                </configuration>
+              </plugin>
         </plugins>
     </build>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>