Run Pax Exam IT with latest artifacts

This change uses the latest artifacts in the Pax Exam ITs.
Currently, these tests will fail until the both the plugin and
northbound bundles have been migrated to the new library.

Change-Id: Ie8d1d52ca671fb06cebd5799c0462faee5aef2d6
Signed-off-by: Dave Tucker <djt@redhat.com>

diff --git a/.DS_Store b/.DS_Store
new file mode 100644 (file)
index 0000000..4b1bee2
Binary files /dev/null and b/.DS_Store differ

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index 6759320b879cb4023e89ab0a917a50cae605b491..1abbc696d720a91d1443f0f18257bffb9cfc7d36 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -3,18 +3,20 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>commons.ovsdb</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <artifactId>ovsdb_commons</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
-
-  <artifactId>commons.integrationtest</artifactId>
+  <artifactId>ovsdb_commons_integrationtest</artifactId>
   <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
     <exam.version>3.5.0</exam.version>
     <url.version>1.6.0</url.version>
+    <ovsdb.library.version>1.0.0-SNAPSHOT</ovsdb.library.version>
+    <ovsdb.plugin.version>1.0.0-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.northbound.version>0.6.0-SNAPSHOT</ovsdb.northbound.version>
   </properties>
 
   <dependencies>
@@ -62,6 +64,21 @@
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>ovsdb_library</artifactId>
+      <version>${ovsdb.library.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>ovsdb_plugin</artifactId>
+      <version>${ovsdb.plugin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>ovsdb_northbound</artifactId>
+      <version>${ovsdb.northbound.version}</version>
+    </dependency>
     <!-- Add Pax Exam -->
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 94a96efa49a0878abb78492d2eb97e6e7c98dac6..dc45fe46df56626fcd6e4421939b32a45e724075 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.ovsdb</groupId>
-    <artifactId>commons.integrationtest</artifactId>
+    <artifactId>ovsdb_commons_integrationtest</artifactId>
     <version>1.0.1-SNAPSHOT</version>
     <relativePath>../commons/integrationtest</relativePath>
   </parent>
 
-  <artifactId>integrationtest</artifactId>
-  <version>0.5.1-SNAPSHOT</version>
+  <artifactId>ovsdb_integrationtest</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -506,15 +506,6 @@
       <groupId>org.opendaylight.controller.thirdparty</groupId>
       <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb.northbound</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam</artifactId>
@@ -608,13 +599,11 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.yaml</groupId>
       <artifactId>snakeyaml</artifactId>
       <version>1.10</version>
     </dependency>
-
     <!-- Add Pax Exam -->
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
@@ -705,5 +694,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
-
 </project>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
index c14b1efd1cf96d81e6a77c5f28c1bbfffd640fd0..62ae87aa78c1566595ba0c233badfa42a41d5696 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
@@ -147,7 +147,6 @@ public class ConfigurationBundles {
                 mavenBundle("org.opendaylight.controller.thirdparty", "com.sun.jersey.jersey-servlet").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.thirdparty", "net.sf.jung2").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller.thirdparty", "org.apache.catalina.filters.CorsFilter").versionAsInProject().noStart(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb").versionAsInProject(),
                 mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
                 mavenBundle("org.ow2.chameleon.management", "chameleon-mbeans").versionAsInProject(),
                 mavenBundle("org.slf4j", "jcl-over-slf4j").versionAsInProject(),
@@ -185,7 +184,7 @@ public class ConfigurationBundles {
                 mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(),
                 mavenBundle("javax.portlet", "portlet-api").versionAsInProject(),
                 mavenBundle("com.google.guava", "guava").versionAsInProject(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb").versionAsInProject()
+                mavenBundle("org.opendaylight.ovsdb", "ovsdb_library").versionAsInProject()
         );
     }
 

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
index cf79b156477a10b7ddf39b47decb6048929f61a5..9e79b88a6e801c319a14e01bdbe82917cafb3bc8 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/northbound/OvsdbNorthboundIT.java
@@ -290,7 +290,8 @@ public class OvsdbNorthboundIT extends OvsdbIntegrationTestBase {
                 ConfigurationBundles.controllerBundles(),
                 ConfigurationBundles.controllerNorthboundBundles(),
                 ConfigurationBundles.ovsdbLibraryBundles(),
-                mavenBundle("org.opendaylight.ovsdb", "ovsdb.northbound").versionAsInProject(),
+                mavenBundle("org.opendaylight.ovsdb", "ovsdb_plugin").versionAsInProject(),
+                mavenBundle("org.opendaylight.ovsdb", "ovsdb_northbound").versionAsInProject(),
                 junitBundles()
         );
     }

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
index a3c8c77f6c93d9f5a8e7fbea2b3acf0f58a63a61..710527aff05a88671ed5e582aa11ae6ba2648db2 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
@@ -12,6 +12,7 @@ package org.opendaylight.ovsdb.integrationtest.plugin;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.propagateSystemProperty;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -63,6 +64,7 @@ public class OvsdbPluginIT extends OvsdbIntegrationTestBase {
 
             ConfigurationBundles.controllerBundles(),
             ConfigurationBundles.ovsdbLibraryBundles(),
+            mavenBundle("org.opendaylight.ovsdb", "ovsdb_plugin").versionAsInProject(),
             junitBundles()
         );
     }

diff --git a/pom.xml b/pom.xml
index 09dc5dd86be6414efc196dd48a9bf98d2d57e368..c0ced38f082fea21ae1be43033db6a55879cc059 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,20 @@
     <module>northbound</module>
     <module>neutron</module>
     <module>commons/parent</module>
+    <module>commons/integrationtest</module>
     <module>distribution/opendaylight</module>
   </modules>
+  <profiles>
+    <profile>
+      <id>integrationtests</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <modules>
+          <module>integrationtest</module>
+      </modules>
+    </profile>
+  </profiles>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>