commit 030fc44c9deb666ed4fe85ab3e1078d14c6e7895
author Pavlin Radoslavov <pavlin@onlab.us> Mon Apr 21 13:38:26 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Tue Apr 22 11:09:48 2014 -0700
tree 5c20b2c89bea1fb57d466b9614819a3710665c24
parent 3c049c477b493b8a02d43a9fd105e1db16de0b66

Fix a bug and cleanup the Topology REST API:

* Fix a bug in the base path:
  /wm/onos -> /wm/onos/topology

  If the base path is the top-level prefix /wm/onos, it hides all other
  ONOS REST APIs that are added by a different module if at runtime
  they are added after the NetworkGraphWebRoutable Restlet.

* Removed old REST APIs:
  "/rc/switches/json"
  "/rc/links/json"
  "/rc/ports/json"

  Those are same as the existing:
  "/ds/switches/json"
  "/ds/links/json"
  "/ds/ports/json"

* Removed the "/ng" prefix for accessing the topology-related info

* Removed the old Topology API

Now the remaining and updated Topology REST API is:

// debug API to dump datastore content
  /wm/onos/topology/ds/switches/json
  /wm/onos/topology/ds/links/json
  /wm/onos/topology/ds/ports/json

// Topology API
  /wm/onos/topology/switches/json
  /wm/onos/topology/links/json

// TODO: This one will be moved to the Intent framework REST API
  /wm/onos/topology/shortest-path/{src-dpid}/{dst-dpid}/json

Change-Id: I367007413d9abdf28e0ce4ea0b78b2704f196dc7

src/main/java/net/onrc/onos/core/topology/web/NetworkGraphWebRoutable.java

diff --git a/src/main/java/net/onrc/onos/core/topology/web/NetworkGraphWebRoutable.java b/src/main/java/net/onrc/onos/core/topology/web/NetworkGraphWebRoutable.java
index 8f32f8a..b159fe6 100644
--- a/src/main/java/net/onrc/onos/core/topology/web/NetworkGraphWebRoutable.java
+++ b/src/main/java/net/onrc/onos/core/topology/web/NetworkGraphWebRoutable.java
@@ -11,30 +11,22 @@
     @Override
     public Restlet getRestlet(Context context) {
         Router router = new Router(context);
-        // 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);
-
-        // Old URLs for compatibility
-        router.attach("/topology/switches/json", NetworkGraphSwitchesResource.class);
-        router.attach("/topology/links/json", NetworkGraphLinksResource.class);
+        // Topology API
+        router.attach("/switches/json", NetworkGraphSwitchesResource.class);
+        router.attach("/links/json", NetworkGraphLinksResource.class);
+        // TODO: Move the Shortest Path REST API to the Intent framework
+        router.attach("/shortest-path/{src-dpid}/{dst-dpid}/json", NetworkGraphShortestPathResource.class);
 
         return router;
     }
 
     @Override
     public String basePath() {
-        return "/wm/onos";
+        return "/wm/onos/topology";
     }
-
 }