commit af2496c20d7a4b0e08ba6e830e6a56c0bbccc280
author yoshi <yoshi@onlab.us> Mon Dec 02 19:48:46 2013 -0800
committer yoshi <yoshi@onlab.us> Mon Dec 02 19:48:46 2013 -0800
tree 5161f1c45989393a2601426e75bf0efd921775fa
parent 240f62ce6a29ba1f7b05abd5f31984d401b4fd9d
parent c2e8e6b09f9a131172f03336e54b8860850bbcf0

Merge branch 'RAMCloud' of https://github.com/yoshitomo0912/ONOS into RAMCloud

conf/onos.properties

diff --git a/conf/onos.properties b/conf/onos.properties
index e65c18e..d93f594 100644
--- a/conf/onos.properties
+++ b/conf/onos.properties
@@ -17,7 +17,7 @@
 net.floodlightcontroller.core.FloodlightProvider.workerthreads = 16
 net.floodlightcontroller.forwarding.Forwarding.idletimeout = 5
 net.floodlightcontroller.forwarding.Forwarding.hardtimeout = 0
-net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = /tmp/cassandra.titan
+#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 = titan
+net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.dbconf = /tmp/ramcloud.conf
+net.onrc.onos.ofcontroller.floodlightlistener.NetworkGraphPublisher.graph_db_store = ramcloud

conf/ramcloud.conf

diff --git a/conf/ramcloud.conf b/conf/ramcloud.conf
new file mode 100644
index 0000000..84b4ff2
--- /dev/null
+++ b/conf/ramcloud.conf
@@ -0,0 +1 @@
+ramcloud.coordinator=fast+udp:host=10.128.100.36,port=12246

pom.xml

diff --git a/pom.xml b/pom.xml
index ae3819b..d2d6535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,11 +251,13 @@
       <artifactId>frames</artifactId>
       <version>2.3.1</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>com.tinkerpop.blueprints</groupId>
       <artifactId>blueprints-core</artifactId>
       <version>2.4.0</version>
     </dependency>
+    -->
     <dependency>
       <groupId>com.hazelcast</groupId>
       <artifactId>hazelcast</artifactId>

src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java

diff --git a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
index c564d68..c53e66e 100644
--- a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
+++ b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
@@ -24,7 +24,8 @@
     public RamCloudDBConnection(final String dbConfigFile) {
         final String coordinatorURL = open(getConfiguration(new File(dbConfigFile)));
 	System.out.println("coordinatorURL "+ coordinatorURL);
-        graph = new RamCloudGraph(coordinatorURL);
+        //graph = new RamCloudGraph(coordinatorURL);
+	graph = new RamCloudGraph("fast+udp:host=10.128.100.36,port=12246");
     }
     
     @Override

start-onos.sh

diff --git a/start-onos.sh b/start-onos.sh
index 495141d..59913d8 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -160,7 +160,7 @@
 case "$1" in
   start)
     stop
-    check_db
+#    check_db
     start 
     ;;
   startifdown)