Merge pull request #312 from cemsbr/fix_v0x04_test

Fix v0x04 pack and unpack test

Author: beraldoleal

tests/v0x04/test_controller2switch/test_multipart_reply.py

@@ -1,9 +1,6 @@
 """MultipartReply message test."""
 
-from pyof.v0x04.controller2switch.common import MeterConfig, MultipartTypes
-from pyof.v0x04.controller2switch.meter_mod import (ListOfMeterBandHeader,
-                                                    MeterBandDrop,
-                                                    MeterBandDscpRemark)
+from pyof.v0x04.controller2switch.common import MultipartTypes
 from pyof.v0x04.controller2switch.multipart_reply import (MultipartReply,
                                                           MultipartReplyFlags)
 from tests.v0x04.test_struct import TestStruct
@@ -19,18 +16,5 @@ def setUpClass(cls):
         super().set_message(MultipartReply, xid=16,
                             multipart_type=MultipartTypes.OFPMP_METER_CONFIG,
                             flags=MultipartReplyFlags.OFPMPF_REPLY_MORE,
-                            body=cls.meter_config_instance())
+                            body=b'this is a test')
         super().set_minimum_size(16)
-
-    @classmethod
-    def meter_config_instance(cls):
-        """Method used to create a MeterConfig instance."""
-        return MeterConfig(bands=cls.list_of_meters())
-
-    @staticmethod
-    def list_of_meters():
-        """Instantiate a ListOfMeterBandHeader with some instances."""
-        meters = [MeterBandDrop(rate=6, burst_size=3),
-                  MeterBandDscpRemark(rate=1, burst_size=4, prec_level=2),
-                  MeterBandDrop(rate=9, burst_size=1)]
-        return ListOfMeterBandHeader(items=[meters])

tests/v0x04/test_struct.py

@@ -84,8 +84,18 @@ def set_minimum_size(cls, size):
         """
         cls._min_size = size
 
-    def _pack_unpack(self, cls, *args, **kwargs):
+    def test_pack_unpack(self):
         """Pack the message, unpack and check whether they are the same."""
+        if self._msg_cls:
+            args, kwargs = self._msg_params
+            self._test_pack_unpack(self._msg_cls, args, kwargs)
+
+    def _test_pack_unpack(self, cls, *args, **kwargs):
+        """Pack the message, unpack and check whether they are the same.
+
+        Call this method multiple times if you want to test more than one
+        object.
+        """
         args, kwargs = self._msg_params
         packed = self._msg_cls(*args, **kwargs).pack()
         header = Header()