summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMinoru TAKAHASHI <takahashi.minoru7@gmail.com>2015-07-14 11:40:25 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-07-22 19:12:47 +0900
commit10df461c7b48f6ceebe967df4f56c1de5b054135 (patch)
tree5b84d96d2ae4cdf9491bd12587b42646e0191f28
parent46185c48d90c1bf7c8ba8665d2571de262a56bed (diff)
ofctl_v1_0: fix output string of ENQUEUE
There is no port information in output string of ENQUEUE in ofctl_v1_0.py This patch fixes this problem. Execution example is as follows. curl -X GET http://localhost:8080/stats/flow/1 { "1": [ { "actions": [ "ENQUEUE:2:3" # ENQUEUE:<port>:<queue_id> ], "byte_count": 0, "cookie": 0, "duration_nsec": 864000000, "duration_sec": 107, "hard_timeout": 0, "idle_timeout": 0, "match": { "in_port": 5 }, "packet_count": 0, "priority": 32768, "table_id": 0 } ] } Reported-by: Weijie Liu <wliu43@illinois.edu> Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/lib/ofctl_v1_0.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ryu/lib/ofctl_v1_0.py b/ryu/lib/ofctl_v1_0.py
index 1a2bf414..04b9b7da 100644
--- a/ryu/lib/ofctl_v1_0.py
+++ b/ryu/lib/ofctl_v1_0.py
@@ -107,7 +107,7 @@ def actions_to_str(acts):
elif action_type == ofproto_v1_0.OFPAT_SET_TP_DST:
buf = 'SET_TP_DST:' + str(a.tp)
elif action_type == ofproto_v1_0.OFPAT_ENQUEUE:
- buf = 'ENQUEUE:' + str(a.queue_id)
+ buf = 'ENQUEUE:' + str(a.port) + ":" + str(a.queue_id)
elif action_type == ofproto_v1_0.OFPAT_VENDOR:
buf = 'VENDOR'
else: