utils: migrate to the mdsal DataBroker

[ovsdb.git] / utils / ovsdb-it-utils / src / main / java / org / opendaylight / ovsdb / utils / ovsdb / it / utils / NodeInfo.java

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 0950fe6da8a35c2739fadddaa7e2f772e9c95da7..b5d69c3cdaa4ca33c31d62a9b3414afa5c455026 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
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.ovsdb.utils.mdsal.utils.ControllerNotifyingDataChangeListener;
 import org.opendaylight.ovsdb.utils.mdsal.utils.NotifyingDataChangeListener;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
@@ -37,9 +38,9 @@ public class NodeInfo {
     public long datapathId;
     public Node ovsdbNode;
     public Node bridgeNode;
-    private NotifyingDataChangeListener ovsdbWaiter;
-    private NotifyingDataChangeListener bridgeWaiter;
-    private final List<NotifyingDataChangeListener> waitList;
+    private ControllerNotifyingDataChangeListener ovsdbWaiter;
+    private ControllerNotifyingDataChangeListener bridgeWaiter;
+    private final List<ControllerNotifyingDataChangeListener> waitList;
     private final OvsdbItUtils itUtils;
 
     /**
@@ -48,7 +49,8 @@ public class NodeInfo {
      * @param itUtils OvsdbItUtils instance
      * @param waitList for tracking outstanding md-sal events
      */
-    NodeInfo(ConnectionInfo connectionInfo, OvsdbItUtils itUtils, List<NotifyingDataChangeListener> waitList) {
+    NodeInfo(ConnectionInfo connectionInfo, OvsdbItUtils itUtils,
+            List<ControllerNotifyingDataChangeListener> waitList) {
         this.connectionInfo = connectionInfo;
         this.itUtils = itUtils;
         this.waitList = waitList;
@@ -57,11 +59,11 @@ public class NodeInfo {
     }
 
     private void addWaiters() {
-        ovsdbWaiter = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                NotifyingDataChangeListener.BIT_CREATE, ovsdbIid, waitList);
+        ovsdbWaiter = new ControllerNotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL,
+                ControllerNotifyingDataChangeListener.BIT_CREATE, ovsdbIid, waitList);
         ovsdbWaiter.registerDataChangeListener(itUtils.dataBroker);
-        bridgeWaiter = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL,
-                NotifyingDataChangeListener.BIT_CREATE, bridgeIid, waitList);
+        bridgeWaiter = new ControllerNotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL,
+                ControllerNotifyingDataChangeListener.BIT_CREATE, bridgeIid, waitList);
         bridgeWaiter.registerDataChangeListener(itUtils.dataBroker);
     }