commit 8060af080129d81c0e338352726933880ec974d6
author Jon Hall <jhall@onlab.us> Mon Apr 14 14:17:58 2014 -0700
committer Jon Hall <jhall@onlab.us> Mon Apr 14 15:11:33 2014 -0700
tree ca9f881b289db70fbea0205e2e74624146d12da4
parent 076a6a3631e1f1c69233f83cc6882c5e972078b8

Change ONOS rest urls to match the new ONOS rest urls
NOTE: wm/devices has been removed from ONOS and has not yet been added back

TestON/drivers/common/cli/check_status.py

diff --git a/TestON/drivers/common/cli/check_status.py b/TestON/drivers/common/cli/check_status.py
index c725cec..8e870bc 100755
--- a/TestON/drivers/common/cli/check_status.py
+++ b/TestON/drivers/common/cli/check_status.py
@@ -3,10 +3,10 @@
 import os
 import sys
 
-# http://localhost:8080/wm/core/topology/switches/all/json
-# http://localhost:8080/wm/core/topology/links/json
-# http://localhost:8080/wm/registry/controllers/json
-# http://localhost:8080/wm/registry/switches/json"
+# http://localhost:8080/wm/onos/ng/switches/json
+# http://localhost:8080/wm/onos/ng/links/json
+# http://localhost:8080/wm/onos/registry/controllers/json
+# http://localhost:8080/wm/onos/registry/switches/json"
 
 def get_json(url):
   try:
@@ -28,14 +28,14 @@
   retcode = 0
   RestPort="8080"
 
-  url="http://%s:%s/wm/core/topology/switches/all/json" % (RestIP, RestPort)
+  url="http://%s:%s/wm/onos/ng/switches/json" % (RestIP, RestPort)
   parsedResult = get_json(url)
 
   if parsedResult == "":
     retcode = 1
     return (retcode, "Rest API has an issue")
 
-  url = "http://%s:%s/wm/registry/switches/json" % (RestIP, RestPort)
+  url = "http://%s:%s/wm/onos/registry/switches/json" % (RestIP, RestPort)
   registry = get_json(url)
 
   if registry == "":
@@ -72,7 +72,7 @@
   buf = ""
   retcode = 0
 
-  url = "http://%s:%s/wm/core/topology/links/json" % (RestIP, RestPort)
+  url = "http://%s:%s/wm/onos/ng/links/json" % (RestIP, RestPort)
   parsedResult = get_json(url)
 
   if parsedResult == "":

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 02db024..7056340 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -450,10 +450,10 @@
             main.exit()
 
 
-# http://localhost:8080/wm/core/topology/switches/all/json
-# http://localhost:8080/wm/core/topology/links/json
-# http://localhost:8080/wm/registry/controllers/json
-# http://localhost:8080/wm/registry/switches/json"
+# http://localhost:8080/wm/onos/ng/switches/json
+# http://localhost:8080/wm/onos/ng/links/json
+# http://localhost:8080/wm/onos/registry/controllers/json
+# http://localhost:8080/wm/onos/registry/switches/json"
 
     def get_json(self, url):
         '''
@@ -781,7 +781,7 @@
         retmac = []
         foundIP = []
         try:
-            ##### device rest API is: 'host:8080/wm/core/topology/switches/all/json' ###
+            ##### device rest API is: 'host:8080/wm/onos/ng/switches/json' ###
             url ="http://%s:%s%s" %(RestIP,RestPort,RestAPI)
 
             try: