Merge "Fix rest client script to support remove operation Clean some debugging logs" into dev/ramcloud-new-datamodel
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
index b7c355d..c963fdd 100755
--- a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
@@ -125,17 +125,12 @@
// update the map of high-level intents
log("begin_updateInMemoryIntents");
highLevelIntents.executeOperations(list);
- log("end_updateInMemoryIntents");
// change states of high-level intents
- log("begin_updateInMemoryIntents");
IntentStateList states = new IntentStateList();
for (IntentOperation op : list) {
- String id = op.intent.getId();
if (op.intent.getState().equals(IntentState.INST_ACK))
- states.put(id, IntentState.REROUTE_REQ);
- else
- states.put(id, IntentState.INST_REQ);
+ states.put(op.intent.getId(), IntentState.REROUTE_REQ);
}
highLevelIntents.changeStates(states);
log("end_updateInMemoryIntents");
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
index ec3c0e4..aa1147e 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/TopologyManager.java
@@ -22,7 +22,6 @@
import net.onrc.onos.datastore.topology.RCSwitch;
import net.onrc.onos.ofcontroller.networkgraph.PortEvent.SwitchPort;
import net.onrc.onos.ofcontroller.util.EventEntry;
-import net.onrc.onos.ofcontroller.util.Dpid;
import net.onrc.onos.registry.controller.IControllerRegistryService;
import org.slf4j.Logger;
@@ -300,13 +299,13 @@
removePort(portEvent);
for (SwitchEvent switchEvent : removedSwitchEvents.values())
removeSwitch(switchEvent);
-
+
//
// Apply reordered events
//
applyReorderedEvents(! addedSwitchEvents.isEmpty(),
! addedPortEvents.isEmpty());
-
+
}
finally {
//
@@ -314,7 +313,7 @@
//
networkGraph.releaseWriteLock();
}
-
+
//
// Dispatch the Topology Notification Events to the applications
//
@@ -387,26 +386,28 @@
return; // No events to dispatch
}
- //
- // Debug statements
- // TODO: Those statements should be removed in the future
- //
- for (SwitchEvent switchEvent : apiAddedSwitchEvents)
- log.debug("Dispatch Network Graph Event: ADDED {}", switchEvent);
- for (SwitchEvent switchEvent : apiRemovedSwitchEvents)
- log.debug("Dispatch Network Graph Event: REMOVED {}", switchEvent);
- for (PortEvent portEvent : apiAddedPortEvents)
- log.debug("Dispatch Network Graph Event: ADDED {}", portEvent);
- for (PortEvent portEvent : apiRemovedPortEvents)
- log.debug("Dispatch Network Graph Event: REMOVED {}", portEvent);
- for (LinkEvent linkEvent : apiAddedLinkEvents)
- log.debug("Dispatch Network Graph Event: ADDED {}", linkEvent);
- for (LinkEvent linkEvent : apiRemovedLinkEvents)
- log.debug("Dispatch Network Graph Event: REMOVED {}", linkEvent);
- for (DeviceEvent deviceEvent : apiAddedDeviceEvents)
- log.debug("Dispatch Network Graph Event: ADDED {}", deviceEvent);
- for (DeviceEvent deviceEvent : apiRemovedDeviceEvents)
- log.debug("Dispatch Network Graph Event: REMOVED {}", deviceEvent);
+ if (log.isDebugEnabled()) {
+ //
+ // Debug statements
+ // TODO: Those statements should be removed in the future
+ //
+ for (SwitchEvent switchEvent : apiAddedSwitchEvents)
+ log.debug("Dispatch Network Graph Event: ADDED {}", switchEvent);
+ for (SwitchEvent switchEvent : apiRemovedSwitchEvents)
+ log.debug("Dispatch Network Graph Event: REMOVED {}", switchEvent);
+ for (PortEvent portEvent : apiAddedPortEvents)
+ log.debug("Dispatch Network Graph Event: ADDED {}", portEvent);
+ for (PortEvent portEvent : apiRemovedPortEvents)
+ log.debug("Dispatch Network Graph Event: REMOVED {}", portEvent);
+ for (LinkEvent linkEvent : apiAddedLinkEvents)
+ log.debug("Dispatch Network Graph Event: ADDED {}", linkEvent);
+ for (LinkEvent linkEvent : apiRemovedLinkEvents)
+ log.debug("Dispatch Network Graph Event: REMOVED {}", linkEvent);
+ for (DeviceEvent deviceEvent : apiAddedDeviceEvents)
+ log.debug("Dispatch Network Graph Event: ADDED {}", deviceEvent);
+ for (DeviceEvent deviceEvent : apiRemovedDeviceEvents)
+ log.debug("Dispatch Network Graph Event: REMOVED {}", deviceEvent);
+ }
// Deliver the events
for (INetworkGraphListener listener : this.networkGraphListeners) {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/util/Pair.java b/src/main/java/net/onrc/onos/ofcontroller/util/Pair.java
index 2245758..bdc24d3 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/util/Pair.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/util/Pair.java
@@ -17,4 +17,9 @@
this.first = first;
this.second = second;
}
+
+ @Override
+ public String toString() {
+ return String.format("<%s, %s>", first, second);
+ }
}
diff --git a/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java b/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java
index e8759b1..aba4c11 100644
--- a/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/intent/ConstrainedShortestPathIntentTest.java
@@ -1,7 +1,6 @@
package net.onrc.onos.intent;
import static org.junit.Assert.*;
-import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
import org.junit.After;
import org.junit.Before;
@@ -15,13 +14,8 @@
* @author Toshio Koide (t-koide@onlab.us)
*/
public class ConstrainedShortestPathIntentTest {
- NetworkGraph g;
-
@Before
public void setUp() throws Exception {
- MockNetworkGraph graph = new MockNetworkGraph();
- graph.createSampleTopology();
- g = graph;
}
@After
diff --git a/src/test/java/net/onrc/onos/intent/PathIntentTest.java b/src/test/java/net/onrc/onos/intent/PathIntentTest.java
index dd34e90..3196493 100644
--- a/src/test/java/net/onrc/onos/intent/PathIntentTest.java
+++ b/src/test/java/net/onrc/onos/intent/PathIntentTest.java
@@ -2,7 +2,6 @@
import static org.junit.Assert.assertEquals;
import net.onrc.onos.ofcontroller.networkgraph.LinkEvent;
-import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
import net.onrc.onos.ofcontroller.networkgraph.Path;
import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
@@ -18,13 +17,8 @@
* @author Toshio Koide (t-koide@onlab.us)
*/
public class PathIntentTest {
- NetworkGraph g;
-
@Before
public void setUp() throws Exception {
- MockNetworkGraph graph = new MockNetworkGraph();
- graph.createSampleTopology();
- g = graph;
}
@After
@@ -53,9 +47,9 @@
new ConstrainedShortestPathIntent("1", 2L, 3L, 4L, 5L, 6L, 7L, 1000.0);
Path path = new Path();
- path.add(new LinkEvent(g.getSwitch(1L).getPort(1L).getOutgoingLink()));
- path.add(new LinkEvent(g.getSwitch(2L).getPort(1L).getOutgoingLink()));
- path.add(new LinkEvent(g.getSwitch(3L).getPort(1L).getOutgoingLink()));
+ path.add(new LinkEvent(1L, 1L, 2L, 2L));
+ path.add(new LinkEvent(2L, 1L, 3L, 2L));
+ path.add(new LinkEvent(3L, 1L, 4L, 2L));
PathIntent pathIntent1 = new PathIntent("11", path, 123.45, cspIntent1);
diff --git a/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java b/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java
index e118b66..5012ee6 100644
--- a/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java
+++ b/src/test/java/net/onrc/onos/intent/ShortestPathIntentTest.java
@@ -1,7 +1,6 @@
package net.onrc.onos.intent;
import static org.junit.Assert.*;
-import net.onrc.onos.ofcontroller.networkgraph.NetworkGraph;
import org.junit.After;
import org.junit.Before;
@@ -15,13 +14,8 @@
* @author Toshio Koide (t-koide@onlab.us)
*/
public class ShortestPathIntentTest {
- NetworkGraph g;
-
@Before
public void setUp() throws Exception {
- MockNetworkGraph graph = new MockNetworkGraph();
- graph.createSampleTopology();
- g = graph;
}
@After