commit 4eaab99f9ef61653e3cf3e13485fd9b1e3a10fde
author Pavlin Radoslavov <pavlin@onlab.us> Thu Jul 03 18:39:42 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Jul 08 14:23:51 2014 -0700
tree 928d2fb687aca1102b98b2801356c3ba0b3d94e4
parent 4d23829c127b9f6e39633e027d9367fb9d609e35

* Added a new class TopologyEvents that encapsulated the collections
  of all possible topology-related events.
* Updated the ITopologyListener API to use the new class TopologyEvents
* Updated the code that is affected by the ITopologyListener API change.

Change-Id: Ib836141d6a21e5317d645619eb685ff0b13788a2

src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java

diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
index 76af2ec..a5b8816 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/UseCaseTest.java
@@ -37,6 +37,7 @@
 import net.onrc.onos.core.topology.PortEvent;
 import net.onrc.onos.core.topology.SwitchEvent;
 import net.onrc.onos.core.topology.Topology;
+import net.onrc.onos.core.topology.TopologyEvents;
 
 import org.junit.After;
 import org.junit.Before;
@@ -231,6 +232,7 @@
         List<LinkEvent> removedLinkEvents = new LinkedList<>();
         List<DeviceEvent> addedDeviceEvents = new LinkedList<>();
         List<DeviceEvent> removedDeviceEvents = new LinkedList<>();
+        TopologyEvents topologyEvents;
 
         // create shortest path intents
         IntentOperationList opList = new IntentOperationList();
@@ -272,15 +274,18 @@
         removedLinkEvents.clear();
         removedLinkEvents.add(linkEvent1);
         removedLinkEvents.add(linkEvent2);
-        runtime1.topologyEvents(
-                addedSwitchEvents,
-                removedSwitchEvents,
-                addedPortEvents,
-                removedPortEvents,
-                addedLinkEvents,
-                removedLinkEvents,
-                addedDeviceEvents,
-                removedDeviceEvents);
+
+        topologyEvents = new TopologyEvents(0,
+                                            addedSwitchEvents,
+                                            removedSwitchEvents,
+                                            addedPortEvents,
+                                            removedPortEvents,
+                                            addedLinkEvents,
+                                            removedLinkEvents,
+                                            addedDeviceEvents,
+                                            removedDeviceEvents);
+
+        runtime1.topologyEvents(topologyEvents);
         System.out.println("*** Link goes down. ***");
 
         // send notification
@@ -303,15 +308,18 @@
         addedLinkEvents.clear();
         addedLinkEvents.add(linkEvent1);
         addedLinkEvents.add(linkEvent2);
-        runtime1.topologyEvents(
-                addedSwitchEvents,
-                removedSwitchEvents,
-                addedPortEvents,
-                removedPortEvents,
-                addedLinkEvents,
-                removedLinkEvents,
-                addedDeviceEvents,
-                removedDeviceEvents);
+
+        topologyEvents = new TopologyEvents(0,
+                                            addedSwitchEvents,
+                                            removedSwitchEvents,
+                                            addedPortEvents,
+                                            removedPortEvents,
+                                            addedLinkEvents,
+                                            removedLinkEvents,
+                                            addedDeviceEvents,
+                                            removedDeviceEvents);
+
+        runtime1.topologyEvents(topologyEvents);
         System.out.println("*** Link goes up. ***");
 
         // send notification