Add a configuration option to remove or use Flow Path from database during ONOS cluster restart (ONOS-857)
The new configuration option inside conf/onos.properties or
conf/onos-embedded.properties is:
net.onrc.onos.ofcontroller.flowmanager.FlowManager.reuseDatabaseFlowPath = false
If the configuration option is not listed, the default value is "false",
i.e., the leftover FlowPath state in the database will be deleted.
If it is set to true, the FlowPath state (i.e., the result Flow Entries)
will be pushed into the switches.
Conflicts:
conf/onos.properties
conf/onos-embedded.properties
src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
NOTE: The above three conflicts have been resolved by hand.
Change-Id: Ie39bb7f00e617a3765530d7112fccfa95bbafa71
diff --git a/conf/onos.properties b/conf/onos.properties
index 508ffef..ee2c9c9 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -14,6 +14,7 @@
net.floodlightcontroller.core.FloodlightProvider.workerthreads = 16
net.floodlightcontroller.forwarding.Forwarding.idletimeout = 5
net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
+net.onrc.onos.ofcontroller.flowmanager.FlowManager.reuseDatabaseFlowPath = false
#net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = /tmp/cassandra.titan
net.onrc.onos.datagrid.HazelcastDatagrid.datagridConfig = conf/hazelcast.xml
#net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = /tmp/ramcloud.conf