commit 8baf3fa10b8ac6f5a5a4bca08e708e0c2e01289e
author yoshi <yoshi@onlab.us> Thu Nov 28 12:32:57 2013 -0800
committer yoshi <yoshi@onlab.us> Thu Nov 28 12:32:57 2013 -0800
tree b11f741ab06c423bd7b5ebef673074ebc1eeb5bf
parent d3025a98e6dbe7d4b80b4ba5c53f27b3cf92daea
parent 2dd767c22f7987a46d9bcba6575fa18d040dbd75

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

pom.xml

diff --git a/pom.xml b/pom.xml
index d2799bf..b0ded49 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.3.0</version>
     </dependency>
+    -->
     <dependency>
       <groupId>com.hazelcast</groupId>
       <artifactId>hazelcast</artifactId>
@@ -430,9 +432,7 @@
     <dependency>
       <groupId>com.tinkerpop.blueprints.impls.ramcloud</groupId>
       <artifactId>blueprints-ramcloud-graph</artifactId>
-      <version>2.4.0</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/blueprints-ramcloud-graph-2.4.0.jar</systemPath>
+      <version>2.0.0</version>
     </dependency>
   </dependencies>
 </project>

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 ac3b8b0..9f3b9a0 100644
--- a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
+++ b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
@@ -25,7 +25,8 @@
         System.out.println("dbconfigfile is + "+ 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)