From 388adf152c5a5cacae4e69a2c8df1863b1f619a7 Mon Sep 17 00:00:00 2001 From: Yusuke Iwase Date: Thu, 10 Sep 2015 15:49:24 +0900 Subject: [PATCH] ofproto_v1_0_parser: Add __getitem__ method into OFPMatch Currently, ofproto_v1_0_parser does not support query with a match field name like ofproto_v1_[2345]_parser support. This patch adds __getitem__ method in order to get the match value witch a match field name. Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_0_parser.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index 4001b071..9f0e4ffd 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -205,6 +205,27 @@ class OFPMatch(StringifyMixin): else: self.wildcards = wildcards + def __getitem__(self, name): + if not isinstance(name, str): + raise KeyError(name) + elif name == 'nw_src_mask': + _m = 32 - ((self.wildcards & ofproto.OFPFW_NW_SRC_MASK) >> + ofproto.OFPFW_NW_SRC_SHIFT) + return 0 if _m < 0 else _m + elif name == 'nw_dst_mask': + _m = 32 - ((self.wildcards & ofproto.OFPFW_NW_DST_MASK) >> + ofproto.OFPFW_NW_DST_SHIFT) + return 0 if _m < 0 else _m + elif name == 'wildcards': + return self.wildcards + + wc_name = 'OFPFW_' + name.upper() + wc = getattr(ofproto, wc_name, ofproto.OFPFW_ALL) + if self.wildcards & ~wc: + return getattr(self, name) + else: + raise KeyError(name) + def serialize(self, buf, offset): msg_pack_into(ofproto.OFP_MATCH_PACK_STR, buf, offset, self.wildcards, self.in_port, self.dl_src,