Rename REST handler class name from Ramcloud to Datastore
Change-Id: Ied98a833a3d35cbf655f9b2194dcc8a90ccf295a
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreLinksResource.java
similarity index 81%
rename from src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java
rename to src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreLinksResource.java
index ad5059c..c984dd1 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreLinksResource.java
@@ -5,7 +5,7 @@
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
-public class RamcloudLinksResource extends ServerResource {
+public class DatastoreLinksResource extends ServerResource {
@Get("json")
public Iterable<KVLink> retrieve() {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastorePortsResource.java
similarity index 81%
rename from src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java
rename to src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastorePortsResource.java
index bac73b3..9765e7a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastorePortsResource.java
@@ -5,7 +5,7 @@
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
-public class RamcloudPortsResource extends ServerResource {
+public class DatastorePortsResource extends ServerResource {
@Get("json")
public Iterable<KVPort> retrieve() {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreSwitchesResource.java
similarity index 81%
rename from src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java
rename to src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreSwitchesResource.java
index b8a8fe6..018ef09 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/DatastoreSwitchesResource.java
@@ -5,7 +5,7 @@
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
-public class RamcloudSwitchesResource extends ServerResource {
+public class DatastoreSwitchesResource extends ServerResource {
@Get("json")
public Iterable<KVSwitch> retrieve() {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphWebRoutable.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphWebRoutable.java
index e2ed915..95cb392 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphWebRoutable.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/NetworkGraphWebRoutable.java
@@ -11,9 +11,16 @@
@Override
public Restlet getRestlet(Context context) {
Router router = new Router(context);
- router.attach("/rc/switches/json", RamcloudSwitchesResource.class);
- router.attach("/rc/links/json", RamcloudLinksResource.class);
- router.attach("/rc/ports/json", RamcloudPortsResource.class);
+ // leaving old path there for compatibility
+ router.attach("/rc/switches/json", DatastoreSwitchesResource.class);
+ router.attach("/rc/links/json", DatastoreLinksResource.class);
+ router.attach("/rc/ports/json", DatastorePortsResource.class);
+
+ // debug API to dump datastore content
+ router.attach("/ds/switches/json", DatastoreSwitchesResource.class);
+ router.attach("/ds/links/json", DatastoreLinksResource.class);
+ router.attach("/ds/ports/json", DatastorePortsResource.class);
+
router.attach("/ng/switches/json", NetworkGraphSwitchesResource.class);
router.attach("/ng/links/json", NetworkGraphLinksResource.class);
router.attach("/ng/shortest-path/{src-dpid}/{dst-dpid}/json", NetworkGraphShortestPathResource.class);