remove some assertions which merely prevent serializing an object multiple times.
Signed-off-by: YAMAMOTO Takashi <[email protected]> --- ryu/ofproto/ofproto_parser.py | 5 ----- ryu/ofproto/ofproto_v1_0_parser.py | 1 - ryu/tests/unit/ofproto/test_ofproto_parser.py | 31 +-------------------------- 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/ryu/ofproto/ofproto_parser.py b/ryu/ofproto/ofproto_parser.py index bfb9866..002384d 100644 --- a/ryu/ofproto/ofproto_parser.py +++ b/ryu/ofproto/ofproto_parser.py @@ -126,10 +126,6 @@ class MsgBase(StringifyMixin): return msg_ def _serialize_pre(self): - assert self.version is None - assert self.msg_type is None - assert self.buf is None - self.version = self.datapath.ofproto.OFP_VERSION self.msg_type = self.cls_msg_type self.buf = bytearray(self.datapath.ofproto.OFP_HEADER_SIZE) @@ -138,7 +134,6 @@ class MsgBase(StringifyMixin): # buffer length is determined after trailing data is formated. assert self.version is not None assert self.msg_type is not None - assert self.msg_len is None assert self.buf is not None assert len(self.buf) >= self.datapath.ofproto.OFP_HEADER_SIZE diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index 7ed33c1..5871ca2 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -2070,7 +2070,6 @@ class OFPPacketOut(MsgBase): def _serialize_body(self): assert self.buffer_id is not None assert self.in_port is not None - assert self._actions_len is None assert self.actions is not None self._actions_len = 0 diff --git a/ryu/tests/unit/ofproto/test_ofproto_parser.py b/ryu/tests/unit/ofproto/test_ofproto_parser.py index d7d8cc4..efc99e9 100644 --- a/ryu/tests/unit/ofproto/test_ofproto_parser.py +++ b/ryu/tests/unit/ofproto/test_ofproto_parser.py @@ -204,8 +204,7 @@ class TestMsgBase(unittest.TestCase): def test_parser_check_msg_type(self): self._test_parser(ofproto_v1_0.OFPT_ERROR) - def _test_serialize(self, version=True, msg_type=True, - msg_len=True, buf=True): + def _test_serialize(self): class Datapath(object): ofproto = ofproto_v1_0 @@ -213,18 +212,6 @@ class TestMsgBase(unittest.TestCase): c = ofproto_v1_0_parser.OFPHello(Datapath) - if not version: - c.version = ofproto_v1_0.OFP_VERSION - - if not msg_type: - c.msg_type = ofproto_v1_0.OFPT_HELLO - - if not msg_len: - c.msg_len = ofproto_v1_0.OFP_HEADER_PACK_STR - - if not buf: - c.buf = bytearray() - c.serialize() eq_(ofproto_v1_0.OFP_VERSION, c.version) eq_(ofproto_v1_0.OFPT_HELLO, c.msg_type) @@ -235,22 +222,6 @@ class TestMsgBase(unittest.TestCase): def test_serialize(self): ok_(self._test_serialize()) - @raises(AssertionError) - def test_serialize_check_version(self): - self._test_serialize(version=False) - - @raises(AssertionError) - def test_serialize_check_msg_type(self): - self._test_serialize(msg_type=False) - - @raises(AssertionError) - def test_serialize_check_msg_len(self): - self._test_serialize(msg_len=False) - - @raises(AssertionError) - def test_serialize_check_buf(self): - self._test_serialize(buf=False) - class TestMsgPackInto(unittest.TestCase): """ Test case for ofproto_parser.msg_pack_into -- 1.8.3.1 ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
