Bug 1764 - fixed features configuration for os-switch-config-pusher

Change-Id: Iaa1d0af3b2b8d5f5e9ec3ea8ef535ce084922155
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 4856627735b7e87880819744c8afa3f39dd2fa50..4a3cd5c89c3c1bf70f01c9a89c3c31f904b6ce65 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -52,9 +52,7 @@
         <bundle>mvn:org.opendaylight.openflowplugin.applications/table-miss-enforcer/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/69-table-miss-enforcer.xml">mvn:org.opendaylight.openflowplugin.applications/table-miss-enforcer/${project.version}/xml/config</configfile>
 
-<!--
         <bundle>mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/70-of-switch-config-pusher.xml">mvn:org.opendaylight.openflowplugin.applications/of-switch-config-pusher/${project.version}/xml/config</configfile>
--->
     </feature>
 </features>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
index 49d2db3c173c80751a814e2b4063d83071d09b17..9091ca430bdb3382e0deb847ed5ae53bdf278795 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/SalIntegrationTest.java
@@ -65,7 +65,7 @@ public class SalIntegrationTest {
      * @return timeout for case of failure
      */
     private static long getFailSafeTimeout() {
-        return 20000;
+        return 30000;
     }
     
     /**
@@ -75,7 +75,7 @@ public class SalIntegrationTest {
     @Before
     public void setUp() throws InterruptedException {
         //FIXME: plugin should provide service exposing startup result via future 
-        Thread.sleep(5000);
+        Thread.sleep(6000);
     }
     
     /**