Fix ramcloud configuration path
diff --git a/src/main/java/net/onrc/onos/graph/web/TopoDevicesResource.java b/src/main/java/net/onrc/onos/graph/web/TopoDevicesResource.java
index 10e250e..4f4abba 100644
--- a/src/main/java/net/onrc/onos/graph/web/TopoDevicesResource.java
+++ b/src/main/java/net/onrc/onos/graph/web/TopoDevicesResource.java
@@ -13,7 +13,7 @@
@Get("json")
public Iterator<IDeviceObject> retrieve() {
- DBOperation op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ DBOperation op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
return op.getDevices().iterator();
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/DeviceStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/DeviceStorageImpl.java
index ddc7527..73b0bdb 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/DeviceStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/DeviceStorageImpl.java
@@ -39,7 +39,7 @@
@Override
public void init(final String dbStore, final String conf) {
try {
- ope = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ ope = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//ope = GraphDBManager.getDBOperation(dbStore, conf);
} catch (Exception e) {
log.error(e.getMessage());
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
index aa5f073..66ad0e9 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
@@ -34,7 +34,7 @@
@Override
public void init(final String dbStore, final String conf) {
//this.dbop = GraphDBManager.getDBOperation(dbStore, conf);
- this.dbop = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ this.dbop = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java
index 0dcf4297..7c4d9ce 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImpl.java
@@ -38,7 +38,7 @@
*/
@Override
public void init(final String dbStore, final String conf) {
- op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//op = GraphDBManager.getDBOperation(dbStore, conf);
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java
index a2454c2..d6bba8c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java
@@ -36,7 +36,7 @@
@Override
public List<Link> getActiveLinks() {
// TODO Auto-generated method stub
- dbop = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ dbop = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//dbop = GraphDBManager.getDBOperation("", "");
//dbop.commit(); //Commit to ensure we see latest data
Iterable<ISwitchObject> switches = dbop.getActiveSwitches();
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
index b5feac9..c6a5b77 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
@@ -15,7 +15,7 @@
protected final static Logger log = LoggerFactory.getLogger(TopoSwitchServiceImpl.class);
public TopoSwitchServiceImpl(final String dbStore, String conf) {
- op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//op = GraphDBManager.getDBOperation(dbStore, conf);;
}
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 456b69c..5cf31f6 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -88,7 +88,7 @@
Thread.currentThread().setName("SwitchCleanup@" + old);
try {
log.debug("Running cleanup thread");
- op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
switchCleanup();
}
catch (Exception e) {
@@ -450,7 +450,7 @@
String conf = configMap.get(DBConfigFile);
String dbStore = configMap.get(GraphDBStore);
System.out.println("conf" + conf + "dbStore" + dbStore);
- op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ op = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//op = GraphDBManager.getDBOperation(dbStore, conf);
if (op == null) {
System.out.println("publisher op is null");
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index de84b8e..601bccb 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -86,8 +86,8 @@
*/
@Override
public void init(final String dbStore, final String conf) {
- dbHandlerApi = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
- dbHandlerInner = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ dbHandlerApi = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
+ dbHandlerInner = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//dbHandlerApi = GraphDBManager.getDBOperation(dbStore, conf);
//dbHandlerInner = GraphDBManager.getDBOperation(dbStore, conf);
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
index 98fe262..f13d780 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
@@ -50,7 +50,7 @@
private Map<IOFSwitch, FutureTask<SyncResult>> switchThreads;
public FlowSynchronizer() {
- dbHandler = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ dbHandler = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
switchThreads = new HashMap<IOFSwitch, FutureTask<SyncResult>>(); }
@Override
diff --git a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
index a074d19..e75a6f2 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
@@ -80,7 +80,7 @@
*/
public void init(final String dbStore, String config) {
try {
- dbHandler = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloudconf");
+ dbHandler = GraphDBManager.getDBOperation("ramcloud", "/tmp/ramcloud.conf");
//dbHandler = GraphDBManager.getDBOperation(dbStore, config);
} catch (Exception e) {
log.error(e.getMessage());