of12: make OFPDescStats more human readable

- when parsing, remove zero padding.
- stop base64 encoding for json representation because these fields
  are ASCII strings per OF spec.

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, 0 deletions

diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py
index 8de06eed..f606ddd2 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -1118,10 +1118,23 @@ class OFPDescStatsRequest(OFPStatsRequest):
                                          body_single_struct=True)
 class OFPDescStats(ofproto_parser.namedtuple('OFPDescStats', (
         'mfr_desc', 'hw_desc', 'sw_desc', 'serial_num', 'dp_desc'))):
+
+    _TYPE = {
+        'ascii': [
+            'mfr_desc',
+            'hw_desc',
+            'sw_desc',
+            'serial_num',
+            'dp_desc',
+        ]
+    }
+
     @classmethod
     def parser(cls, buf, offset):
         desc = struct.unpack_from(ofproto_v1_2.OFP_DESC_STATS_PACK_STR,
                                   buf, offset)
+        desc = list(desc)
+        desc = map(lambda x: x.rstrip('\0'), desc)
         stats = cls(*desc)
         stats._length = ofproto_v1_2.OFP_DESC_STATS_SIZE
         return stats