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
diff --git a/scripts/get_network_graph.py b/scripts/get_network_graph.py
index 4a85192..d7df070 100755
--- a/scripts/get_network_graph.py
+++ b/scripts/get_network_graph.py
@@ -36,8 +36,8 @@
   if DEBUG:
     print '%s' % (txt)
 
-# @app.route("/wm/onos/topology/links/json ")
-# @app.route("/wm/onos/topology/switches/json ")
+# @app.route("/wm/onos/topology/links ")
+# @app.route("/wm/onos/topology/switches ")
 # Sample output:
 
 def print_parsed_result(parsedResult):
@@ -45,7 +45,7 @@
 
 def get_network_switches():
   try:
-    command = "curl -s \"http://%s:%s/wm/onos/topology/switches/json\"" % (ControllerIP, ControllerPort)
+    command = "curl -s \"http://%s:%s/wm/onos/topology/switches\"" % (ControllerIP, ControllerPort)
     debug("get_network_switches %s" % command)
 
     result = os.popen(command).read()
@@ -66,7 +66,7 @@
 
 def get_network_links():
   try:
-    command = "curl -s \"http://%s:%s/wm/onos/topology/links/json\"" % (ControllerIP, ControllerPort)
+    command = "curl -s \"http://%s:%s/wm/onos/topology/links\"" % (ControllerIP, ControllerPort)
     debug("get_network_links %s" % command)
 
     result = os.popen(command).read()