Merge "add ovsdb-sfc feature to test feature"

diff --git a/openstack/net-virt-sfc/features/test/src/main/features/features.xml b/openstack/net-virt-sfc/features/test/src/main/features/features.xml
index ebeccf7897171ca5933606c55a56316753ba7af2..224fc9bb08cb1b78728368a7ed14e95cba57f06a 100644 (file)
--- a/openstack/net-virt-sfc/features/test/src/main/features/features.xml
+++ b/openstack/net-virt-sfc/features/test/src/main/features/features.xml
@@ -15,5 +15,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/${project.version}</bundle>
     <feature version='${project.version}'>odl-ovsdb-southbound-impl-ui</feature>
+    <feature version='${project.version}'>odl-ovsdb-sfc-ui</feature>
   </feature>
 </features>

diff --git a/openstack/net-virt-sfc/it/pom.xml b/openstack/net-virt-sfc/it/pom.xml
index 386fbe551e552b42f45491c50a03d665ec27fbb3..bb8fc92fbbeb101ec4339e163554b4358561769f 100644 (file)
--- a/openstack/net-virt-sfc/it/pom.xml
+++ b/openstack/net-virt-sfc/it/pom.xml
@@ -46,7 +46,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>openstack.net-virt-sfc-features</artifactId>
+      <artifactId>openstack.net-virt-sfc-features-test</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java
index f850c1b9933c22ba9767d29e7f7cb29639ddfc31..9eef40d7af711119b5f4916ecadeaf123f84526e 100644 (file)
--- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java
+++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/NetvirtSfcIT.java
@@ -105,7 +105,7 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase {
     public MavenUrlReference getFeatureRepo() {
         return maven()
                 .groupId("org.opendaylight.ovsdb")
-                .artifactId("openstack.net-virt-sfc-features")
+                .artifactId("openstack.net-virt-sfc-features-test")
                 .classifier("features")
                 .type("xml")
                 .versionAsInProject();
@@ -113,7 +113,7 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-ovsdb-sfc-ui";
+        return "odl-ovsdb-sfc-test";
     }
 
     @Configuration