it-utils should be only included for IT

The it-utils bundle was being included with the odl-ovsdb-openstack
feature. When the feature was installed karaf would error out
looking for org.junit - which is a dependency for it-utils since
that is a test bundle.

Fix: Create a IT feature and include the bundle there and use
that feature for the IT test.

Change-Id: I4fc0395ca177d98b8433857b384cddbc033057fb
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/features/pom.xml b/features/pom.xml
index df01a9c62fd4ec32dd908c520e9e353d75a11cb2..6ffee107554d81a736a5ce3eab677aef2c0cdf9e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -254,6 +254,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>${project.groupId}</groupId>
       <artifactId>utils.it-utils</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 411f0c8ec55b788459c290845c2ea82fd0ed56a1..0409ae52583bf0789a542642f7edf94a375b8563 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -40,7 +40,7 @@
     <bundle>mvn:org.opendaylight.ovsdb/utils.neutron-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/utils.it-utils/{{VERSION}}</bundle>
+
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}</bundle>
     <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
@@ -48,6 +48,12 @@
     <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
   </feature>
 
+  <feature name="odl-ovsdb-openstack-it" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization IT"
+           version='${project.version}'>
+    <feature version="${project.version}">odl-ovsdb-openstack</feature>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.it-utils/{{VERSION}}</bundle>
+  </feature>
+
   <feature name="odl-ovsdb-openstack-clusteraware" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization - Cluster Aware"
            version='${project.version}'>
     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>

diff --git a/openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/NetvirtIT.java b/openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/NetvirtIT.java
index f331c2ba38116d0ecdc1270d0be78a25f28f2d21..d6f60f3cec226cfd5b370f5bc2cd7b1188dc93fb 100644 (file)
--- a/openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/NetvirtIT.java
+++ b/openstack/net-virt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/NetvirtIT.java
@@ -130,7 +130,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-ovsdb-openstack";
+        return "odl-ovsdb-openstack-it";
     }
 
     @Configuration