summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-08-27 07:07:16 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-08-27 11:54:55 +0900
commitcec887faa4565f1424b6a39ff6c70c8a1724bd36 (patch)
treef515061faebea335529f073abea03d77a566548a
parent943a1c711f5576347eef49445817d3e52ad1234c (diff)
fix of match from_jsondict mask bug
Match's from_jsondict() requres 'mask' in JSON even if the match doesn't have 'mask'. from_jsondict in dict_['oxm_fields']] File "/Users/fujita/git/ryu/ryu/ofproto/oxm_fields.py", line 230, in from_jsondict mask = tlv['mask'] KeyError: 'mask' Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
-rw-r--r--ryu/ofproto/oxm_fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ryu/ofproto/oxm_fields.py b/ryu/ofproto/oxm_fields.py
index f2f4a7cc..73b55a2a 100644
--- a/ryu/ofproto/oxm_fields.py
+++ b/ryu/ofproto/oxm_fields.py
@@ -227,7 +227,7 @@ def from_jsondict(j):
tlv = j['OXMTlv']
field = tlv['field']
value = tlv['value']
- mask = tlv['mask']
+ mask = tlv.get('mask')
if mask is None:
uv = value
else: