* Minor refactoring in the original FlowManager logic when setting
the Flow Entry Switch State (for new Flow Entries):
- The appropriate state is not hardcoded anymore inside class
FlowDatabaseOperation. Instead, it is explicitly set by the caller method.
* Add new method FlowManager::pushModifiedFlowEntries() that is used
by the PathComputation to push the modified flow entries to the switches
controlled by this instance.
Eventually, this method will be one that needs to be
modified/refactored/adjusted to use the forthcoming FlowSynchronizer module.
For now, the method is disabled, so it doesn't conflict with the
existing FlowManager mechanism.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
index 5bc35d2..d06c62c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -309,7 +309,7 @@
flowEntryObj.setUserState("FE_USER_MODIFY");
else
flowEntryObj.setUserState("FE_USER_ADD");
- flowEntryObj.setSwitchState("FE_SWITCH_NOT_UPDATED");
+ flowEntryObj.setSwitchState(flowEntry.flowEntrySwitchState().toString());
//
// TODO: Take care of the FlowEntryErrorState.
//
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index fba680d..ecbb49c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -518,6 +518,17 @@
*/
@Override
public boolean addFlow(FlowPath flowPath, FlowId flowId) {
+ //
+ // NOTE: We need to explicitly initialize the Flow Entry Switch State,
+ // in case the application didn't do it.
+ //
+ for (FlowEntry flowEntry : flowPath.flowEntries()) {
+ if (flowEntry.flowEntrySwitchState() ==
+ FlowEntrySwitchState.FE_SWITCH_UNKNOWN) {
+ flowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED);
+ }
+ }
+
if (FlowDatabaseOperation.addFlow(this, dbHandler, flowPath, flowId)) {
datagridService.notificationSendFlowAdded(flowPath);
return true;
@@ -703,6 +714,8 @@
//
int idx = 0;
for (FlowEntry flowEntry : newDataPath.flowEntries()) {
+ // Mark the Flow Entry as not updated in the switch
+ flowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED);
// Set the incoming port matching
FlowEntryMatch flowEntryMatch = new FlowEntryMatch();
flowEntry.setFlowEntryMatch(flowEntryMatch);
@@ -810,4 +823,92 @@
//
return (installFlowEntry(mySwitch, flowPath, flowEntry));
}
+
+ /**
+ * Push the modified Flow Entries of a collection of Flow Paths.
+ * Only the Flow Entries to switches controlled by this instance
+ * are pushed.
+ *
+ * NOTE: Currently, we write to both the Network MAP and the switches.
+ *
+ * @param modifiedFlowPaths the collection of Flow Paths with the modified
+ * Flow Entries.
+ */
+ public void pushModifiedFlowEntries(Collection<FlowPath> modifiedFlowPaths) {
+
+ // TODO: For now, the pushing of Flow Entries is disabled
+ if (true)
+ return;
+
+ Map<Long, IOFSwitch> mySwitches = floodlightProvider.getSwitches();
+
+ for (FlowPath flowPath : modifiedFlowPaths) {
+ IFlowPath flowObj = dbHandler.searchFlowPath(flowPath.flowId());
+ if (flowObj == null) {
+ String logMsg = "Cannot find Network MAP entry for Flow Path " +
+ flowPath.flowId();
+ log.error(logMsg);
+ continue;
+ }
+
+ for (FlowEntry flowEntry : flowPath.flowEntries()) {
+ if (flowEntry.flowEntrySwitchState() !=
+ FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED) {
+ continue; // No need to update the entry
+ }
+
+ IOFSwitch mySwitch = mySwitches.get(flowEntry.dpid().value());
+ if (mySwitch == null)
+ continue; // Ignore the entry: not my switch
+
+ //
+ // Assign the FlowEntry ID if needed
+ //
+ if ((flowEntry.flowEntryId() == null) ||
+ (flowEntry.flowEntryId().value() == 0)) {
+ long id = getNextFlowEntryId();
+ flowEntry.setFlowEntryId(new FlowEntryId(id));
+ }
+
+ //
+ // Install the Flow Entry into the switch
+ //
+ if (! installFlowEntry(mySwitch, flowPath, flowEntry)) {
+ String logMsg = "Cannot install Flow Entry " +
+ flowEntry.flowEntryId() +
+ " from Flow Path " + flowPath.flowId() +
+ " on switch " + flowEntry.dpid();
+ log.error(logMsg);
+ continue;
+ }
+
+ //
+ // NOTE: Here we assume that the switch has been successfully
+ // updated.
+ //
+ flowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_UPDATED);
+
+ //
+ // Write the Flow Entry to the Network Map
+ //
+ try {
+ if (addFlowEntry(flowObj, flowEntry) == null) {
+ String logMsg = "Cannot write to Network MAP Flow Entry " +
+ flowEntry.flowEntryId() +
+ " from Flow Path " + flowPath.flowId() +
+ " on switch " + flowEntry.dpid();
+ log.error(logMsg);
+ continue;
+ }
+ } catch (Exception e) {
+ String logMsg = "Exception writing Flow Entry to Network MAP";
+ log.debug(logMsg);
+ dbHandler.rollback();
+ continue;
+ }
+ }
+ }
+
+ dbHandler.commit();
+ }
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
index 661fab1..ae14e09 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/PathComputation.java
@@ -243,8 +243,7 @@
//
// Push the Flow Entries that have been modified
//
- // TODO: Uncomment the following to enable pushing of flow entries
- // flowManager.pushModifiedFlowEntries(modifiedFlowPaths);
+ flowManager.pushModifiedFlowEntries(modifiedFlowPaths);
// Cleanup
topologyEvents.clear();