Fix SouthboundIT by disconnecting after each test

SouthboundIT requires disconnection from OVSDB after each test.

Change-Id: Ifb916f103e94d53049f684a64b87c0ed1fc2efd6
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

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 7314826af263a45e39b27c182879c624b272cd76..3140beb184ba038639362a54f395017ae2d40a97 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
@@ -557,6 +557,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -598,6 +599,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -642,6 +644,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -687,6 +690,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -732,6 +736,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -780,6 +785,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -825,6 +831,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -862,14 +869,15 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
         }
         Assert.assertTrue(deleteBridge(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
     public void testTerminationPointVlanModes() throws InterruptedException {
+        ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
+        connectOvsdbNode(connectionInfo);
         VlanMode []vlanModes = VlanMode.values();
         for (VlanMode vlanMode : vlanModes) {
-            ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
-            connectOvsdbNode(connectionInfo);
             Assert.assertTrue(addBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME));
             OvsdbBridgeAugmentation bridge = getBridge(connectionInfo);
             Assert.assertNotNull(bridge);
@@ -897,6 +905,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
             Assert.assertTrue(deleteBridge(connectionInfo));
         }
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     private ArrayList<Set<Integer>> generateVlanSets() {
@@ -938,12 +947,12 @@ public class SouthboundIT extends AbstractMdsalTestBase {
 
     @Test
     public void testTerminationPointVlanTrunks() throws InterruptedException {
+        ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
+        connectOvsdbNode(connectionInfo);
         ArrayList<Set<Integer>> vlanSets = generateVlanSets();
         int testCase = 0;
         for (Set<Integer> vlanSet : vlanSets) {
             ++testCase;
-            ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
-            connectOvsdbNode(connectionInfo);
             Assert.assertTrue(addBridge(connectionInfo, SouthboundITConstants.BRIDGE_NAME));
             OvsdbBridgeAugmentation bridge = getBridge(connectionInfo);
             Assert.assertNotNull(bridge);
@@ -974,6 +983,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             }
             Assert.assertTrue(deleteBridge(connectionInfo));
         }
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test