Merge branch 'master' into topic/netvirtsb_merge

[ovsdb.git] / southbound / southbound-it / src / test / java / org / opendaylight / ovsdb / southbound / it / SouthboundIT.java

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 41c1a5df86850b583fb87fa182ab3d981f2f4e17..ead70f0af18afb162760c986cbacb2a7b2e8a249 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
@@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ObjectArrays;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -180,12 +179,12 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     @Override
     public Option[] getLoggingOptions(final boolean extras) {
         Option[] options = new Option[] {
-                /*editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
-                        "log4j.logger.org.opendaylight.ovsdb",
-                        LogLevelOption.LogLevel.DEBUG.name()),*/
                 editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
+                        "log4j.logger.org.opendaylight.ovsdb",
+                        LogLevelOption.LogLevel.DEBUG.name()),
+                /*editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb.southbound-impl",
-                        LogLevelOption.LogLevel.DEBUG.name())
+                        LogLevelOption.LogLevel.DEBUG.name())*/
         };
 
         if (extras == true) {
@@ -194,8 +193,11 @@ public class SouthboundIT extends AbstractMdsalTestBase {
                         "log4j.logger.org.opendaylight.ovsdb",
                         LogLevelOption.LogLevel.DEBUG.name()),
                 editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
+                        "log4j.logger.org.opendaylight.ovsdb.lib",
+                        LogLevelOption.LogLevel.TRACE.name()),
+                /*editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb.openstack.net-virt",
-                        LogLevelOption.LogLevel.DEBUG.name())
+                        LogLevelOption.LogLevel.DEBUG.name())*/
             };
             options = ObjectArrays.concat(options, extraOptions, Option.class);
         }
@@ -232,7 +234,6 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         return options;
     }
 
-
     public boolean setExtras() {
         Properties props = new Properties(System.getProperties());
         boolean extras = props.getProperty(SouthboundITConstants.SERVER_EXTRAS,
@@ -1549,4 +1550,15 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
     }
-}
\ No newline at end of file
+
+    @Test
+    public void testNetVirt() throws InterruptedException {
+        ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
+        connectOvsdbNode(connectionInfo);
+
+        LOG.info(">>>>> waiting");
+        Thread.sleep(10000);
+        LOG.info(">>>>> back");
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
+    }
+}