From cec887faa4565f1424b6a39ff6c70c8a1724bd36 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 27 Aug 2013 07:07:16 +0900
Subject: [PATCH] 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>
---
 ryu/ofproto/oxm_fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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: