From: Sam Hague <shague@redhat.com>
Date: Mon, 21 Dec 2015 14:10:32 +0000 (-0500)
Subject: Add controller target to log output for NetvirtIT
X-Git-Tag: release/beryllium-sr2~193
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f523eed0a55eefe1c74f3ddaae423fd273ae7ee2;p=netvirt.git

Add controller target to log output for NetvirtIT

Change-Id: I9646c16e05cc90050ef0efaff398b192efb367e6
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 9481b45576..2bef4e5279 100644
--- 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
@@ -377,7 +377,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         Assert.assertNotNull("Failed to get controller target", controllerTarget);
 
         for (int i = 0; i < 10; i++) {
-            LOG.info("isControllerConnected try {}: looking for controller", i);
+            LOG.info("isControllerConnected try {}: looking for controller: {}", i, controllerTarget);
             OvsdbBridgeAugmentation bridge =
                     southboundUtils.getBridge(connectionInfo, NetvirtITConstants.INTEGRATION_BRIDGE_NAME);
             Assert.assertNotNull(bridge);
@@ -391,7 +391,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
             }
             Thread.sleep(1000);
         }
-        LOG.info("isControllerConnected exit: {}", connected);
+        LOG.info("isControllerConnected exit: {} - {}", connected, controllerTarget);
         return connected;
     }
 
@@ -436,6 +436,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         Node ovsdbNode = connectOvsdbNode(connectionInfo);
         LOG.info("testNetVirt: should be connected");
 
+        //TODO use controller value rather that ovsdb connectionInfo or change log
         assertTrue("Controller " + SouthboundUtils.connectionInfoToString(connectionInfo)
                 + " is not connected", isControllerConnected(connectionInfo));