Allow RAMCloud to start from a configurable option
diff --git a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
index 17067b4..547da44 100644
--- a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
+++ b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
@@ -24,15 +24,9 @@
private FramedGraph<RamCloudGraph> fg;
private static Logger log = LoggerFactory.getLogger(RamCloudDBConnection.class);
- //private static final ThreadLocal<RamCloudGraph> RamCloudThreadLocal = new ThreadLocal<RamCloudGraph>();
-
public RamCloudDBConnection(final String dbConfigFile) {
- //final String coordinatorURL = open(getConfiguration(new File(dbConfigFile)));
- //System.out.println("coordinatorURL "+ coordinatorURL);
- //graph = new RamCloudGraph(coordinatorURL);
- //graph = RamCloudThreadLocal.get();
- //System.out.println("ThreadId = " + Thread.currentThread().getId() + " graph = " + graph);
- graph = new RamCloudGraph("fast+udp:host=10.0.0.144,port=12246");
+ final String coordinatorURL = open(getConfiguration(new File(dbConfigFile)));
+ graph = new RamCloudGraph(coordinatorURL);
Set<String> s = graph.getIndexedKeys(Vertex.class);
if (!s.contains("dpid")) {
graph.createKeyIndex("dpid", Vertex.class);
@@ -120,11 +114,13 @@
}
}
- private String open(final Configuration configuration) {
- final String coordinatorURL = configuration.getString("ramcloud.coordinator", null);
- if (coordinatorURL == null) {
- throw new RuntimeException("Configuration must contain a valid 'coordinatorURL' setting");
- }
- return coordinatorURL;
- }
+ private String open(final Configuration configuration) {
+ final String coordinatorIp = configuration.getString("ramcloud.coordinatorIp", null);
+ final String coordinatorPort = configuration.getString("ramcloud.coordinatorPort", null);
+ final String coordinatorURL = coordinatorIp + "," + coordinatorPort;
+ if (coordinatorURL == null) {
+ throw new RuntimeException("Configuration must contain a valid 'coordinatorURL' setting");
+ }
+ return coordinatorURL;
+ }
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index 2bf4571..80cb939 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -485,7 +485,6 @@
linkDiscovery.addListener(this);
log.debug("Adding EventListener");
- System.out.println("start Up op " + op);
IDBConnection conn = op.getDBConnection();
conn.addEventListener(new LocalTopologyEventListener((DBConnection) conn));
// Setup the Cleanup task.