add ovsdb-sfc feature to test feature

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

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 135c334ab31c06577f7d974073d9aea58926de8b..43fbb78ef9f7a7774e635453ece2139a7204aaec 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
@@ -177,7 +177,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         return composite(
                 editConfigurationFilePut(NetvirtITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb",
-                        LogLevelOption.LogLevel.TRACE.name()),
+                        LogLevelOption.LogLevel.DEBUG.name()),
                 editConfigurationFilePut(NetvirtITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb.lib",
                         LogLevelOption.LogLevel.INFO.name()),

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/impl/src/main/config/default-config.xml b/openstack/net-virt-sfc/impl/src/main/config/default-config.xml
index 402b72d8828a19334051ebbe07f668fdbcc416ee..6423930f6f34140e173eb9318c5da086ec0077c1 100644 (file)
--- a/openstack/net-virt-sfc/impl/src/main/config/default-config.xml
+++ b/openstack/net-virt-sfc/impl/src/main/config/default-config.xml
@@ -10,6 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <required-capabilities>
     <capability>urn:opendaylight:params:xml:ns:yang:netvirt:sfc?module=netvirt-sfc&amp;revision=2014-12-10</capability>
     <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
+    <capability>urn:opendaylight:params:xml:ns:yang:southbound:impl?module=southbound-impl&amp;revision=2014-12-10</capability>
   </required-capabilities>
   <configuration>
 

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 9b0b2afc23258188563126429e1a89759c3c7b07..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
@@ -196,7 +196,7 @@ public class NetvirtSfcIT extends AbstractMdsalTestBase {
 
     private ProviderContext getProviderContext() {
         ProviderContext providerContext = null;
-        for (int i=0; i < 20; i++) {
+        for (int i=0; i < 60; i++) {
             providerContext = getSession();
             if (providerContext != null) {
                 break;