commit 42d7f1b1797db16c258ffa7dd8c93774343237d4
author Yuta HIGUCHI <y-higuchi@onlab.us> Wed May 28 09:19:49 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Wed May 28 10:10:55 2014 -0700
tree 88e6dd494be9ca06a2374e80bb2da7dff59139a4
parent 0de6f3248a1f0e4f38a0912e28099fda09d0433a

Remove /json from topology-related REST URLs

The /json suffix in topology-related REST URLs was removed at
https://gerrit.onos.onlab.us/707
Remove /json suffix in scripts and files that use those REST URLs.

This modification also fixes ONOS-1333

Change-Id: I14b36b2076b9280758585971c0ebfef5588eac03

old-scripts/web/restapi2.py

diff --git a/old-scripts/web/restapi2.py b/old-scripts/web/restapi2.py
index a84140b..b7bc05f 100755
--- a/old-scripts/web/restapi2.py
+++ b/old-scripts/web/restapi2.py
@@ -57,7 +57,7 @@
 ONOS_GUI3_HOST="http://gui3.onlab.us:8080"
 ONOS_LOCAL_HOST="http://localhost:8080" ;# for Amazon EC2
 
-@app.route("/wm/onos/topology/switches/json")
+@app.route("/wm/onos/topology/switches")
 def switches():
   if request.args.get('proxy') == None:
     host = ONOS_LOCAL_HOST
@@ -65,7 +65,7 @@
     host = ONOS_GUI3_HOST
 
   try:
-    command = "curl -s %s/wm/onos/topology/switches/json" % (host)
+    command = "curl -s %s/wm/onos/topology/switches" % (host)
     print command
     result = os.popen(command).read()
   except:
@@ -75,7 +75,7 @@
   resp = Response(result, status=200, mimetype='application/json')
   return resp
 
-@app.route("/wm/onos/topology/links/json")
+@app.route("/wm/onos/topology/links")
 def links():
   if request.args.get('proxy') == None:
     host = ONOS_LOCAL_HOST
@@ -83,7 +83,7 @@
     host = ONOS_GUI3_HOST
 
   try:
-    command = "curl -s %s/wm/onos/topology/links/json" % (host)
+    command = "curl -s %s/wm/onos/topology/links" % (host)
     print command
     result = os.popen(command).read()
   except: