Merge "Use flake8-import-order plugin"

neutron_lbaas/cmd/__init__.py

@@ -10,11 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
-eventlet.monkey_patch()
-
 import logging as sys_logging
 
+import eventlet
+eventlet.monkey_patch()
 from oslo_reports import guru_meditation_report as gmr
 
 from neutron_lbaas import version

neutron_lbaas/drivers/driver_mixins.py

@@ -13,6 +13,7 @@
 #    under the License.
 
 import abc
+
 from neutron_lib import constants
 from oslo_log import log as logging
 import six

neutron_lbaas/drivers/netscaler/netscaler_driver_v2.py

@@ -15,12 +15,11 @@
 
 
 import abc
-from oslo_config import cfg
-from oslo_log import log as logging
-
 
 from neutron_lib import constants
 from neutron_lib import context as ncontext
+from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_service import service
 
 from neutron_lbaas._i18n import _

neutron_lbaas/drivers/radware/v2_driver.py

@@ -13,10 +13,10 @@
 #    under the License.
 
 import copy
-import netaddr
 import threading
 import time
 
+import netaddr
 from neutron_lib import constants as n_constants
 from neutron_lib import context
 from neutron_lib.plugins import constants as pg_constants

neutron_lbaas/tests/tempest/plugin.py

@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import neutron_lbaas
 import os
+
 from tempest.test_discover import plugins
 
+import neutron_lbaas
 from neutron_lbaas.tests.tempest import config as lbaas_config
 
 

neutron_lbaas/tests/unit/agent/test_agent_api.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import copy
+
 import mock
 
 from neutron_lbaas.agent import agent_api as api

neutron_lbaas/tests/unit/agent/test_agent_manager.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import collections
+
 import mock
 from neutron_lib import constants
 

neutron_lbaas/tests/unit/drivers/f5/test_driver_v2.py

@@ -13,9 +13,10 @@
 # limitations under the License.
 #
 
-import mock
 import sys
 
+import mock
+
 from neutron_lbaas.tests.unit.db.loadbalancer import test_db_loadbalancerv2
 from neutron_lib import context
 

neutron_lbaas/tests/unit/drivers/octavia/test_octavia_driver.py

@@ -13,14 +13,15 @@
 #    under the License.
 
 import copy
+
 import mock
+from neutron_lib import context
 from oslo_config import cfg
 
 from neutron_lbaas.drivers.octavia import driver
 from neutron_lbaas.services.loadbalancer import constants
 from neutron_lbaas.services.loadbalancer import data_models
 from neutron_lbaas.tests.unit.db.loadbalancer import test_db_loadbalancerv2
-from neutron_lib import context
 
 
 class ManagerTest(object):

neutron_lbaas/tests/unit/drivers/radware/test_v2_plugin_driver.py

@@ -14,12 +14,12 @@
 
 import contextlib
 import copy
+import re
+
 import mock
 from neutron_lib import context
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
-import re
-
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from six.moves import queue as Queue

test-requirements.txt

@@ -6,6 +6,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
+flake8-import-order==0.12 # LGPLv3
 python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=1.1.0 # Apache-2.0
 sphinx>=1.6.2 # BSD

tox.ini

@@ -54,6 +54,7 @@ ignore = E125,E126,E128,E129,E265,H404,H405,N524,N530,N531
 show-source = true
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,.tmp,.ropeproject,rally-scenarios,neutron_lbaas/tests/tempest/lib
+import-order-style = pep8
 
 [hacking]
 import_exceptions = neutron_lbaas._i18n