Fixed Issue #207:
Implement remaining API for getting flow state
NOTE: The implementation of the API backend is sub-optimal,
but should be sufficient for now:
We fetch all flows, and then return only the subset that match
the query conditions.
We should use the appropriate Titan/Gremlin query to filter-out
the flows as appropriate.
Estimated: 2D
Actual: 1D
diff --git a/web/add_flow.py b/web/add_flow.py
index 5c3b3ab..18846b7 100755
--- a/web/add_flow.py
+++ b/web/add_flow.py
@@ -84,7 +84,7 @@
exit(1)
if __name__ == "__main__":
- usage_msg = "Usage: %s <flow-id> <src-dpid> <src-port> <dest-dpid> <dest-port>" % (sys.argv[0])
+ usage_msg = "Usage: %s <flow-id> <installer-id> <src-dpid> <src-port> <dest-dpid> <dest-port>" % (sys.argv[0])
# app.debug = False;
@@ -94,14 +94,14 @@
exit(0)
# Check arguments
- if len(sys.argv) < 6:
+ if len(sys.argv) < 7:
log_error(usage_msg)
exit(1)
# Do the work
- data_path = shortest_path(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5]);
- my_installer_id = 'ONOS-Path-Computation-Python'
- my_flow_id = sys.argv[1];
+ my_flow_id = sys.argv[1]
+ my_installer_id = sys.argv[2]; # 'ONOS-Path-Computation-Python'
+ data_path = shortest_path(sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6])
debug("Data Path: %s" % data_path)
diff --git a/web/get_flow.py b/web/get_flow.py
index 5988978..b20e134 100755
--- a/web/get_flow.py
+++ b/web/get_flow.py
@@ -32,6 +32,25 @@
# @app.route("/wm/flow/get/<flow-id>/json")
# Sample output:
# {"flowId":{"value":"0x5"},"installerId":{"value":"FOOBAR"},"dataPath":{"srcPort":{"dpid":{"value":"00:00:00:00:00:00:00:01"},"port":{"value":0}},"dstPort":{"dpid":{"value":"00:00:00:00:00:00:00:02"},"port":{"value":0}},"flowEntries":[{"flowEntryId":"0x1389","flowEntryMatch":null,"flowEntryActions":null,"dpid":{"value":"00:00:00:00:00:00:00:01"},"inPort":{"value":0},"outPort":{"value":1},"flowEntryUserState":"FE_USER_DELETE","flowEntrySwitchState":"FE_SWITCH_NOT_UPDATED","flowEntryErrorState":null},{"flowEntryId":"0x138a","flowEntryMatch":null,"flowEntryActions":null,"dpid":{"value":"00:00:00:00:00:00:00:02"},"inPort":{"value":9},"outPort":{"value":0},"flowEntryUserState":"FE_USER_DELETE","flowEntrySwitchState":"FE_SWITCH_NOT_UPDATED","flowEntryErrorState":null}]}}
+
+def print_flow_path(parsedResult):
+ flowId = parsedResult['flowId']['value'];
+ installerId = parsedResult['installerId']['value'];
+ srcSwitch = parsedResult['dataPath']['srcPort']['dpid']['value'];
+ srcPort = parsedResult['dataPath']['srcPort']['port']['value'];
+ dstSwitch = parsedResult['dataPath']['dstPort']['dpid']['value'];
+ dstPort = parsedResult['dataPath']['dstPort']['port']['value'];
+
+ print "FlowPath: (flowId = %s installerId = %s src = %s/%s dst = %s/%s)" % (flowId, installerId, srcSwitch, srcPort, dstSwitch, dstPort)
+
+ for f in parsedResult['dataPath']['flowEntries']:
+ inPort = f['inPort']['value'];
+ outPort = f['outPort']['value'];
+ dpid = f['dpid']['value']
+ userState = f['flowEntryUserState']
+ switchState = f['flowEntrySwitchState']
+ print " FlowEntry: (%s, %s, %s, %s, %s)" % (inPort, dpid, outPort, userState, switchState)
+
def get_flow_path(flow_id):
try:
command = "curl -s \"http://%s:%s/wm/flow/get/%s/json\"" % (ControllerIP, ControllerPort, flow_id)
@@ -49,26 +68,78 @@
log_error("Controller IF has issue")
exit(1)
- flowId = parsedResult['flowId']['value'];
- installerId = parsedResult['installerId']['value'];
- srcSwitch = parsedResult['dataPath']['srcPort']['dpid']['value'];
- srcPort = parsedResult['dataPath']['srcPort']['port']['value'];
- dstSwitch = parsedResult['dataPath']['dstPort']['dpid']['value'];
- dstPort = parsedResult['dataPath']['dstPort']['port']['value'];
+ print_flow_path(parsedResult)
- print "FlowPath: (flowId = %s installerId = %s src = %s/%s dst = %s/%s)" % (flowId, installerId, srcSwitch, srcPort, dstSwitch, dstPort)
- for f in parsedResult['dataPath']['flowEntries']:
- inPort = f['inPort']['value'];
- outPort = f['outPort']['value'];
- dpid = f['dpid']['value']
- userState = f['flowEntryUserState']
- switchState = f['flowEntrySwitchState']
- print "FlowEntry: (%s, %s, %s, %s, %s)" % (inPort, dpid, outPort, userState, switchState)
+def get_installer_flow_paths(installer_id, v1, p1, v2, p2):
+ try:
+ command = "curl -s \"http://%s:%s/wm/flow/getall-by-installer-id/%s/%s/%s/%s/%s/json\"" % (ControllerIP, ControllerPort, installer_id, v1, p1, v2, p2)
+ debug("get_installer_flow_paths %s" % command)
+ result = os.popen(command).read()
+ debug("result %s" % result)
+ if len(result) == 0:
+ print "No Flows found"
+ return;
+
+ parsedResult = json.loads(result)
+ debug("parsed %s" % parsedResult)
+ except:
+ log_error("Controller IF has issue")
+ exit(1)
+
+ for flowPath in parsedResult:
+ print_flow_path(flowPath)
+
+
+def get_endpoints_flow_paths(v1, p1, v2, p2):
+ try:
+ command = "curl -s \"http://%s:%s/wm/flow/getall-by-endpoints/%s/%s/%s/%s/json\"" % (ControllerIP, ControllerPort, v1, p1, v2, p2)
+ debug("get_endpoints_flow_paths %s" % command)
+
+ result = os.popen(command).read()
+ debug("result %s" % result)
+ if len(result) == 0:
+ print "No Flows found"
+ return;
+
+ parsedResult = json.loads(result)
+ debug("parsed %s" % parsedResult)
+ except:
+ log_error("Controller IF has issue")
+ exit(1)
+
+ for flowPath in parsedResult:
+ print_flow_path(flowPath)
+
+
+def get_all_flow_paths():
+ try:
+ command = "curl -s \"http://%s:%s/wm/flow/getall/json\"" % (ControllerIP, ControllerPort)
+ debug("get_all_flow_paths %s" % command)
+
+ result = os.popen(command).read()
+ debug("result %s" % result)
+ if len(result) == 0:
+ print "No Flows found"
+ return;
+
+ parsedResult = json.loads(result)
+ debug("parsed %s" % parsedResult)
+ except:
+ log_error("Controller IF has issue")
+ exit(1)
+
+ for flowPath in parsedResult:
+ print_flow_path(flowPath)
if __name__ == "__main__":
- usage_msg = "Usage: %s <flow_id>" % (sys.argv[0])
+ usage_msg1 = "Usage:\n"
+ usage_msg2 = "%s <flow_id> : Print flow with Flow ID of <flow_id>\n" % (sys.argv[0])
+ usage_msg3 = " all : Print all flows\n"
+ usage_msg4 = " installer <installer-id> <src-dpid> <src-port> <dest-dpid> <dest-port>\n"
+ usage_msg5 = " endpoints <src-dpid> <src-port> <dest-dpid> <dest-port>"
+ usage_msg = usage_msg1 + usage_msg2 + usage_msg3 + usage_msg4 + usage_msg5;
# app.debug = False;
@@ -83,4 +154,19 @@
exit(1)
# Do the work
- get_flow_path(sys.argv[1]);
+ if sys.argv[1] == "all":
+ get_all_flow_paths()
+ elif sys.argv[1] == "installer":
+ if len(sys.argv) < 7:
+ log_error(usage_msg)
+ exit(1)
+ get_installer_flow_paths(sys.argv[2], sys.argv[3], sys.argv[4],
+ sys.argv[5], sys.argv[6])
+ elif sys.argv[1] == "endpoints":
+ if len(sys.argv) < 6:
+ log_error(usage_msg)
+ exit(1)
+ get_endpoints_flow_paths(sys.argv[2], sys.argv[3], sys.argv[4],
+ sys.argv[5])
+ else:
+ get_flow_path(sys.argv[1])