Merge pull request #322 from macartur/improving_multipart_structures

Improving multipart structures

Author: beraldoleal

docs/conf.py

@@ -12,8 +12,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+
 import sphinx_bootstrap_theme
 
 # If extensions (or modules to document with autodoc) are in another directory,

pyof/v0x01/asynchronous/error_msg.py

@@ -10,7 +10,6 @@
 from pyof.v0x01 import common
 from pyof.v0x01.common.header import Header, Type
 
-
 __all__ = ('ErrorMsg', 'ErrorType', 'BadActionCode', 'BadRequestCode',
            'FlowModFailedCode', 'HelloFailedCode', 'PortModFailedCode',
            'QueueOpFailedCode')

pyof/v0x01/common/action.py

@@ -4,8 +4,8 @@
 
 # Local source tree imports
 from pyof.foundation.base import GenericBitMask, GenericStruct
-from pyof.foundation.basic_types import (HWAddress, Pad, UBInt8, UBInt16,
-                                         UBInt32)
+from pyof.foundation.basic_types import (FixedTypeList, HWAddress, Pad, UBInt8,
+                                         UBInt16, UBInt32)
 from pyof.foundation.constants import UBINT16_MAX_VALUE
 
 # Third-party imports
@@ -312,3 +312,18 @@ def __init__(self, length=None, vendor=None):
         """
         super().__init__(action_type=ActionType.OFPAT_VENDOR, length=length)
         self.vendor = vendor
+
+
+class ListOfActions(FixedTypeList):
+    """List of actions.
+
+    Represented by instances of ActionHeader and used on ActionHeader objects.
+    """
+
+    def __init__(self, items=None):
+        """The constructor just assings parameters to object attributes.
+
+        Args:
+            items (ActionHeader): Instance or a list of instances.
+        """
+        super().__init__(pyof_class=ActionHeader, items=items)

pyof/v0x01/common/flow_match.py

@@ -6,8 +6,8 @@
 
 # Local source tree imports
 from pyof.foundation.base import GenericBitMask, GenericStruct
-from pyof.foundation.basic_types import (HWAddress, IPAddress, Pad,
-                                         UBInt8, UBInt16, UBInt32)
+from pyof.foundation.basic_types import (HWAddress, IPAddress, Pad, UBInt8,
+                                         UBInt16, UBInt32)
 
 __all__ = ('Match', 'FlowWildCards')
 

pyof/v0x01/controller2switch/common.py

@@ -4,12 +4,12 @@
 from enum import Enum
 
 from pyof.foundation.base import GenericMessage, GenericStruct
-from pyof.foundation.basic_types import (Char, FixedTypeList, Pad, UBInt8,
-                                         UBInt16, UBInt32, UBInt64)
+from pyof.foundation.basic_types import (Char, Pad, UBInt8, UBInt16, UBInt32,
+                                         UBInt64)
 from pyof.foundation.constants import (DESC_STR_LEN, OFP_MAX_TABLE_NAME_LEN,
                                        SERIAL_NUM_LEN)
 # Local source tree imports
-from pyof.v0x01.common.action import ActionHeader
+from pyof.v0x01.common.action import ListOfActions
 from pyof.v0x01.common.flow_match import FlowWildCards, Match
 from pyof.v0x01.common.header import Header
 from pyof.v0x01.common.phy_port import Port
@@ -86,21 +86,6 @@ def __init__(self, xid=None, flags=None, miss_send_len=None):
         self.miss_send_len = miss_send_len
 
 
-class ListOfActions(FixedTypeList):
-    """List of actions.
-
-    Represented by instances of ActionHeader and used on ActionHeader objects.
-    """
-
-    def __init__(self, items=None):
-        """The constructor just assings parameters to object attributes.
-
-        Args:
-            items (ActionHeader): Instance or a list of instances.
-        """
-        super().__init__(pyof_class=ActionHeader, items=items)
-
-
 class AggregateStatsReply(GenericStruct):
     """Body of reply to OFPST_AGGREGATE request."""
 

pyof/v0x01/controller2switch/flow_mod.py

@@ -2,14 +2,15 @@
 
 # System imports
 from enum import Enum
+
 from pyof.foundation.base import GenericBitMask, GenericMessage
 from pyof.foundation.basic_types import UBInt16, UBInt32, UBInt64
+from pyof.v0x01.common.action import ListOfActions
 from pyof.v0x01.common.constants import NO_BUFFER
 # Local source tree imports
 from pyof.v0x01.common.flow_match import Match
 from pyof.v0x01.common.header import Header, Type
 from pyof.v0x01.common.phy_port import Port
-from pyof.v0x01.controller2switch.common import ListOfActions
 
 # Third-party imports
 

pyof/v0x01/controller2switch/packet_out.py

@@ -4,10 +4,10 @@
 from pyof.foundation.base import GenericMessage
 from pyof.foundation.basic_types import BinaryData, UBInt16, UBInt32
 from pyof.foundation.exceptions import PackException, ValidationError
+from pyof.v0x01.common.action import ListOfActions
 from pyof.v0x01.common.constants import NO_BUFFER
 from pyof.v0x01.common.header import Header, Type
 from pyof.v0x01.common.phy_port import Port
-from pyof.v0x01.controller2switch.common import ListOfActions
 
 __all__ = ('PacketOut',)
 

pyof/v0x01/controller2switch/stats_reply.py

@@ -1,5 +1,6 @@
 """Response the stat request packet from the controller."""
 from importlib import import_module
+
 from pyof.foundation.base import GenericMessage
 from pyof.foundation.basic_types import BinaryData, FixedTypeList, UBInt16
 from pyof.v0x01.common.header import Header, Type

pyof/v0x01/controller2switch/stats_request.py

@@ -5,6 +5,7 @@
 # Third-party imports
 
 from importlib import import_module
+
 from pyof.foundation.base import GenericMessage
 from pyof.foundation.basic_types import BinaryData, FixedTypeList, UBInt16
 # Local imports

pyof/v0x04/common/action.py

@@ -12,7 +12,7 @@
 __all__ = ('ActionExperimenterHeader', 'ActionGroup', 'ActionHeader',
            'ActionMPLSTTL', 'ActionNWTTL', 'ActionOutput', 'ActionPopMPLS',
            'ActionPush', 'ActionSetField', 'ActionSetQueue', 'ActionType',
-           'ControllerMaxLen')
+           'ControllerMaxLen', 'ListOfActions')
 
 # Enums