of1.2: omit mask attribute from str() when appropriate

normalize str() outputs so that tests like str(msg1) == str(msg2)
more likely succeed.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 13 insertions, 2 deletions

diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py
index b4121c42..37260a87 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -2154,8 +2154,6 @@ class OFPMatchField(StringifyMixin):
         del v['header']
         del v['length']
         del v['n_bytes']
-        if 'mask' in v and v['mask'] is None:
-            del v['mask']
         return d
 
     @classmethod
@@ -2164,6 +2162,19 @@ class OFPMatchField(StringifyMixin):
         # it will be converted by OFPMatch.__init__().
         return {cls.__name__: dict_}
 
+    def stringify_attrs(self):
+        f = super(OFPMatchField, self).stringify_attrs
+        if not ofproto_v1_2.oxm_tlv_header_extract_hasmask(self.header):
+            # something like the following, but yield two values (k,v)
+            # return itertools.ifilter(lambda k, v: k != 'mask', iter())
+            def g():
+                for k, v in f():
+                    if k != 'mask':
+                        yield (k, v)
+            return g()
+        else:
+            return f()
+
 
 @OFPMatchField.register_field_header([ofproto_v1_2.OXM_OF_IN_PORT])
 class MTInPort(OFPMatchField):