Change MultipartTypes to singular

Change it to match the project defaults.
Fix #468

Author: renanrodrigo

pyof/v0x04/controller2switch/common.py

@@ -19,7 +19,7 @@
 from pyof.v0x04.controller2switch.table_mod import Table
 
 __all__ = ('ConfigFlags', 'ControllerRole', 'Bucket', 'BucketCounter',
-           'ExperimenterMultipartHeader', 'MultipartTypes',
+           'ExperimenterMultipartHeader', 'MultipartType',
            'TableFeaturePropType', 'Property', 'InstructionsProperty',
            'NextTablesProperty', 'ActionsProperty', 'OxmProperty',
            'ListOfProperty', 'TableFeatures')
@@ -104,7 +104,7 @@ def find_class(self):
         return OxmProperty
 
 
-class MultipartTypes(IntEnum):
+class MultipartType(IntEnum):
     """Types of Multipart Messages, both Request and Reply."""
 
     #: Description of this OpenFlow switch.

pyof/v0x04/controller2switch/multipart_reply.py

@@ -13,7 +13,7 @@
 from pyof.v0x04.common.header import Header, Type
 from pyof.v0x04.common.port import Port
 from pyof.v0x04.controller2switch.common import (
-    Bucket, BucketCounter, ExperimenterMultipartHeader, MultipartTypes,
+    Bucket, BucketCounter, ExperimenterMultipartHeader, MultipartType,
     TableFeatures)
 from pyof.v0x04.controller2switch.meter_mod import (
     ListOfMeterBandHeader, MeterBandType, MeterFlags)
@@ -62,7 +62,7 @@ class MultipartReply(GenericMessage):
     #: Openflow :class:`~pyof.v0x04.common.header.Header`
     header = Header(message_type=Type.OFPT_MULTIPART_REPLY)
     #: One of the OFPMP_* constants.
-    multipart_type = UBInt16(enum_ref=MultipartTypes)
+    multipart_type = UBInt16(enum_ref=MultipartType)
     #: OFPMPF_REPLY_* flags.
     flags = UBInt16()
     #: Padding
@@ -139,22 +139,22 @@ def _unpack_body(self):
     def _get_body_instance(self):
         """Return the body instance."""
         exp_header = ExperimenterMultipartHeader
-        simple_body = {MultipartTypes.OFPMP_DESC: Desc,
-                       MultipartTypes.OFPMP_GROUP_FEATURES: GroupFeatures,
-                       MultipartTypes.OFPMP_METER_FEATURES: MeterFeatures,
-                       MultipartTypes.OFPMP_EXPERIMENTER: exp_header}
-
-        array_of_bodies = {MultipartTypes.OFPMP_FLOW: FlowStats,
-                           MultipartTypes.OFPMP_AGGREGATE: AggregateStatsReply,
-                           MultipartTypes.OFPMP_TABLE: TableStats,
-                           MultipartTypes.OFPMP_PORT_STATS: PortStats,
-                           MultipartTypes.OFPMP_QUEUE: QueueStats,
-                           MultipartTypes.OFPMP_GROUP: GroupStats,
-                           MultipartTypes.OFPMP_GROUP_DESC: GroupDescStats,
-                           MultipartTypes.OFPMP_METER: MeterStats,
-                           MultipartTypes.OFPMP_METER_CONFIG: MeterConfig,
-                           MultipartTypes.OFPMP_TABLE_FEATURES: TableFeatures,
-                           MultipartTypes.OFPMP_PORT_DESC: Port}
+        simple_body = {MultipartType.OFPMP_DESC: Desc,
+                       MultipartType.OFPMP_GROUP_FEATURES: GroupFeatures,
+                       MultipartType.OFPMP_METER_FEATURES: MeterFeatures,
+                       MultipartType.OFPMP_EXPERIMENTER: exp_header}
+
+        array_of_bodies = {MultipartType.OFPMP_FLOW: FlowStats,
+                           MultipartType.OFPMP_AGGREGATE: AggregateStatsReply,
+                           MultipartType.OFPMP_TABLE: TableStats,
+                           MultipartType.OFPMP_PORT_STATS: PortStats,
+                           MultipartType.OFPMP_QUEUE: QueueStats,
+                           MultipartType.OFPMP_GROUP: GroupStats,
+                           MultipartType.OFPMP_GROUP_DESC: GroupDescStats,
+                           MultipartType.OFPMP_METER: MeterStats,
+                           MultipartType.OFPMP_METER_CONFIG: MeterConfig,
+                           MultipartType.OFPMP_TABLE_FEATURES: TableFeatures,
+                           MultipartType.OFPMP_PORT_DESC: Port}
 
         if isinstance(self.multipart_type, (int, UBInt16)):
             self.multipart_type = self.multipart_type.enum_ref(

pyof/v0x04/controller2switch/multipart_request.py

@@ -11,7 +11,7 @@
 from pyof.v0x04.common.header import Header, Type
 from pyof.v0x04.common.port import PortNo
 from pyof.v0x04.controller2switch.common import (
-    ExperimenterMultipartHeader, MultipartTypes, TableFeatures)
+    ExperimenterMultipartHeader, MultipartType, TableFeatures)
 from pyof.v0x04.controller2switch.group_mod import Group
 from pyof.v0x04.controller2switch.meter_mod import Meter
 from pyof.v0x04.controller2switch.table_mod import Table
