Work toward fixing ONOS-1031: Removed modules FlowManager and the old TopologyManager
* Removed module FlowManager
* Removed module TopologyManager (in directory ofcontroller/topology)
* Removed corresponding state in HazelcastDatagrid.java
* Removed corresponding REST call to obtain the Hazelcast datagrid state:
GET /wm/onos/datagrid/get/map/{map-name}/json
where "map-name" is: all, flow, flow-entry, topology
Change-Id: Ia687df1b9cd48a537ec6c62cad6c95c3ee4645bd
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
index e846155..884c717 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
@@ -353,7 +353,14 @@
if (existingFlow.installed) {
// Flow has been sent to the switches so it is safe to
// send a packet out now
- FlowPath flow = datagrid.getFlow(new FlowId(existingFlow.flowId));
+
+ //
+ // TODO: The getFlow() call below needs
+ // to be updated to the new Path Intent
+ // framework.
+ //
+ // FlowPath flow = datagrid.getFlow(new FlowId(existingFlow.flowId));
+ FlowPath flow = null;
FlowEntry flowEntryForThisSwitch = null;
if (flow != null) {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java b/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java
index 0e0d1da..92d3a18 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/forwarding/IForwardingService.java
@@ -7,7 +7,7 @@
/**
* Temporary interface that allows the Forwarding module to be
- * notified when a flow has been installed by the FlowManager.
+ * notified when a flow has been installed.
*
* This should be refactored to a listener framework in the future.
* @author jono