Change ConfigFlags to singular

Change it to match the project defaults.
Fix #469

Author: renanrodrigo

pyof/v0x01/controller2switch/common.py

@@ -16,7 +16,7 @@
 
 # Third-party imports
 
-__all__ = ('ConfigFlags', 'StatsTypes', 'AggregateStatsReply',
+__all__ = ('ConfigFlag', 'StatsTypes', 'AggregateStatsReply',
            'AggregateStatsRequest', 'DescStats', 'FlowStats',
            'FlowStatsRequest', 'PortStats', 'PortStatsRequest', 'QueueStats',
            'QueueStatsRequest', 'TableStats', 'VendorStats',
@@ -25,7 +25,7 @@
 # Enums
 
 
-class ConfigFlags(IntEnum):
+class ConfigFlag(IntEnum):
     """Configuration Flags. Handling of IP Fragments."""
 
     #: No special handling for fragments
@@ -70,15 +70,15 @@ class SwitchConfig(GenericMessage):
     """Used as base class for SET_CONFIG and GET_CONFIG_REPLY messages."""
 
     header = Header()
-    flags = UBInt16(enum_ref=ConfigFlags)
+    flags = UBInt16(enum_ref=ConfigFlag)
     miss_send_len = UBInt16()
 
     def __init__(self, xid=None, flags=None, miss_send_len=None):
         """Create a SwitchConfig with the optional parameters below.
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (ConfigFlags): OFPC_* flags.
+            flags (ConfigFlag): OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.
         """

pyof/v0x01/controller2switch/get_config_reply.py

@@ -18,7 +18,7 @@ def __init__(self, xid=None, flags=None, miss_send_len=None):
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (~pyof.v0x01.controller2switch.common.ConfigFlags):
+            flags (~pyof.v0x01.controller2switch.common.ConfigFlag):
                 OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.

pyof/v0x01/controller2switch/set_config.py

@@ -19,7 +19,7 @@ def __init__(self, xid=None, flags=None, miss_send_len=None):
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (~pyof.v0x01.controller2switch.common.ConfigFlags):
+            flags (~pyof.v0x01.controller2switch.common.ConfigFlag):
                 OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.

pyof/v0x04/controller2switch/common.py

@@ -18,7 +18,7 @@
 from pyof.v0x04.common.header import Header
 from pyof.v0x04.controller2switch.table_mod import Table
 
-__all__ = ('ConfigFlags', 'ControllerRole', 'Bucket', 'BucketCounter',
+__all__ = ('ConfigFlag', 'ControllerRole', 'Bucket', 'BucketCounter',
            'ExperimenterMultipartHeader', 'MultipartType',
            'TableFeaturePropType', 'Property', 'InstructionsProperty',
            'NextTablesProperty', 'ActionsProperty', 'OxmProperty',
@@ -27,7 +27,7 @@
 # Enum
 
 
-class ConfigFlags(IntEnum):
+class ConfigFlag(IntEnum):
     """Handling of IP fragments."""
 
     #: No special handling for fragments.
@@ -338,16 +338,16 @@ class SwitchConfig(GenericMessage):
 
     #: OpenFlow :class:`~pyof.v0x04.common.header.Header`
     header = Header()
-    flags = UBInt16(enum_ref=ConfigFlags)
+    flags = UBInt16(enum_ref=ConfigFlag)
     miss_send_len = UBInt16()
 
-    def __init__(self, xid=None, flags=ConfigFlags.OFPC_FRAG_NORMAL,
+    def __init__(self, xid=None, flags=ConfigFlag.OFPC_FRAG_NORMAL,
                  miss_send_len=ControllerMaxLen.OFPCML_NO_BUFFER):
         """Create a SwitchConfig with the optional parameters below.
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (ConfigFlags): OFPC_* flags.
+            flags (ConfigFlag): OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.
         """

pyof/v0x04/controller2switch/get_config_reply.py

@@ -18,7 +18,7 @@ def __init__(self, xid=None, flags=None, miss_send_len=None):
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (~pyof.v0x04.controller2switch.common.ConfigFlags):
+            flags (~pyof.v0x04.controller2switch.common.ConfigFlag):
                 OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.

pyof/v0x04/controller2switch/set_config.py

@@ -7,21 +7,21 @@
 # Local imports
 from pyof.v0x04.common.action import ControllerMaxLen
 from pyof.v0x04.common.header import Type
-from pyof.v0x04.controller2switch.common import ConfigFlags, SwitchConfig
+from pyof.v0x04.controller2switch.common import ConfigFlag, SwitchConfig
 
 __all__ = ('SetConfig',)
 
 
 class SetConfig(SwitchConfig):
     """Set config message."""
 
-    def __init__(self, xid=None, flags=ConfigFlags.OFPC_FRAG_NORMAL,
+    def __init__(self, xid=None, flags=ConfigFlag.OFPC_FRAG_NORMAL,
                  miss_send_len=ControllerMaxLen.OFPCML_NO_BUFFER):
         """Create a SetConfig with the optional parameters below.
 
         Args:
             xid (int): xid to be used on the message header.
-            flags (:class:`~pyof.v0x01.controller2switch.common.ConfigFlags`):
+            flags (:class:`~pyof.v0x01.controller2switch.common.ConfigFlag`):
                 OFPC_* flags.
             miss_send_len (int): UBInt16 max bytes of new flow that the
                 datapath should send to the controller.

tests/v0x01/test_controller2switch/test_get_config_reply.py

@@ -1,5 +1,5 @@
 """Test GetConfigReply message."""
-from pyof.v0x01.controller2switch.common import ConfigFlags
+from pyof.v0x01.controller2switch.common import ConfigFlag
 from pyof.v0x01.controller2switch.get_config_reply import GetConfigReply
 from tests.test_struct import TestStruct
 
@@ -13,6 +13,6 @@ def setUpClass(cls):
         super().setUpClass()
         super().set_raw_dump_file('v0x01', 'ofpt_get_config_reply')
         super().set_raw_dump_object(GetConfigReply, xid=13,
-                                    flags=ConfigFlags.OFPC_FRAG_REASM,
+                                    flags=ConfigFlag.OFPC_FRAG_REASM,
                                     miss_send_len=1024)
         super().set_minimum_size(12)

tests/v0x01/test_controller2switch/test_set_config.py

@@ -1,5 +1,5 @@
 """Set Config message tests."""
-from pyof.v0x01.controller2switch.common import ConfigFlags
+from pyof.v0x01.controller2switch.common import ConfigFlag
 from pyof.v0x01.controller2switch.set_config import SetConfig
 from tests.test_struct import TestStruct
 
@@ -13,6 +13,6 @@ def setUpClass(cls):
         super().setUpClass()
         super().set_raw_dump_file('v0x01', 'ofpt_set_config')
         super().set_raw_dump_object(SetConfig, xid=3,
-                                    flags=ConfigFlags.OFPC_FRAG_NORMAL,
+                                    flags=ConfigFlag.OFPC_FRAG_NORMAL,
                                     miss_send_len=128)
         super().set_minimum_size(12)