@@ -46,7 +46,7 @@ class MultipartRequest(GenericMessage):
     #: Openflow :class:`~pyof.v0x04.common.header.Header`
     header = Header(message_type=Type.OFPT_MULTIPART_REQUEST)
     #: One of the OFPMP_* constants.
-    multipart_type = UBInt16(enum_ref=MultipartTypes)
+    multipart_type = UBInt16(enum_ref=MultipartType)
     #: OFPMPF_REQ_* flags.
     flags = UBInt16(enum_ref=MultipartRequestFlags)
     #: Padding
@@ -127,16 +127,16 @@ def _unpack_body(self):
     def _get_body_instance(self):
         """Return the body instance."""
         simple_body = {
-            MultipartTypes.OFPMP_FLOW: FlowStatsRequest,
-            MultipartTypes.OFPMP_AGGREGATE: AggregateStatsRequest,
-            MultipartTypes.OFPMP_PORT_STATS: PortStatsRequest,
-            MultipartTypes.OFPMP_QUEUE: QueueStatsRequest,
-            MultipartTypes.OFPMP_GROUP: GroupStatsRequest,
-            MultipartTypes.OFPMP_METER: MeterMultipartRequest,
-            MultipartTypes.OFPMP_EXPERIMENTER: ExperimenterMultipartHeader
+            MultipartType.OFPMP_FLOW: FlowStatsRequest,
+            MultipartType.OFPMP_AGGREGATE: AggregateStatsRequest,
+            MultipartType.OFPMP_PORT_STATS: PortStatsRequest,
+            MultipartType.OFPMP_QUEUE: QueueStatsRequest,
+            MultipartType.OFPMP_GROUP: GroupStatsRequest,
+            MultipartType.OFPMP_METER: MeterMultipartRequest,
+            MultipartType.OFPMP_EXPERIMENTER: ExperimenterMultipartHeader
         }
 
