commit 7d3cee0f06c3a0408d5d8abcb1007600803bcee6
author Toshio Koide <t-koide@onlab.us> Thu Jun 05 18:56:19 2014 -0700
committer Toshio Koide <t-koide@onlab.us> Fri Jun 06 18:34:28 2014 -0700
tree 848e45eddb63c15009d90ee46d343360228406c6
parent a41366d068676d7fe4db8acb07a772956c121332

Suppress unnecessary PathIntent operations when rerouting

Change-Id: If06fc6937d5a69f4f5ff829dbff5103b0fa1736d

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 30e2845..bd42884 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
@@ -15,7 +15,6 @@
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.FloodlightModuleException;
 import net.floodlightcontroller.restserver.IRestApiService;
-
 import net.onrc.onos.core.datagrid.IDatagridService;
 import net.onrc.onos.core.datagrid.IEventChannel;
 import net.onrc.onos.core.datagrid.IEventChannelListener;
@@ -274,10 +273,51 @@
                 removedLinkEvents,
                 addedDeviceEvents,
                 removedDeviceEvents);
-        System.out.println("Link goes down.");
+        System.out.println("*** Link goes down. ***");
+
+        // send notification
+        IntentStateList isl = new IntentStateList();
+        isl.put("1___0", IntentState.DEL_ACK);
+        isl.put("1___1", IntentState.INST_ACK);
+        isl.domainSwitchDpids.add(1L);
+        isl.domainSwitchDpids.add(2L);
+        isl.domainSwitchDpids.add(4L);
+        runtime1.entryUpdated(isl);
 
         // show results step2
         showResult((PathIntentMap) runtime1.getPathIntents());
+
+        // link up
+        ((MockTopology) topology).addBidirectionalLinks(1L, 12L, 2L, 21L);
+        linkEvent1 = new LinkEvent(1L, 12L, 2L, 21L);
+        linkEvent2 = new LinkEvent(2L, 21L, 1L, 12L);
+        removedLinkEvents.clear();
+        addedLinkEvents.clear();
+        addedLinkEvents.add(linkEvent1);
+        addedLinkEvents.add(linkEvent2);
+        runtime1.topologyEvents(
+                addedSwitchEvents,
+                removedSwitchEvents,
+                addedPortEvents,
+                removedPortEvents,
+                addedLinkEvents,
+                removedLinkEvents,
+                addedDeviceEvents,
+                removedDeviceEvents);
+        System.out.println("*** Link goes up. ***");
+
+        // send notification
+        isl = new IntentStateList();
+        isl.put("1___1", IntentState.DEL_ACK);
+        isl.put("1___2", IntentState.INST_ACK);
+        isl.domainSwitchDpids.add(1L);
+        isl.domainSwitchDpids.add(2L);
+        isl.domainSwitchDpids.add(4L);
+        runtime1.entryUpdated(isl);
+
+        // show results step3
+        showResult((PathIntentMap) runtime1.getPathIntents());
+
         // TODO: show results of plan computation
     }