* 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
diff --git a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
index 5d4adb8..568b242 100644
--- a/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
+++ b/src/test/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModuleTest.java
@@ -23,6 +23,7 @@
import net.onrc.onos.core.topology.MockTopology;
import net.onrc.onos.core.topology.PortEvent;
import net.onrc.onos.core.topology.SwitchEvent;
+import net.onrc.onos.core.topology.TopologyEvents;
import org.hamcrest.Description;
import org.hamcrest.Factory;
@@ -456,6 +457,7 @@
final List<DeviceEvent> emptyDeviceEvents = new LinkedList<>();
final List<LinkEvent> addedLinkEvents = new LinkedList<>();
final List<LinkEvent> removedLinkEvents = new LinkedList<>();
+ TopologyEvents topologyEvents;
final MockTopology topology = mocks.getTopology();
topology.removeLink(1L, 12L, 2L, 21L); // This link is used by the intent "1"
@@ -464,10 +466,18 @@
LinkEvent linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
removedLinkEvents.add(linkEvent1);
removedLinkEvents.add(linkEvent2);
- runtime.topologyEvents(emptySwitchEvents, emptySwitchEvents,
- emptyPortEvents, emptyPortEvents,
- addedLinkEvents, removedLinkEvents,
- emptyDeviceEvents, emptyDeviceEvents);
+
+ topologyEvents = new TopologyEvents(0,
+ emptySwitchEvents,
+ emptySwitchEvents,
+ emptyPortEvents,
+ emptyPortEvents,
+ addedLinkEvents,
+ removedLinkEvents,
+ emptyDeviceEvents,
+ emptyDeviceEvents);
+
+ runtime.topologyEvents(topologyEvents);
// Check the high level intents.
final IntentMap highLevelIntentsAfterReroute = runtime.getHighLevelIntents();
@@ -681,6 +691,7 @@
final List<DeviceEvent> emptyDeviceEvents = new LinkedList<>();
final List<LinkEvent> addedLinkEvents = new LinkedList<>();
final List<LinkEvent> removedLinkEvents = new LinkedList<>();
+ TopologyEvents topologyEvents;
final MockTopology topology = mocks.getTopology();
topology.removeLink(1L, 12L, 2L, 21L); // This link is used by the intent "1"
@@ -689,15 +700,18 @@
final LinkEvent linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
removedLinkEvents.add(linkEvent1);
removedLinkEvents.add(linkEvent2);
- runtime.topologyEvents(
- emptySwitchEvents,
- emptySwitchEvents,
- emptyPortEvents,
- emptyPortEvents,
- addedLinkEvents,
- removedLinkEvents,
- emptyDeviceEvents,
- emptyDeviceEvents);
+
+ topologyEvents = new TopologyEvents(0,
+ emptySwitchEvents,
+ emptySwitchEvents,
+ emptyPortEvents,
+ emptyPortEvents,
+ addedLinkEvents,
+ removedLinkEvents,
+ emptyDeviceEvents,
+ emptyDeviceEvents);
+
+ runtime.topologyEvents(topologyEvents);
// Check the high level intents.
final IntentMap highLevelIntentsAfterReroute = runtime.getHighLevelIntents();
@@ -739,15 +753,18 @@
topology.addBidirectionalLinks(1L, 12L, 2L, 21L); // Restoration of the failure
addedLinkEvents.add(linkEvent1);
addedLinkEvents.add(linkEvent2);
- runtime.topologyEvents(
- emptySwitchEvents,
- emptySwitchEvents,
- emptyPortEvents,
- emptyPortEvents,
- addedLinkEvents,
- removedLinkEvents,
- emptyDeviceEvents,
- emptyDeviceEvents);
+
+ topologyEvents = new TopologyEvents(0,
+ emptySwitchEvents,
+ emptySwitchEvents,
+ emptyPortEvents,
+ emptyPortEvents,
+ addedLinkEvents,
+ removedLinkEvents,
+ emptyDeviceEvents,
+ emptyDeviceEvents);
+
+ runtime.topologyEvents(topologyEvents);
// Check the high level intents.
final IntentMap highLevelIntentsAfterInterrupt = runtime.getHighLevelIntents();
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