The backport from ofproto_v1_5_parser: This patch moves get_rest() and serialize() from OFPTableFeatureProp to OFPPropBase in order to share it with other subclass.
Signed-off-by: IWASE Yusuke <[email protected]> --- ryu/ofproto/ofproto_v1_4_parser.py | 52 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_4_parser.py b/ryu/ofproto/ofproto_v1_4_parser.py index 9b2ec6b..3cf2a40 100644 --- a/ryu/ofproto/ofproto_v1_4_parser.py +++ b/ryu/ofproto/ofproto_v1_4_parser.py @@ -852,6 +852,32 @@ class OFPPropBase(StringifyMixin): prop.length = length return prop, rest + @classmethod + def get_rest(cls, buf): + (type_, length) = struct.unpack_from(cls._PACK_STR, buf, 0) + offset = struct.calcsize(cls._PACK_STR) + return buf[offset:length] + + def serialize(self): + # Body + # serialize_body should be implemented by subclass + body = bytearray() + body += self.serialize_body() + + # fixup + self.length = len(body) + struct.calcsize(self._PACK_STR) + + # Header + buf = bytearray() + msg_pack_into(self._PACK_STR, buf, 0, self.type, self.length) + buf += body + + # Pad + pad_len = utils.round_up(self.length, 8) - self.length + msg_pack_into("%dx" % pad_len, buf, len(buf)) + + return buf + class OFPPropCommonExperimenter4ByteData(StringifyMixin): _PACK_STR = '!HHII' @@ -2230,32 +2256,6 @@ class OFPTableFeaturesStats(StringifyMixin): class OFPTableFeatureProp(OFPPropBase): _TYPES = {} - @classmethod - def get_rest(cls, buf): - (type_, length) = struct.unpack_from(cls._PACK_STR, buf, 0) - offset = struct.calcsize(cls._PACK_STR) - return buf[offset:length] - - def serialize(self): - # Body - # serialize_body should be implemented by subclass - body = bytearray() - body += self.serialize_body() - - # fixup - self.length = len(body) + struct.calcsize(self._PACK_STR) - - # Header - buf = bytearray() - msg_pack_into(self._PACK_STR, buf, 0, self.type, self.length) - buf += body - - # Pad - pad_len = utils.round_up(self.length, 8) - self.length - msg_pack_into("%dx" % pad_len, buf, len(buf)) - - return buf - class OFPInstructionId(StringifyMixin): _PACK_STR = '!HH' # type, len -- 1.9.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
