Added path view on GUI
diff --git a/web/topology_rest.py b/web/topology_rest.py
index 5eaed03..ce6b2d7 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -162,23 +162,26 @@
try:
v1 = "00:00:00:00:00:0a:0d:00"
+# v1 = "00:00:00:00:00:0d:00:d1"
p1=1
v2 = "00:00:00:00:00:0b:0d:03"
- p1=2
+# v2 = "00:00:00:00:00:0d:00:d3"
+ p2=1
command = "curl -s http://%s:%s/wm/topology/route/%s/%s/%s/%s/json" % (RestIP, RestPort, v1, p1, v2, p2)
result = os.popen(command).read()
parsedResult = json.loads(result)
except:
log_error("No route")
- parsedResult = []
+ parsedResult = {}
- path = [];
- for i, v in enumerate(parsedResult):
- if i < len(parsedResult) - 1:
- sdpid= parsedResult[i]['switch']
- ddpid = parsedResult[i+1]['switch']
- path.append( (sdpid, ddpid))
-
+ path = []
+ if parsedResult.has_key('flowEntries'):
+ flowEntries= parsedResult['flowEntries']
+ for i, v in enumerate(flowEntries):
+ if i < len(flowEntries) - 1:
+ sdpid= flowEntries[i]['dpid']['value']
+ ddpid = flowEntries[i+1]['dpid']['value']
+ path.append( (sdpid, ddpid))
try:
command = "curl -s \'http://%s:%s/wm/core/topology/links/json\'" % (RestIP, RestPort)