summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMinoru TAKAHASHI <takahashi.minoru7@gmail.com>2014-07-28 16:22:33 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-07-28 19:00:50 +0900
commit312eee129fdc0bd1b048520fe0d70c3b7a65995f (patch)
tree2f296d68c6c1c9a94c78d064df41e51cca628a8f
parent883a2aacf9968aa1a8f3bcc043be740ab1f5889d (diff)
ofctl_v1_2/3: fix unsuitable log
when using action type below, the log unsuitable is outputted: Unknown action type: [action type] * GOTO_TABLE, WRITE_METADATA, METER(only ofctl_v1_3.py) this patch fixes this problem. Reported-by: jalee <jalee@inno-tech.com.tw> 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_2.py3
-rw-r--r--ryu/lib/ofctl_v1_3.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/ryu/lib/ofctl_v1_2.py b/ryu/lib/ofctl_v1_2.py
index a01acafd..0f767cda 100644
--- a/ryu/lib/ofctl_v1_2.py
+++ b/ryu/lib/ofctl_v1_2.py
@@ -47,7 +47,6 @@ def to_action(dp, dic):
ofp = dp.ofproto
parser = dp.ofproto_parser
- result = None
action_type = dic.get('type')
if action_type == 'OUTPUT':
out_port = int(dic.get('port', ofp.OFPP_ANY))
@@ -89,7 +88,7 @@ def to_action(dp, dic):
value = dic.get('value')
result = parser.OFPActionSetField(**{field: value})
else:
- LOG.debug('Unknown action type: %s' % action_type)
+ result = None
return result
diff --git a/ryu/lib/ofctl_v1_3.py b/ryu/lib/ofctl_v1_3.py
index 4a27031f..b81a8ee3 100644
--- a/ryu/lib/ofctl_v1_3.py
+++ b/ryu/lib/ofctl_v1_3.py
@@ -47,7 +47,6 @@ def to_action(dp, dic):
ofp = dp.ofproto
parser = dp.ofproto_parser
- result = None
action_type = dic.get('type')
if action_type == 'OUTPUT':
out_port = int(dic.get('port', ofp.OFPP_ANY))
@@ -94,7 +93,7 @@ def to_action(dp, dic):
elif action_type == 'POP_PBB':
result = parser.OFPActionPopPbb()
else:
- LOG.debug('Unknown action type: %s' % action_type)
+ result = None
return result