Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONOS
diff --git a/web/topology_rest.py b/web/topology_rest.py
index e7e1d83..f17d6ba 100755
--- a/web/topology_rest.py
+++ b/web/topology_rest.py
@@ -189,15 +189,15 @@
resp = Response(result, status=200, mimetype='application/json')
return resp
-@app.route("/wm/flow/getsummary/0/0/json")
-def flows():
+@app.route("/wm/flow/getsummary/<start>/<range>/json")
+def flows(start, range):
if request.args.get('proxy') == None:
host = ONOS_LOCAL_HOST
else:
host = ONOS_GUI3_HOST
try:
- command = "curl -s %s/wm/flow/getsummary/0/0/json" % (host)
+ command = "curl -s %s/wm/flow/getsummary/%s/%s/json" % (host, start, range)
# print command
result = os.popen(command).read()
except:
@@ -810,9 +810,11 @@
flow_nr += 1
command = "/home/ubuntu/ONOS/web/add_flow.py -m onos %d %s %s %s %s %s matchSrcMac %s matchDstMac %s" % (flow_nr, "dummy", src_dpid, src_port, dst_dpid, dst_port, srcMAC, dstMAC)
+ command1 = "/home/ubuntu/ONOS/web/add_flow.py -m onos %d %s %s %s %s %s matchSrcMac %s matchDstMac %s" % (flow_nr, "dummy", dst_dpid, dst_port, src_dpid, src_port, dstMAC, srcMAC)
print command
errcode = os.popen(command).read()
- return errcode
+ errcode1 = os.popen(command1).read()
+ return errcode+" "+errcode1
#* Delete Flow
#http://localhost:9000/gui/delflow/<flow_id>
@@ -858,7 +860,7 @@
print cmd_string
os.popen(cmd_string)
- return
+ return cmd_string
#* Get Iperf Throughput
#http://localhost:9000/gui/iperf/rate/<flow_id>