Fixing tests and Pylama warnings

macartur · macartur · commit 8344d1c579b8 · 2017-03-21T11:50:52.000-03:00
diff --git a/tests/test_struct.py b/tests/test_struct.py
@@ -1,5 +1,6 @@
 """Automate struct tests."""
 import unittest
+
 from tests.raw_dump import RawDump
 
 
diff --git a/tests/v0x01/test_asynchronous/test_error_msg.py b/tests/v0x01/test_asynchronous/test_error_msg.py
@@ -2,6 +2,7 @@
 from pyof.foundation.basic_types import BinaryData
 from pyof.v0x01.asynchronous.error_msg import (BadRequestCode, ErrorMsg,
                                                ErrorType)
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_asynchronous/test_packet_in.py b/tests/v0x01/test_asynchronous/test_packet_in.py
@@ -1,5 +1,6 @@
 """Packet in message tests."""
 from pyof.v0x01.asynchronous.packet_in import PacketIn, PacketInReason
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_asynchronous/test_port_status.py b/tests/v0x01/test_asynchronous/test_port_status.py
@@ -4,6 +4,7 @@
 from pyof.v0x01.asynchronous.port_status import PortReason, PortStatus
 from pyof.v0x01.common.phy_port import (PhyPort, PortConfig, PortFeatures,
                                         PortState)
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_common/test_action.py b/tests/v0x01/test_common/test_action.py
@@ -5,6 +5,7 @@
                                       ActionVendorHeader, ActionVlanPCP,
                                       ActionVlanVid)
 from pyof.v0x01.common.phy_port import Port
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_barrier_reply.py b/tests/v0x01/test_controller2switch/test_barrier_reply.py
@@ -1,5 +1,6 @@
 """Barrier reply message tests."""
 from pyof.v0x01.controller2switch.barrier_reply import BarrierReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_barrier_request.py b/tests/v0x01/test_controller2switch/test_barrier_request.py
@@ -1,5 +1,6 @@
 """Barrier request message tests."""
 from pyof.v0x01.controller2switch.barrier_request import BarrierRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_features_reply.py b/tests/v0x01/test_controller2switch/test_features_reply.py
@@ -2,6 +2,7 @@
 from pyof.foundation.basic_types import DPID, HWAddress
 from pyof.v0x01.common.phy_port import PhyPort, PortConfig, PortState
 from pyof.v0x01.controller2switch.features_reply import FeaturesReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_features_request.py b/tests/v0x01/test_controller2switch/test_features_request.py
@@ -1,5 +1,6 @@
 """Feature request message tests."""
 from pyof.v0x01.controller2switch.features_request import FeaturesRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_flow_mod.py b/tests/v0x01/test_controller2switch/test_flow_mod.py
@@ -3,6 +3,7 @@
 from pyof.v0x01.common.flow_match import Match
 from pyof.v0x01.common.phy_port import Port
 from pyof.v0x01.controller2switch.flow_mod import FlowMod, FlowModCommand
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_packet_out.py b/tests/v0x01/test_controller2switch/test_packet_out.py
@@ -3,6 +3,7 @@
 from pyof.v0x01.common.action import ActionOutput
 from pyof.v0x01.common.phy_port import Port
 from pyof.v0x01.controller2switch.packet_out import PacketOut
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_controller2switch/test_set_config.py b/tests/v0x01/test_controller2switch/test_set_config.py
@@ -1,6 +1,7 @@
 """Set Config message tests."""
 from pyof.v0x01.controller2switch.common import ConfigFlags
 from pyof.v0x01.controller2switch.set_config import SetConfig
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_symmetric/test_echo_reply.py b/tests/v0x01/test_symmetric/test_echo_reply.py
@@ -1,5 +1,6 @@
 """Echo reply message tests."""
 from pyof.v0x01.symmetric.echo_reply import EchoReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_symmetric/test_echo_request.py b/tests/v0x01/test_symmetric/test_echo_request.py
@@ -1,5 +1,6 @@
 """Echo request message tests."""
 from pyof.v0x01.symmetric.echo_request import EchoRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_symmetric/test_hello.py b/tests/v0x01/test_symmetric/test_hello.py
