From d4a7658f72decfef05d15973d5cee13910eb47ae Mon Sep 17 00:00:00 2001
From: Kailun Qin <kailun.qin@intel.com>
Date: Tue, 27 Mar 2018 18:23:01 +0800
Subject: Port nfvo/vnf_functest for framework merge

Merged VNF onboarding test functions and frameworks locating separately
in nfvo/vnf_functest and vnfsdk/vnf-sdk-function-test seed code.
1) Reconstructed by aligning with the original interface and sequence design;
2) Replaced Restful calls with local invokes;
3) Implemented DB support (PostgreSQL) for persistent recording;
4) Added unit tests associated;
5) Unified package names to "onap";
6) Fixed several inherent issues.

Issue-ID: VNFSDK-178
Change-Id: I2147c5df8dd400adef71dafca9073b12d992d2df
Signed-off-by: Kailun Qin <kailun.qin@intel.com>
---
 vnf-sdk-function-test/pom.xml | 87 +++++++++++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 33 deletions(-)

(limited to 'vnf-sdk-function-test/pom.xml')

diff --git a/vnf-sdk-function-test/pom.xml b/vnf-sdk-function-test/pom.xml
index b9c783c..ebd0e7a 100644
--- a/vnf-sdk-function-test/pom.xml
+++ b/vnf-sdk-function-test/pom.xml
@@ -14,13 +14,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
-<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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.openo.vnf-sdk.function-test</groupId>
+        <groupId>org.onap.vnf-sdk.function-test</groupId>
         <artifactId>vnfsdk-functest-core-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -48,7 +48,7 @@
                                     </goals>
                                 </pluginExecutionFilter>
                                 <action>
-                                    <ignore />
+                                    <ignore/>
                                 </action>
                             </pluginExecution>
                         </pluginExecutions>
@@ -69,8 +69,6 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.6</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
                     <archive>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -102,14 +100,12 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
                             <transformers>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.openo.vnfsdk.functest.VnfSdkFuncTestApp</mainClass>
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.onap.vnfsdk.functest.VnfSdkFuncTestApp</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>
@@ -126,16 +122,6 @@
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>io.dropwizard</groupId>
-                                    <artifactId>dropwizard-core</artifactId>
-                                    <version>0.8.0</version>
-                                    <overWrite>true</overWrite>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -146,17 +132,22 @@
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-core</artifactId>
-            <version>0.8.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-assets</artifactId>
-            <version>0.8.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-hibernate</artifactId>
-            <version>0.8.0</version>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-migrations</artifactId>
+            <version>1.2.0</version>
         </dependency>
         <!-- lombok -->
         <dependency>
@@ -203,10 +194,15 @@
             <artifactId>gson</artifactId>
             <version>2.2.4</version>
         </dependency>
+        <!--<dependency>-->
+        <!--<groupId>mysql</groupId>-->
+        <!--<artifactId>mysql-connector-java</artifactId>-->
+        <!--<version>5.1.18</version>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.18</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.1.4</version>
         </dependency>
         <!-- UT -->
         <dependency>
@@ -215,6 +211,13 @@
             <version>4.10</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/io.dropwizard/dropwizard-testing -->
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-testing</artifactId>
+            <version>1.2.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
@@ -239,6 +242,13 @@
             <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.8.0</version>
+            <scope>test</scope>
+        </dependency>
         <!-- UT end -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -246,10 +256,21 @@
             <version>1.9.5</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jmockit/jmockit -->
-		<dependency>
-    		<groupId>org.jmockit</groupId>
-    		<artifactId>jmockit</artifactId>
-    		<version>1.19</version>
-		</dependency>	        
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>1.19</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.activation/activation -->
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
     </dependencies>
 </project>
-- 
cgit 1.2.3-korg