Infra for running ovs dockers

[ovsdb.git] / utils / mdsal-utils / src / main / java / org / opendaylight / ovsdb / utils / mdsal / utils / NotifyingDataChangeListener.java

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 5e408e7bc0aaf81e6e83373a58a9a6eaf5b09166..10fd0039d081c2525e714b08b0b9055859b0f616 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
@@ -34,10 +34,12 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
     private final Set<InstanceIdentifier<?>> removedIids = new HashSet<>();
     private final Set<InstanceIdentifier<?>> updatedIids = new HashSet<>();
     private InstanceIdentifier<?> iid;
-    private final int RETRY_WAIT = 100;
-    private final int MDSAL_TIMEOUT = 10000;
+    private final static int RETRY_WAIT = 100;
+    private final static int MDSAL_TIMEOUT_OPERATIONAL = 10000;
+    private final static int MDSAL_TIMEOUT_CONFIG = 1000;
     private ListenerRegistration<?> listenerRegistration;
     private List<NotifyingDataChangeListener> waitList = null;
+    private int mdsalTimeout = MDSAL_TIMEOUT_OPERATIONAL;
 
     /**
      * Create a new NotifyingDataChangeListener
@@ -53,6 +55,11 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
         if(this.waitList != null) {
             this.waitList.add(this);
         }
+
+        mdsalTimeout = MDSAL_TIMEOUT_OPERATIONAL;
+        if (type == LogicalDatastoreType.CONFIGURATION) {
+            mdsalTimeout = MDSAL_TIMEOUT_CONFIG;
+        }
     }
 
     /**
@@ -106,7 +113,7 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
     }
 
     public void waitForCreation() throws InterruptedException {
-        waitForCreation(MDSAL_TIMEOUT);
+        waitForCreation(mdsalTimeout);
     }
 
     public void waitForCreation(long timeout) throws InterruptedException {
@@ -121,7 +128,7 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
     }
 
     public void waitForUpdate() throws InterruptedException {
-        waitForUpdate(MDSAL_TIMEOUT);
+        waitForUpdate(mdsalTimeout);
     }
 
     public void waitForUpdate(long timeout) throws InterruptedException {
@@ -136,7 +143,7 @@ public class NotifyingDataChangeListener implements AutoCloseable, DataChangeLis
     }
 
     public void waitForDeletion() throws InterruptedException {
-        waitForDeletion(MDSAL_TIMEOUT);
+        waitForDeletion(mdsalTimeout);
     }
 
     public void waitForDeletion(long timeout) throws InterruptedException {