-        array_of_bodies = {MultipartTypes.OFPMP_TABLE_FEATURES: TableFeatures}
+        array_of_bodies = {MultipartType.OFPMP_TABLE_FEATURES: TableFeatures}
 
         if isinstance(self.multipart_type, UBInt16):
             self.multipart_type = self.multipart_type.enum_ref(

tests/v0x04/test_controller2switch/test_multipart_reply.py

@@ -1,6 +1,6 @@
 """MultipartReply message test."""
 
-from pyof.v0x04.controller2switch.common import MultipartTypes
+from pyof.v0x04.controller2switch.common import MultipartType
 from pyof.v0x04.controller2switch.multipart_reply import (
     Desc, MultipartReply, MultipartReplyFlags)
 from tests.v0x04.test_struct import TestStruct
@@ -14,13 +14,13 @@ def setUpClass(cls):
         """Configure raw file and its object in parent class (TestDump)."""
         super().setUpClass()
         super().set_message(MultipartReply, xid=16,
-                            multipart_type=MultipartTypes.OFPMP_METER_CONFIG,
+                            multipart_type=MultipartType.OFPMP_METER_CONFIG,
                             flags=MultipartReplyFlags.OFPMPF_REPLY_MORE,
                             body=b'')
         super().set_minimum_size(16)
 
     @staticmethod
-    def get_attributes(multipart_type=MultipartTypes.OFPMP_DESC,
+    def get_attributes(multipart_type=MultipartType.OFPMP_DESC,
                        flags=MultipartReplyFlags.OFPMPF_REPLY_MORE,
                        body=b''):
         """Method used to return a dict with instance paramenters."""
@@ -35,5 +35,5 @@ def test_pack_unpack_desc(self):
                          serial_num="SERIAL NUMBER",
                          dp_desc="DATAPATH DESCRIPTION")
         options = TestMultipartReply.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_DESC, body=instances)
+            multipart_type=MultipartType.OFPMP_DESC, body=instances)
         self._test_pack_unpack(**options)

tests/v0x04/test_controller2switch/test_multipart_request.py

@@ -1,6 +1,6 @@
 """MultipartRequest message test."""
 from pyof.v0x04.controller2switch.multipart_request import (
-    MultipartRequest, MultipartRequestFlags, MultipartTypes, PortStatsRequest,
+    MultipartRequest, MultipartRequestFlags, MultipartType, PortStatsRequest,
     TableFeatures)
 from tests.v0x04.test_struct import TestStruct
 
@@ -14,13 +14,13 @@ def setUpClass(cls):
         super().setUpClass()
 
         super().set_message(MultipartRequest, xid=16,
-                            multipart_type=MultipartTypes.OFPMP_TABLE_FEATURES,
+                            multipart_type=MultipartType.OFPMP_TABLE_FEATURES,
                             flags=MultipartRequestFlags.OFPMPF_REQ_MORE,
                             body=b'')
         super().set_minimum_size(16)
 
     @staticmethod
-    def get_attributes(multipart_type=MultipartTypes.OFPMP_DESC,
+    def get_attributes(multipart_type=MultipartType.OFPMP_DESC,
                        flags=MultipartRequestFlags.OFPMPF_REQ_MORE,
                        body=b''):
         """Method used to return a dict with instance paramenters."""
@@ -30,26 +30,26 @@ def get_attributes(multipart_type=MultipartTypes.OFPMP_DESC,
     def test_pack_unpack_desc(self):
         """Testing multipart_type with OFPMP_DESC."""
         options = TestMultipartRequest.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_DESC)
+            multipart_type=MultipartType.OFPMP_DESC)
         self._test_pack_unpack(**options)
 
     def test_pack_unpack_table(self):
         """Testing multipart_type with OFPMP_TABLE."""
         options = TestMultipartRequest.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_TABLE)
+            multipart_type=MultipartType.OFPMP_TABLE)
         self._test_pack_unpack(**options)
 
     def test_pack_unpack__port_stats_request(self):
         """Testing multipart_type with OFPMP_PORT_STATS."""
         options = TestMultipartRequest.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_PORT_STATS,
+            multipart_type=MultipartType.OFPMP_PORT_STATS,
             body=PortStatsRequest(port_no=33))
         self._test_pack_unpack(**options)
 
     def test_pack_unpack_port_desc(self):
         """Testing multipart_type with OFPMP_PORT_DESC."""
         options = TestMultipartRequest.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_PORT_DESC)
+            multipart_type=MultipartType.OFPMP_PORT_DESC)
         self._test_pack_unpack(**options)
 
     def test_pack_unpack_table_features(self):
@@ -58,6 +58,6 @@ def test_pack_unpack_table_features(self):
                     TableFeatures(table_id=6),
                     TableFeatures(table_id=4)]
         options = TestMultipartRequest.get_attributes(
-            multipart_type=MultipartTypes.OFPMP_TABLE_FEATURES,
+            multipart_type=MultipartType.OFPMP_TABLE_FEATURES,
             body=instance)
         self._test_pack_unpack(**options)