commit 4b7fffa85fc09ee1421d33c394c20ab7066a396b
author Jonathan Hart <jono@onlab.us> Wed Feb 12 17:41:38 2014 -0800
committer Jonathan Hart <jono@onlab.us> Wed Feb 12 17:41:38 2014 -0800
tree 6abb281a91f987d9fc5ed6c47bdade3e635b57bb
parent 66c1681b4135c62b289e26f9ef4cf3fb66f39262

Updated default properties files to use new RCNetworkGraphPublisher

Change-Id: I83f8c9ca66d1bc661318d8f8ae369d7e001a3c2a

conf/onos-embedded.properties

diff --git a/conf/onos-embedded.properties b/conf/onos-embedded.properties
index dddacdb..d47b0d1 100644
--- a/conf/onos-embedded.properties
+++ b/conf/onos-embedded.properties
@@ -1,6 +1,6 @@
 floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
 net.floodlightcontroller.threadpool.ThreadPool,\
-net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher, \
+net.onrc.onos.ofcontroller.floodlightlistener.RCNetworkGraphPublisher, \
 net.floodlightcontroller.ui.web.StaticWebRoutable,\
 net.onrc.onos.datagrid.HazelcastDatagrid,\
 net.onrc.onos.ofcontroller.flowmanager.FlowManager,\
@@ -12,6 +12,6 @@
 net.floodlightcontroller.core.FloodlightProvider.workerthreads = 48
 net.floodlightcontroller.forwarding.Forwarding.idletimeout = 5
 net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
-net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = conf/titan-embedded.properties
+#net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = conf/titan-embedded.properties
 net.onrc.onos.datagrid.HazelcastDatagrid.datagridConfig = conf/hazelcast.xml
 

conf/onos.properties

diff --git a/conf/onos.properties b/conf/onos.properties
index f1244df..aeff6ec 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -1,6 +1,6 @@
 floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
 net.floodlightcontroller.threadpool.ThreadPool,\
-net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher, \
+net.onrc.onos.ofcontroller.floodlightlistener.RCNetworkGraphPublisher, \
 net.floodlightcontroller.ui.web.StaticWebRoutable,\
 net.onrc.onos.datagrid.HazelcastDatagrid,\
 net.onrc.onos.ofcontroller.flowmanager.FlowManager,\
@@ -14,5 +14,5 @@
 net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
 #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
-net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.graph_db_store = ramcloud
+#net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = /tmp/ramcloud.conf
+#net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.graph_db_store = ramcloud