Add working integration-test

[ovsdb.git] / openstack / netvirt-it / src / test / java / org / opendaylight / ovsdb / openstack / netvirt / it / AbstractMdsalTestBase.java

diff --git a/openstack/netvirt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractMdsalTestBase.java b/openstack/netvirt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractMdsalTestBase.java
index d0226d1f258ca766a34d621aca442937bb722fc4..ae4e7e4c1b6db16fba613e06318c21dc8b353847 100644 (file)
--- a/openstack/netvirt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractMdsalTestBase.java
+++ b/openstack/netvirt-it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/it/AbstractMdsalTestBase.java
@@ -28,7 +28,7 @@ public abstract class AbstractMdsalTestBase extends AbstractConfigTestBase imple
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractMdsalTestBase.class);
     private static final int REGISTRATION_TIMEOUT = 10000;
-    @Inject @Filter(timeout = 240000)
+    @Inject @Filter(timeout = 60000)
     private BindingAwareBroker broker;
     private ProviderContext session = null;
 
@@ -63,11 +63,11 @@ public abstract class AbstractMdsalTestBase extends AbstractConfigTestBase imple
     @Override
     public Option[] getLoggingOptions() {
         Option[] options = new Option[] {
-                editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+                editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         logConfiguration(AbstractMdsalTestBase.class),
                         LogLevel.INFO.name()),
         };
-        options = ObjectArrays.concat(options, super.getLoggingOptions(),Option.class);
+        options = ObjectArrays.concat(options, super.getLoggingOptions(), Option.class);
         return options;
     }