Remove redudnant calls for bridge updates

Change-Id: I34ed01cbdf870351707bb6daf990a5fc88609027
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NotifyingDataChangeListener.java b/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NotifyingDataChangeListener.java
index 2bf689a556852cddaefa1d7589a6d798df6df7e3..5e408e7bc0aaf81e6e83373a58a9a6eaf5b09166 100644 (file)
--- a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NotifyingDataChangeListener.java
+++ b/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NotifyingDataChangeListener.java
@@ -35,7 +35,7 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
     private final Set<InstanceIdentifier<?>> updatedIids = new HashSet<>();
     private InstanceIdentifier<?> iid;
     private final int RETRY_WAIT = 100;
-    private final int MDSAL_TIMEOUT = 1000;
+    private final int MDSAL_TIMEOUT = 10000;
     private ListenerRegistration<?> listenerRegistration;
     private List<NotifyingDataChangeListener> waitList = null;
 

diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java
index 1d30cbe66a15636a2865b9f65367fda3028bdc7a..81172360e93ddb468d253fbf96c04b217e94ff7e 100644 (file)
--- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java
+++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/NodeInfo.java
@@ -92,12 +92,10 @@ public class NodeInfo {
      */
     public void disconnect() throws InterruptedException {
         assertTrue(itUtils.southboundUtils.deleteBridge(connectionInfo, INTEGRATION_BRIDGE_NAME, 0));
-        itUtils.southboundUtils.deleteBridge(connectionInfo, INTEGRATION_BRIDGE_NAME, 0);
         bridgeWaiter.waitForDeletion();
         Node bridgeNode = itUtils.mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, bridgeIid);
         assertNull("Bridge should not be found", bridgeNode);
         assertTrue(itUtils.southboundUtils.disconnectOvsdbNode(connectionInfo, 0));
-        itUtils.southboundUtils.disconnectOvsdbNode(connectionInfo, 0);
         ovsdbWaiter.waitForDeletion();
         Node ovsdbNode = itUtils.mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, ovsdbIid);
         assertNull("Ovsdb node should not be found", ovsdbNode);