@@ -1,5 +1,6 @@
 """Hello message tests."""
 from pyof.v0x01.symmetric.hello import Hello
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x01/test_symmetric/test_vendor_header.py b/tests/v0x01/test_symmetric/test_vendor_header.py
@@ -1,5 +1,6 @@
 """Testing VendorHeader message."""
 from pyof.v0x01.symmetric.vendor_header import VendorHeader
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_asynchronous/test_error_msg.py b/tests/v0x04/test_asynchronous/test_error_msg.py
@@ -1,5 +1,6 @@
 """Testing v0x04 error message class."""
 from pyof.v0x04.asynchronous.error_msg import ErrorMsg
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_asynchronous/test_flow_removed.py b/tests/v0x04/test_asynchronous/test_flow_removed.py
@@ -1,6 +1,7 @@
 """Testing v0x04 FlowRemoved message."""
 from pyof.v0x04.asynchronous.flow_removed import FlowRemoved
 from pyof.v0x04.common.flow_match import Match
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_asynchronous/test_packet_in.py b/tests/v0x04/test_asynchronous/test_packet_in.py
@@ -1,5 +1,6 @@
 """Packet in message tests."""
 from pyof.v0x04.asynchronous.packet_in import PacketIn, PacketInReason
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_asynchronous/test_port_status.py b/tests/v0x04/test_asynchronous/test_port_status.py
@@ -3,6 +3,7 @@
 from pyof.foundation.constants import OFP_MAX_PORT_NAME_LEN
 from pyof.v0x04.asynchronous.port_status import PortReason, PortStatus
 from pyof.v0x04.common.port import Port, PortConfig, PortFeatures, PortState
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_common/test_port.py b/tests/v0x04/test_common/test_port.py
@@ -1,5 +1,6 @@
 """Test of Port class from common module."""
 from pyof.v0x04.common.port import Port
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_common/test_queue.py b/tests/v0x04/test_common/test_queue.py
@@ -2,6 +2,7 @@
 from pyof.v0x04.common.queue import (PacketQueue, QueuePropExperimenter,
                                      QueuePropHeader, QueuePropMaxRate,
                                      QueuePropMinRate)
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_common/test_table_feature.py b/tests/v0x04/test_common/test_table_feature.py
@@ -7,6 +7,7 @@
 from pyof.v0x04.controller2switch.multipart_reply import (MultipartReply,
                                                           MultipartReplyFlags,
                                                           MultipartTypes)
+
 from tests.v0x04.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_barrier_reply.py b/tests/v0x04/test_controller2switch/test_barrier_reply.py
@@ -1,5 +1,6 @@
 """Barrier reply message tests."""
 from pyof.v0x04.controller2switch.barrier_reply import BarrierReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_barrier_request.py b/tests/v0x04/test_controller2switch/test_barrier_request.py
@@ -1,5 +1,6 @@
 """Barrier request message tests."""
 from pyof.v0x04.controller2switch.barrier_request import BarrierRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_flow_stats.py b/tests/v0x04/test_controller2switch/test_flow_stats.py
@@ -1,5 +1,6 @@
 """Flow stats message."""
-from pyof.v0x04.controller2switch.common import FlowStats
+from pyof.v0x04.controller2switch.common.multipart import FlowStats
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_flow_stats_request.py b/tests/v0x04/test_controller2switch/test_flow_stats_request.py
@@ -1,5 +1,6 @@
 """Flow stats request message."""
-from pyof.v0x04.controller2switch.common import FlowStatsRequest
+from pyof.v0x04.controller2switch.common.multipart import FlowStatsRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_get_async_reply.py b/tests/v0x04/test_controller2switch/test_get_async_reply.py
@@ -1,5 +1,6 @@
 """GetAsyncReply message tests."""
 from pyof.v0x04.controller2switch.get_async_reply import GetAsyncReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_get_async_request.py b/tests/v0x04/test_controller2switch/test_get_async_request.py
@@ -1,5 +1,6 @@
 """GetAsyncRequest message tests."""
 from pyof.v0x04.controller2switch.get_async_request import GetAsyncRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_get_config_reply.py b/tests/v0x04/test_controller2switch/test_get_config_reply.py
@@ -1,5 +1,6 @@
 """Config Reply message tests."""
 from pyof.v0x04.controller2switch.get_config_reply import GetConfigReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_get_config_request.py b/tests/v0x04/test_controller2switch/test_get_config_request.py
@@ -1,5 +1,6 @@
 """Config Request message tests."""
 from pyof.v0x04.controller2switch.get_config_request import GetConfigRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_group_mod.py b/tests/v0x04/test_controller2switch/test_group_mod.py
@@ -1,7 +1,7 @@
 """group_mod tests."""
 from unittest import TestCase
 
-from pyof.v0x04.controller2switch.common import Bucket
+from pyof.v0x04.controller2switch.common.bucket import Bucket
 from pyof.v0x04.controller2switch.group_mod import GroupMod
 
 
diff --git a/tests/v0x04/test_controller2switch/test_meter_features.py b/tests/v0x04/test_controller2switch/test_meter_features.py
@@ -1,6 +1,7 @@
 """Test of v0x04 meter features module."""
 
-from pyof.v0x04.controller2switch.common import MeterFeatures, MultipartTypes
+from pyof.v0x04.controller2switch.common.multipart import (MeterFeatures,
+                                                           MultipartTypes)
 from pyof.v0x04.controller2switch.meter_mod import MeterBandType, MeterFlags
 from pyof.v0x04.controller2switch.multipart_reply import (MultipartReply,
                                                           MultipartReplyFlags)
diff --git a/tests/v0x04/test_controller2switch/test_meter_stats.py b/tests/v0x04/test_controller2switch/test_meter_stats.py
@@ -1,10 +1,11 @@
 """Test of v0x04 meter stats module."""
 
 
-from pyof.v0x04.controller2switch.common import BandStats, MeterStats
+from pyof.v0x04.controller2switch.common.multipart import BandStats, MeterStats
 from pyof.v0x04.controller2switch.multipart_reply import (MultipartReply,
                                                           MultipartReplyFlags,
                                                           MultipartTypes)
