From 358017785a10171c49edd41281cb1a941966cf67 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Jul 2013 16:03:31 +0900 Subject: [PATCH] of13: OFPMatch from_json/to_json for new api this breaks from_json/to_json for old api Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_3_parser.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index c4a7c5cc..e7b6550a 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -397,6 +397,15 @@ class OFPMatch(StringifyMixin): def get(self, key, default=None): return self._fields2.get(key, default) + stringify_attrs = iteritems + + def to_jsondict(self): + return super(OFPMatch, self).to_jsondict(lambda x: x) + + @classmethod + def from_jsondict(cls, dict_): + return super(OFPMatch, cls).from_jsondict(dict_, lambda x: x) + def append_field(self, header, value, mask=None): self.fields.append(OFPMatchField.make(header, value, mask))