Use flake8-import-order plugin

This enables us to automate the import order validations.
TrivialFix

Change-Id: Icb9bc9e10f7d4652cbe02ea902a0581f2feda7da

networking_ovn/common/ovn_client.py

@@ -15,8 +15,8 @@
 
 import collections
 import copy
-import netaddr
 
+import netaddr
 from neutron_lib.api.definitions import l3
 from neutron_lib.api.definitions import port_security as psec
 from neutron_lib import constants as const

networking_ovn/l3/l3_ovn_scheduler.py

@@ -14,9 +14,9 @@
 
 import abc
 import random
-import six
 
 from oslo_log import log
+import six
 
 from networking_ovn.common import config as ovn_config
 from networking_ovn.common import constants as ovn_const

networking_ovn/ovn_db_sync.py

@@ -11,10 +11,11 @@
 #    under the License.
 
 import abc
-
 from datetime import datetime
-from eventlet import greenthread
 import itertools
+
+from eventlet import greenthread
+from neutron.services.segments import db as segments_db
 from neutron_lib.api.definitions import l3
 from neutron_lib.api.definitions import provider_net as pnet
 from neutron_lib import constants
@@ -23,15 +24,13 @@ from neutron_lib.plugins import constants as plugin_constants
 from neutron_lib.plugins import directory
 from neutron_lib.utils import helpers
 from oslo_log import log
-
-from neutron.services.segments import db as segments_db
+import six
 
 from networking_ovn.common import acl as acl_utils
 from networking_ovn.common import config
 from networking_ovn.common import constants as const
 from networking_ovn.common import ovn_client
 from networking_ovn.common import utils
-import six
 
 LOG = log.getLogger(__name__)
 

networking_ovn/ovsdb/ovn_api.py

@@ -11,9 +11,9 @@
 #    under the License.
 
 import abc
-import six
 
 from ovsdbapp import api
+import six
 
 
 @six.add_metaclass(abc.ABCMeta)

networking_ovn/ovsdb/ovsdb_monitor.py

@@ -13,22 +13,22 @@
 #    under the License.
 
 import atexit
-from eventlet import greenthread
-from six.moves import queue
 import threading
 
+from eventlet import greenthread
+from neutron.common import config
+from neutron_lib.plugins import constants
+from neutron_lib.plugins import directory
+from neutron_lib.utils import helpers
+from neutron_lib import worker
 from oslo_log import log
 from ovs.stream import Stream
 from ovsdbapp.backend.ovs_idl import connection
 from ovsdbapp.backend.ovs_idl import idlutils
+from six.moves import queue
 
 from networking_ovn.common import config as ovn_config
 from networking_ovn.ovsdb import row_event
-from neutron.common import config
-from neutron_lib.plugins import constants
-from neutron_lib.plugins import directory
-from neutron_lib.utils import helpers
-from neutron_lib import worker
 
 LOG = log.getLogger(__name__)
 

networking_ovn/tests/functional/base.py

@@ -12,10 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import fixtures
-import mock
 import time
 
+import fixtures
+import mock
+from neutron.plugins.ml2 import config
+from neutron.plugins.ml2.drivers import type_geneve  # noqa
+from neutron.tests.unit.plugins.ml2 import test_plugin
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
 from oslo_config import cfg
@@ -25,10 +28,6 @@ from ovsdbapp.backend.ovs_idl import command
 from ovsdbapp.backend.ovs_idl import connection
 from ovsdbapp.backend.ovs_idl import transaction
 
-from neutron.plugins.ml2 import config
-from neutron.plugins.ml2.drivers import type_geneve  # noqa
-from neutron.tests.unit.plugins.ml2 import test_plugin
-
 from networking_ovn.ovsdb import impl_idl_ovn
 from networking_ovn.ovsdb import ovsdb_monitor
 from networking_ovn.tests.functional.resources import process

networking_ovn/tests/functional/resources/process.py

@@ -14,14 +14,13 @@
 
 
 from distutils import spawn
+import os
 
 import fixtures
-import os
+from neutron.agent.linux import utils
 import psutil
 import tenacity
 
-from neutron.agent.linux import utils
-
 
 class OvsdbServer(fixtures.Fixture):
 

networking_ovn/tests/unit/common/test_acl.py

@@ -13,8 +13,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from neutron_lib import constants as const
 
 from networking_ovn.common import acl as ovn_acl

networking_ovn/tests/unit/fakes.py

@@ -13,8 +13,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from oslo_utils import uuidutils
 
 

networking_ovn/tests/unit/l3/test_l3_ovn.py

@@ -13,19 +13,18 @@
 #
 
 import copy
-import mock
 
+import mock
+from neutron.tests.unit.api import test_extensions
+from neutron.tests.unit.extensions import test_extraroute
+from neutron.tests.unit.extensions import test_l3
+from neutron.tests.unit.extensions import test_l3_ext_gw_mode as test_l3_gw
 from neutron_lib import constants
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import constants as plugin_constants
 from neutron_lib.plugins import directory
 from oslo_config import cfg
 
-from neutron.tests.unit.api import test_extensions
-from neutron.tests.unit.extensions import test_extraroute
-from neutron.tests.unit.extensions import test_l3
-from neutron.tests.unit.extensions import test_l3_ext_gw_mode as test_l3_gw
-
 from networking_ovn.tests.unit import fakes
 from networking_ovn.tests.unit.ml2 import test_mech_driver
 

networking_ovn/tests/unit/l3/test_l3_ovn_scheduler.py

@@ -12,9 +12,9 @@
 #    under the License.
 #
 
-import mock
 import random
 
+import mock
 from neutron.tests import base
 
 from networking_ovn.common import constants as ovn_const

networking_ovn/tests/unit/ovsdb/test_impl_idl_ovn.py

@@ -13,6 +13,7 @@
 #
 
 import copy
+
 import mock
 
 from networking_ovn.common import config

networking_ovn/tests/unit/ovsdb/test_ovsdb_monitor.py

@@ -13,13 +13,12 @@
 #    under the License.
 
 import copy
-import mock
 import os
 
-from oslo_utils import uuidutils
-
+import mock
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
+from oslo_utils import uuidutils
 from ovs.db import idl as ovs_idl
 from ovs import poller
 from ovs.stream import Stream

test-requirements.txt

@@ -5,6 +5,7 @@
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
+flake8-import-order==0.12 # LGPLv3
 python-subunit>=0.0.18 # Apache-2.0/BSD
 sphinx>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0

tox.ini

@@ -90,6 +90,7 @@ extensions = .rst
 show-source = True
 ignore = E123,E125,N530
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.tmp
+import-order-style = pep8
 
 [hacking]
 import_exceptions = networking_ovn