+
 from tests.v0x04.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_multipart_reply.py b/tests/v0x04/test_controller2switch/test_multipart_reply.py
@@ -3,6 +3,7 @@
 from pyof.v0x04.controller2switch.common import MultipartTypes
 from pyof.v0x04.controller2switch.multipart_reply import (MultipartReply,
                                                           MultipartReplyFlags)
+
 from tests.v0x04.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_multipart_request.py b/tests/v0x04/test_controller2switch/test_multipart_request.py
@@ -1,5 +1,6 @@
 """MultipartRequest message test."""
 from pyof.v0x04.controller2switch.multipart_request import MultipartRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_packet_out.py b/tests/v0x04/test_controller2switch/test_packet_out.py
@@ -4,6 +4,7 @@
 from pyof.foundation.exceptions import ValidationError
 from pyof.v0x04.common.port import PortNo
 from pyof.v0x04.controller2switch.packet_out import PacketOut
+
 from tests.test_struct import TestStruct
 
 log = logging.getLogger()
diff --git a/tests/v0x04/test_controller2switch/test_port_stats.py b/tests/v0x04/test_controller2switch/test_port_stats.py
@@ -1,5 +1,6 @@
 """Config Port Stats message tests."""
-from pyof.v0x04.controller2switch.common import PortStats
+from pyof.v0x04.controller2switch.common.multipart import PortStats
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_port_stats_request.py b/tests/v0x04/test_controller2switch/test_port_stats_request.py
@@ -1,5 +1,6 @@
 """Config Port Stats Request message tests."""
-from pyof.v0x04.controller2switch.common import PortStatsRequest
+from pyof.v0x04.controller2switch.common.multipart import PortStatsRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_queue_get_config_reply.py b/tests/v0x04/test_controller2switch/test_queue_get_config_reply.py
@@ -2,6 +2,7 @@
 from pyof.v0x04.common.queue import ListOfQueues, PacketQueue
 from pyof.v0x04.controller2switch.queue_get_config_reply import \
     QueueGetConfigReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_queue_get_config_request.py b/tests/v0x04/test_controller2switch/test_queue_get_config_request.py
@@ -1,6 +1,7 @@
 """Testing QueueGetConfigRequest message."""
 from pyof.v0x04.controller2switch.queue_get_config_request import \
     QueueGetConfigRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_queue_stats.py b/tests/v0x04/test_controller2switch/test_queue_stats.py
@@ -1,5 +1,6 @@
 """Stats queue message."""
-from pyof.v0x04.controller2switch.common import QueueStats
+from pyof.v0x04.controller2switch.common.multipart import QueueStats
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_queue_stats_request.py b/tests/v0x04/test_controller2switch/test_queue_stats_request.py
@@ -1,5 +1,6 @@
 """Queue Stat Request message."""
-from pyof.v0x04.controller2switch.common import QueueStatsRequest
+from pyof.v0x04.controller2switch.common.multipart import QueueStatsRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_role_reply.py b/tests/v0x04/test_controller2switch/test_role_reply.py
@@ -1,5 +1,6 @@
 """RoleReply message tests."""
 from pyof.v0x04.controller2switch.role_reply import RoleReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_role_request.py b/tests/v0x04/test_controller2switch/test_role_request.py
@@ -1,5 +1,6 @@
 """RoleRequest message tests."""
 from pyof.v0x04.controller2switch.role_request import RoleRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_set_async.py b/tests/v0x04/test_controller2switch/test_set_async.py
@@ -1,5 +1,6 @@
 """SetAsync message tests."""
 from pyof.v0x04.controller2switch.set_async import SetAsync
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_controller2switch/test_table_stats.py b/tests/v0x04/test_controller2switch/test_table_stats.py
@@ -1,5 +1,6 @@
 """Table stats message."""
-from pyof.v0x04.controller2switch.common import TableStats
+from pyof.v0x04.controller2switch.common.multipart import TableStats
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_symmetric/test_echo_reply.py b/tests/v0x04/test_symmetric/test_echo_reply.py
@@ -1,5 +1,6 @@
 """Echo reply message tests."""
 from pyof.v0x04.symmetric.echo_reply import EchoReply
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_symmetric/test_echo_request.py b/tests/v0x04/test_symmetric/test_echo_request.py
@@ -1,5 +1,6 @@
 """Echo request message tests."""
 from pyof.v0x04.symmetric.echo_request import EchoRequest
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_symmetric/test_hello.py b/tests/v0x04/test_symmetric/test_hello.py
@@ -1,5 +1,6 @@
 """Hello message tests."""
 from pyof.v0x04.symmetric.hello import Hello
+
 from tests.test_struct import TestStruct
 
 
diff --git a/tests/v0x04/test_symmetric/test_vendor_header.py b/tests/v0x04/test_symmetric/test_vendor_header.py
@@ -1,5 +1,6 @@
 """Experimenter message tests."""
 from pyof.v0x04.symmetric.experimenter import ExperimenterHeader
+
 from tests.test_struct import TestStruct
 
 
