diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py
index a542bb1c093..0b3adec0004 100644
--- a/neutron/agent/common/ovs_lib.py
+++ b/neutron/agent/common/ovs_lib.py
@@ -16,13 +16,13 @@
 import collections
 import itertools
 import operator
+import uuid
 
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 import retrying
 import six
-import uuid
 
 from neutron._i18n import _, _LE, _LI, _LW
 from neutron.agent.common import utils
diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py
index 58e195ab501..50a4a9e0611 100644
--- a/neutron/agent/dhcp/agent.py
+++ b/neutron/agent/dhcp/agent.py
@@ -17,7 +17,6 @@ import collections
 import os
 
 import eventlet
-
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging
diff --git a/neutron/agent/l3/dvr_fip_ns.py b/neutron/agent/l3/dvr_fip_ns.py
index 6d4cf7bc3dc..edeed6ead94 100644
--- a/neutron/agent/l3/dvr_fip_ns.py
+++ b/neutron/agent/l3/dvr_fip_ns.py
@@ -14,13 +14,14 @@
 
 import os
 
+from oslo_log import log as logging
+
 from neutron.agent.l3 import fip_rule_priority_allocator as frpa
 from neutron.agent.l3 import link_local_allocator as lla
 from neutron.agent.l3 import namespaces
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import iptables_manager
 from neutron.common import utils as common_utils
-from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/neutron/agent/l3/dvr_local_router.py b/neutron/agent/l3/dvr_local_router.py
index 563c88a9220..a7588edecb2 100644
--- a/neutron/agent/l3/dvr_local_router.py
+++ b/neutron/agent/l3/dvr_local_router.py
@@ -14,8 +14,8 @@
 
 import binascii
 import collections
-import netaddr
 
+import netaddr
 from oslo_log import log as logging
 from oslo_utils import excutils
 import six
diff --git a/neutron/agent/l3/router_info.py b/neutron/agent/l3/router_info.py
index 5be46095415..8554f55c812 100644
--- a/neutron/agent/l3/router_info.py
+++ b/neutron/agent/l3/router_info.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import netaddr
-
 from oslo_log import log as logging
 
 from neutron._i18n import _LE, _LW
diff --git a/neutron/agent/l3/router_processing_queue.py b/neutron/agent/l3/router_processing_queue.py
index a0b3fa1d67a..99a3d1c2a12 100644
--- a/neutron/agent/l3/router_processing_queue.py
+++ b/neutron/agent/l3/router_processing_queue.py
@@ -14,9 +14,9 @@
 #
 
 import datetime
-from six.moves import queue as Queue
 
 from oslo_utils import timeutils
+from six.moves import queue as Queue
 
 # Lower value is higher priority
 PRIORITY_RPC = 0
diff --git a/neutron/agent/l3/rt_tables.py b/neutron/agent/l3/rt_tables.py
index 66c9f692efe..d88b5a0030a 100644
--- a/neutron/agent/l3/rt_tables.py
+++ b/neutron/agent/l3/rt_tables.py
@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
 import os
-import six
 
+import netaddr
 from oslo_log import log as logging
+import six
 
 from neutron.agent.common import utils as common_utils
 from neutron.agent.linux import ip_lib
diff --git a/neutron/agent/linux/bridge_lib.py b/neutron/agent/linux/bridge_lib.py
index 625ae9404f8..ba92ea0389c 100644
--- a/neutron/agent/linux/bridge_lib.py
+++ b/neutron/agent/linux/bridge_lib.py
@@ -17,6 +17,7 @@
 #    under the License.
 
 import os
+
 from oslo_log import log as logging
 
 from neutron.agent.linux import ip_lib
diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py
index fc969e51714..a1c6fd1a214 100644
--- a/neutron/agent/linux/external_process.py
+++ b/neutron/agent/linux/external_process.py
@@ -15,13 +15,13 @@
 import abc
 import collections
 import os.path
-import six
 
 import eventlet
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import fileutils
+import six
 
 from neutron._i18n import _, _LW, _LE
 from neutron.agent.common import config as agent_cfg
diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py
index 336c3f4b5e8..a3c5769e157 100644
--- a/neutron/agent/linux/ip_lib.py
+++ b/neutron/agent/linux/ip_lib.py
@@ -13,14 +13,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+import re
+
 import debtcollector
 import eventlet
 import netaddr
-import os
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
-import re
 import six
 
 from neutron._i18n import _, _LE
diff --git a/neutron/agent/linux/pd.py b/neutron/agent/linux/pd.py
index 350b530902b..b612b74f5b4 100644
--- a/neutron/agent/linux/pd.py
+++ b/neutron/agent/linux/pd.py
@@ -13,15 +13,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
 import functools
 import signal
-import six
-
-from stevedore import driver
 
+import eventlet
 from oslo_config import cfg
 from oslo_log import log as logging
+import six
+from stevedore import driver
 
 from neutron._i18n import _
 from neutron.agent.linux import utils as linux_utils
diff --git a/neutron/agent/linux/pd_driver.py b/neutron/agent/linux/pd_driver.py
index 3cdb36abf8c..2aabacdf361 100644
--- a/neutron/agent/linux/pd_driver.py
+++ b/neutron/agent/linux/pd_driver.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import abc
-import six
 
 from oslo_config import cfg
+import six
 
 from neutron._i18n import _
 
diff --git a/neutron/agent/linux/ra.py b/neutron/agent/linux/ra.py
index 9cc0a252806..532be545d29 100644
--- a/neutron/agent/linux/ra.py
+++ b/neutron/agent/linux/ra.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 from itertools import chain as iter_chain
+
 import jinja2
 import netaddr
 from oslo_config import cfg
diff --git a/neutron/agent/ovsdb/impl_idl.py b/neutron/agent/ovsdb/impl_idl.py
index 4ce44c03343..f25ac78e2a8 100644
--- a/neutron/agent/ovsdb/impl_idl.py
+++ b/neutron/agent/ovsdb/impl_idl.py
@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves import queue as Queue
 import time
 
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 from ovs.db import idl
+from six.moves import queue as Queue
 
 from neutron._i18n import _
 from neutron.agent.ovsdb import api
diff --git a/neutron/agent/ovsdb/native/connection.py b/neutron/agent/ovsdb/native/connection.py
index 56cd7cc6553..22724f68a45 100644
--- a/neutron/agent/ovsdb/native/connection.py
+++ b/neutron/agent/ovsdb/native/connection.py
@@ -13,13 +13,13 @@
 #    under the License.
 
 import os
-from six.moves import queue as Queue
 import threading
 import traceback
 
 from ovs.db import idl
 from ovs import poller
 import retrying
+from six.moves import queue as Queue
 
 from neutron.agent.ovsdb.native import helpers
 from neutron.agent.ovsdb.native import idlutils
diff --git a/neutron/api/rpc/handlers/securitygroups_rpc.py b/neutron/api/rpc/handlers/securitygroups_rpc.py
index c6f28e57da4..53dad8638e5 100644
--- a/neutron/api/rpc/handlers/securitygroups_rpc.py
+++ b/neutron/api/rpc/handlers/securitygroups_rpc.py
@@ -12,9 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import oslo_messaging
-
 from oslo_log import log as logging
+import oslo_messaging
 
 from neutron._i18n import _LW
 from neutron.common import constants
diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index 7a757977497..521732e319c 100644
--- a/neutron/api/v2/attributes.py
+++ b/neutron/api/v2/attributes.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import functools
 import re
 
-import functools
 import netaddr
 from oslo_log import log as logging
 from oslo_utils import uuidutils
diff --git a/neutron/common/utils.py b/neutron/common/utils.py
index 98e3bed1201..d0df26b4b7b 100644
--- a/neutron/common/utils.py
+++ b/neutron/common/utils.py
@@ -25,7 +25,6 @@ import errno
 import functools
 import hashlib
 import multiprocessing
-import netaddr
 import os
 import random
 import signal
@@ -36,6 +35,7 @@ import uuid
 
 import debtcollector
 from eventlet.green import subprocess
+import netaddr
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index 23ea98c3746..1f352099a4f 100644
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -13,16 +13,16 @@
 #    under the License.
 
 import itertools
+
 import netaddr
 from oslo_log import log as logging
+from oslo_utils import excutils
 from oslo_utils import uuidutils
+import six
 import sqlalchemy as sa
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
-from oslo_utils import excutils
-import six
-
 from neutron._i18n import _, _LI
 from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
 from neutron.api.v2 import attributes
diff --git a/neutron/extensions/address_scope.py b/neutron/extensions/address_scope.py
index 2fe75141eb0..392cf16f004 100644
--- a/neutron/extensions/address_scope.py
+++ b/neutron/extensions/address_scope.py
@@ -14,13 +14,14 @@
 
 import abc
 
+import six
+
 from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base
 from neutron.common import exceptions as nexception
 from neutron import manager
-import six
 
 ADDRESS_SCOPE = 'address_scope'
 ADDRESS_SCOPES = '%ss' % ADDRESS_SCOPE
diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py
index 18884b3a364..fff7151d11d 100644
--- a/neutron/extensions/allowedaddresspairs.py
+++ b/neutron/extensions/allowedaddresspairs.py
@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_config import cfg
 import webob.exc
 
 from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.common import exceptions as nexception
-from oslo_config import cfg
 
 allowed_address_pair_opts = [
     #TODO(limao): use quota framework when it support quota for attributes
diff --git a/neutron/extensions/dns.py b/neutron/extensions/dns.py
index 93e1ffbbb67..5f37cc0643b 100644
--- a/neutron/extensions/dns.py
+++ b/neutron/extensions/dns.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import re
-import six
 
 from oslo_config import cfg
+import six
 
 from neutron._i18n import _
 from neutron.api import extensions
diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py
index 9ae3806da24..bb74c5c4a62 100644
--- a/neutron/extensions/securitygroup.py
+++ b/neutron/extensions/securitygroup.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import abc
-import netaddr
 
+import netaddr
 from oslo_config import cfg
 from oslo_utils import uuidutils
 import six
diff --git a/neutron/ipam/requests.py b/neutron/ipam/requests.py
index e6367580d10..bb7fa151f41 100644
--- a/neutron/ipam/requests.py
+++ b/neutron/ipam/requests.py
@@ -11,8 +11,8 @@
 #    under the License.
 
 import abc
-import netaddr
 
+import netaddr
 from oslo_config import cfg
 from oslo_utils import uuidutils
 import six
diff --git a/neutron/neutron_plugin_base_v2.py b/neutron/neutron_plugin_base_v2.py
index 18d1503dc84..12ed5bba1e6 100644
--- a/neutron/neutron_plugin_base_v2.py
+++ b/neutron/neutron_plugin_base_v2.py
@@ -21,6 +21,7 @@ methods that needs to be implemented by a v2 Neutron Plug-in.
 """
 
 import abc
+
 import six
 
 
diff --git a/neutron/openstack/common/cache/_backends/memory.py b/neutron/openstack/common/cache/_backends/memory.py
index 0dbb3f665ce..8d14de6eb0d 100644
--- a/neutron/openstack/common/cache/_backends/memory.py
+++ b/neutron/openstack/common/cache/_backends/memory.py
@@ -14,8 +14,8 @@
 
 import collections
 
-from oslo_utils import timeutils
 from oslo_concurrency import lockutils
+from oslo_utils import timeutils
 
 from neutron.openstack.common.cache import backends
 
diff --git a/neutron/plugins/ml2/driver_api.py b/neutron/plugins/ml2/driver_api.py
index 39bc6125998..255475515e4 100644
--- a/neutron/plugins/ml2/driver_api.py
+++ b/neutron/plugins/ml2/driver_api.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import abc
+
 import six
 
 # The following keys are used in the segment dictionaries passed via
diff --git a/neutron/plugins/ml2/drivers/mech_agent.py b/neutron/plugins/ml2/drivers/mech_agent.py
index 4d3fb2eb099..33bc99222f7 100644
--- a/neutron/plugins/ml2/drivers/mech_agent.py
+++ b/neutron/plugins/ml2/drivers/mech_agent.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import abc
-import six
 
 from oslo_log import log
+import six
 
 from neutron._i18n import _LW
 from neutron.extensions import portbindings
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index 6231559c09e..fa728da2265 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -14,12 +14,12 @@
 #    under the License.
 
 import collections
+import functools
 import signal
 import sys
 import time
 import uuid
 
-import functools
 import netaddr
 from oslo_config import cfg
 from oslo_log import log as logging
diff --git a/neutron/plugins/ml2/extensions/port_security.py b/neutron/plugins/ml2/extensions/port_security.py
index a2cb5cdee66..e5e499f3f3c 100644
--- a/neutron/plugins/ml2/extensions/port_security.py
+++ b/neutron/plugins/ml2/extensions/port_security.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from neutron._i18n import _LI
 from neutron.api.v2 import attributes as attrs
 from neutron.common import utils
@@ -20,7 +22,6 @@ from neutron.db import common_db_mixin
 from neutron.db import portsecurity_db_common as ps_db_common
 from neutron.extensions import portsecurity as psec
 from neutron.plugins.ml2 import driver_api as api
-from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/neutron/server/wsgi_eventlet.py b/neutron/server/wsgi_eventlet.py
index 725135503a4..3145be604b7 100644
--- a/neutron/server/wsgi_eventlet.py
+++ b/neutron/server/wsgi_eventlet.py
@@ -12,7 +12,6 @@
 #    under the License.
 
 import eventlet
-
 from oslo_log import log
 
 from neutron._i18n import _LI
diff --git a/neutron/tests/api/admin/test_extension_driver_port_security_admin.py b/neutron/tests/api/admin/test_extension_driver_port_security_admin.py
index 2e28371d2ff..65147f1c38f 100644
--- a/neutron/tests/api/admin/test_extension_driver_port_security_admin.py
+++ b/neutron/tests/api/admin/test_extension_driver_port_security_admin.py
@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest_lib import exceptions as lib_exc
+
 from neutron.tests.api import base
 from neutron.tests.api import base_security_groups as base_security
 from neutron.tests.tempest import test
-from tempest_lib import exceptions as lib_exc
 
 
 class PortSecurityAdminTests(base_security.BaseSecGroupTest,
diff --git a/neutron/tests/api/admin/test_floating_ips_admin_actions.py b/neutron/tests/api/admin/test_floating_ips_admin_actions.py
index b95cfe4aad6..750cf9ae9b8 100644
--- a/neutron/tests/api/admin/test_floating_ips_admin_actions.py
+++ b/neutron/tests/api/admin/test_floating_ips_admin_actions.py
@@ -12,10 +12,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import testtools
 
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
+import testtools
 
 from neutron.tests.api import base
 from neutron.tests.api import clients
diff --git a/neutron/tests/api/test_dhcp_ipv6.py b/neutron/tests/api/test_dhcp_ipv6.py
index 0cc2d76353c..89adfb0beae 100644
--- a/neutron/tests/api/test_dhcp_ipv6.py
+++ b/neutron/tests/api/test_dhcp_ipv6.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
 import random
 
+import netaddr
 import six
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
diff --git a/neutron/tests/api/test_routers_negative.py b/neutron/tests/api/test_routers_negative.py
index f87f4ae1acd..42ad1e54edc 100644
--- a/neutron/tests/api/test_routers_negative.py
+++ b/neutron/tests/api/test_routers_negative.py
@@ -14,10 +14,9 @@
 #    under the License.
 
 import netaddr
-import testtools
-
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
+import testtools
 
 from neutron.tests.api import base_routers as base
 from neutron.tests.tempest import config
diff --git a/neutron/tests/api/test_subnetpools_negative.py b/neutron/tests/api/test_subnetpools_negative.py
index 9d94086d58e..34fec3bb52e 100644
--- a/neutron/tests/api/test_subnetpools_negative.py
+++ b/neutron/tests/api/test_subnetpools_negative.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import netaddr
 import uuid
 
+import netaddr
 from tempest_lib.common.utils import data_utils
 from tempest_lib import exceptions as lib_exc
 
diff --git a/neutron/tests/common/agents/l3_agent.py b/neutron/tests/common/agents/l3_agent.py
index 410cce630ec..3557bdaaf09 100755
--- a/neutron/tests/common/agents/l3_agent.py
+++ b/neutron/tests/common/agents/l3_agent.py
@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import sys
 
+import mock
 from oslo_config import cfg
 
 from neutron._i18n import _
diff --git a/neutron/tests/common/l3_test_common.py b/neutron/tests/common/l3_test_common.py
index a81f2d67a28..c4c6c1e5b90 100644
--- a/neutron/tests/common/l3_test_common.py
+++ b/neutron/tests/common/l3_test_common.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import copy
+
 import netaddr
 from oslo_utils import uuidutils
 from six import moves
diff --git a/neutron/tests/fullstack/test_connectivity.py b/neutron/tests/fullstack/test_connectivity.py
index 31ad8f1c025..a5f8ac3864f 100644
--- a/neutron/tests/fullstack/test_connectivity.py
+++ b/neutron/tests/fullstack/test_connectivity.py
@@ -12,9 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testscenarios
-
 from oslo_utils import uuidutils
+import testscenarios
 
 from neutron.tests.fullstack import base
 from neutron.tests.fullstack.resources import environment
diff --git a/neutron/tests/functional/agent/l3/framework.py b/neutron/tests/functional/agent/l3/framework.py
index bbe7cfb5a62..6dde71e49d2 100644
--- a/neutron/tests/functional/agent/l3/framework.py
+++ b/neutron/tests/functional/agent/l3/framework.py
@@ -17,11 +17,10 @@ import functools
 
 import mock
 import netaddr
-import testtools
-
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import uuidutils
+import testtools
 
 from neutron.agent.common import config as agent_config
 from neutron.agent.common import ovs_lib
diff --git a/neutron/tests/functional/agent/linux/test_dhcp.py b/neutron/tests/functional/agent/linux/test_dhcp.py
index dbd4de5038f..7f2d4f9314e 100644
--- a/neutron/tests/functional/agent/linux/test_dhcp.py
+++ b/neutron/tests/functional/agent/linux/test_dhcp.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import mock
-
 from oslo_config import cfg
 
 from neutron.agent.common import config
diff --git a/neutron/tests/functional/agent/test_firewall.py b/neutron/tests/functional/agent/test_firewall.py
index a376156f79c..50e031f92f9 100644
--- a/neutron/tests/functional/agent/test_firewall.py
+++ b/neutron/tests/functional/agent/test_firewall.py
@@ -16,11 +16,12 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 import copy
-import testscenarios
 
 import netaddr
 from oslo_config import cfg
+import testscenarios
 
 from neutron.agent import firewall
 from neutron.agent.linux import iptables_firewall
diff --git a/neutron/tests/functional/agent/test_l2_ovs_agent.py b/neutron/tests/functional/agent/test_l2_ovs_agent.py
index 763b26a4242..5b511357e0e 100644
--- a/neutron/tests/functional/agent/test_l2_ovs_agent.py
+++ b/neutron/tests/functional/agent/test_l2_ovs_agent.py
@@ -17,6 +17,7 @@
 import time
 
 from eventlet.timeout import Timeout
+
 from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
 from neutron.tests.common import net_helpers
 from neutron.tests.functional.agent.l2 import base
diff --git a/neutron/tests/functional/agent/test_ovs_flows.py b/neutron/tests/functional/agent/test_ovs_flows.py
index e36addf7182..68ffb3f9c21 100644
--- a/neutron/tests/functional/agent/test_ovs_flows.py
+++ b/neutron/tests/functional/agent/test_ovs_flows.py
@@ -16,7 +16,6 @@
 import eventlet
 import fixtures
 import mock
-
 from oslo_config import cfg
 from oslo_utils import importutils
 
diff --git a/neutron/tests/functional/agent/test_ovs_lib.py b/neutron/tests/functional/agent/test_ovs_lib.py
index 722936728f5..e618c8fa262 100644
--- a/neutron/tests/functional/agent/test_ovs_lib.py
+++ b/neutron/tests/functional/agent/test_ovs_lib.py
@@ -14,9 +14,10 @@
 #    under the License.
 
 import collections
-import mock
 import uuid
 
+import mock
+
 from neutron.agent.common import ovs_lib
 from neutron.agent.linux import ip_lib
 from neutron.tests import base as tests_base
diff --git a/neutron/tests/functional/api/test_policies.py b/neutron/tests/functional/api/test_policies.py
index 1912f1d01e8..6826aabd34c 100644
--- a/neutron/tests/functional/api/test_policies.py
+++ b/neutron/tests/functional/api/test_policies.py
@@ -15,12 +15,10 @@
 
 import os.path
 
-from neutron import context
-from neutron import policy
-
 from neutron.api import extensions
 from neutron.api.v2 import attributes
-
+from neutron import context
+from neutron import policy
 from neutron.tests import base
 from neutron.tests import tools
 
diff --git a/neutron/tests/functional/db/test_migrations.py b/neutron/tests/functional/db/test_migrations.py
index 79b87854f2a..3fb36cf4ab2 100644
--- a/neutron/tests/functional/db/test_migrations.py
+++ b/neutron/tests/functional/db/test_migrations.py
@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from alembic import script as alembic_script
 from contextlib import contextmanager
 import mock
@@ -21,6 +19,7 @@ from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_db.sqlalchemy import test_base
 from oslo_db.sqlalchemy import test_migrations
+import six
 import sqlalchemy
 from sqlalchemy import event
 import sqlalchemy.types as types
diff --git a/neutron/tests/functional/pecan_wsgi/test_functional.py b/neutron/tests/functional/pecan_wsgi/test_functional.py
index 0f0aafc7193..5648e741240 100644
--- a/neutron/tests/functional/pecan_wsgi/test_functional.py
+++ b/neutron/tests/functional/pecan_wsgi/test_functional.py
@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from collections import namedtuple
 import os
 
-from collections import namedtuple
 import mock
 from oslo_config import cfg
 from oslo_policy import policy as oslo_policy
diff --git a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
index 7037af0637c..ec7c826c370 100644
--- a/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
+++ b/neutron/tests/functional/scheduler/test_dhcp_agent_scheduler.py
@@ -14,6 +14,8 @@
 #    under the License.
 
 import collections
+from operator import attrgetter
+
 import six
 import testscenarios
 
@@ -24,7 +26,6 @@ from neutron.db import common_db_mixin
 from neutron.scheduler import dhcp_agent_scheduler
 from neutron.tests.unit.scheduler import (test_dhcp_agent_scheduler as
                                           test_dhcp_sch)
-from operator import attrgetter
 
 # Required to generate tests from scenarios. Not compatible with nose.
 load_tests = testscenarios.load_tests_apply_scenarios
diff --git a/neutron/tests/functional/scheduler/test_l3_agent_scheduler.py b/neutron/tests/functional/scheduler/test_l3_agent_scheduler.py
index 2f94b8d0dc3..4ddf764f91d 100644
--- a/neutron/tests/functional/scheduler/test_l3_agent_scheduler.py
+++ b/neutron/tests/functional/scheduler/test_l3_agent_scheduler.py
@@ -15,6 +15,7 @@
 
 import collections
 import random
+
 import testscenarios
 
 from neutron import context
diff --git a/neutron/tests/functional/test_server.py b/neutron/tests/functional/test_server.py
index 6b88d3aa1c3..5de52eefdc6 100644
--- a/neutron/tests/functional/test_server.py
+++ b/neutron/tests/functional/test_server.py
@@ -13,14 +13,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import httplib2
-import mock
 import os
 import signal
 import socket
 import time
 import traceback
 
+import httplib2
+import mock
 from oslo_config import cfg
 import psutil
 
diff --git a/neutron/tests/tools.py b/neutron/tests/tools.py
index c469ab7da78..44b53f14e74 100644
--- a/neutron/tests/tools.py
+++ b/neutron/tests/tools.py
@@ -13,13 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import platform
 import random
 import string
 import warnings
 
 import fixtures
+import mock
 import six
 
 from neutron.api.v2 import attributes
diff --git a/neutron/tests/unit/_test_extension_portbindings.py b/neutron/tests/unit/_test_extension_portbindings.py
index 42840d410f5..d78b5eede21 100644
--- a/neutron/tests/unit/_test_extension_portbindings.py
+++ b/neutron/tests/unit/_test_extension_portbindings.py
@@ -13,9 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves import http_client as httplib
-
 from oslo_config import cfg
+from six.moves import http_client as httplib
 from webob import exc
 
 from neutron import context
diff --git a/neutron/tests/unit/agent/common/test_ovs_lib.py b/neutron/tests/unit/agent/common/test_ovs_lib.py
index 88a04e73604..370b799c151 100644
--- a/neutron/tests/unit/agent/common/test_ovs_lib.py
+++ b/neutron/tests/unit/agent/common/test_ovs_lib.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import collections
+
 import mock
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py
index 229114a2156..ae05e45253c 100644
--- a/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@ -14,10 +14,10 @@
 #    under the License.
 
 import copy
-
-import eventlet
 from itertools import chain as iter_chain
 from itertools import combinations as iter_combinations
+
+import eventlet
 import mock
 import netaddr
 from oslo_log import log
diff --git a/neutron/tests/unit/agent/l3/test_dvr_local_router.py b/neutron/tests/unit/agent/l3/test_dvr_local_router.py
index b200cf57e87..6b7f38d6087 100644
--- a/neutron/tests/unit/agent/l3/test_dvr_local_router.py
+++ b/neutron/tests/unit/agent/l3/test_dvr_local_router.py
@@ -14,7 +14,6 @@
 
 import mock
 import netaddr
-
 from oslo_log import log
 from oslo_utils import uuidutils
 
diff --git a/neutron/tests/unit/api/v2/test_attributes.py b/neutron/tests/unit/api/v2/test_attributes.py
index 198247a990f..8980114166a 100644
--- a/neutron/tests/unit/api/v2/test_attributes.py
+++ b/neutron/tests/unit/api/v2/test_attributes.py
@@ -14,13 +14,12 @@
 #    under the License.
 
 import string
-import testtools
 
 import mock
 import netaddr
-import webob.exc
-
 from oslo_utils import uuidutils
+import testtools
+import webob.exc
 
 from neutron._i18n import _
 from neutron.api.v2 import attributes
diff --git a/neutron/tests/unit/common/test_utils.py b/neutron/tests/unit/common/test_utils.py
index f9bc4b21655..6369200e486 100644
--- a/neutron/tests/unit/common/test_utils.py
+++ b/neutron/tests/unit/common/test_utils.py
@@ -18,6 +18,7 @@ import re
 import eventlet
 import mock
 import netaddr
+from oslo_log import log as logging
 import six
 import testtools
 
@@ -29,8 +30,6 @@ from neutron.plugins.common import utils as plugin_utils
 from neutron.tests import base
 from neutron.tests.common import helpers
 
-from oslo_log import log as logging
-
 
 class TestParseMappings(base.BaseTestCase):
     def parse(self, mapping_list, unique_values=True):
diff --git a/neutron/tests/unit/db/test_ipam_pluggable_backend.py b/neutron/tests/unit/db/test_ipam_pluggable_backend.py
index 5ca13cc0f05..ee7ac68f9ca 100644
--- a/neutron/tests/unit/db/test_ipam_pluggable_backend.py
+++ b/neutron/tests/unit/db/test_ipam_pluggable_backend.py
@@ -15,10 +15,9 @@
 
 import mock
 import netaddr
-import webob.exc
-
 from oslo_config import cfg
 from oslo_utils import uuidutils
+import webob.exc
 
 from neutron.common import constants
 from neutron.common import exceptions as n_exc
diff --git a/neutron/tests/unit/extensions/test_address_scope.py b/neutron/tests/unit/extensions/test_address_scope.py
index be3f816e63b..87ad62aed4e 100644
--- a/neutron/tests/unit/extensions/test_address_scope.py
+++ b/neutron/tests/unit/extensions/test_address_scope.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 import contextlib
-import netaddr
 
+import netaddr
 import webob.exc
 
 from neutron.api.v2 import attributes as attr
diff --git a/neutron/tests/unit/extensions/test_dns.py b/neutron/tests/unit/extensions/test_dns.py
index 48f799055bb..5851ec2ee8e 100644
--- a/neutron/tests/unit/extensions/test_dns.py
+++ b/neutron/tests/unit/extensions/test_dns.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 import math
-import netaddr
 
+import netaddr
 from oslo_config import cfg
 
 from neutron.common import constants
diff --git a/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_driver.py b/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_driver.py
index 7baab1a7221..4cafb7bb4fc 100644
--- a/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_driver.py
+++ b/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_driver.py
@@ -15,7 +15,6 @@
 
 import mock
 import netaddr
-
 from oslo_db import exception as db_exc
 
 from neutron.api.v2 import attributes
@@ -26,7 +25,6 @@ from neutron.ipam.drivers.neutrondb_ipam import driver
 from neutron.ipam import exceptions as ipam_exc
 from neutron.ipam import requests as ipam_req
 from neutron import manager
-
 from neutron.tests.unit.db import test_db_base_plugin_v2 as test_db_plugin
 from neutron.tests.unit import testlib_api
 
diff --git a/neutron/tests/unit/notifiers/test_nova.py b/neutron/tests/unit/notifiers/test_nova.py
index 2481a59d847..3315196c955 100644
--- a/neutron/tests/unit/notifiers/test_nova.py
+++ b/neutron/tests/unit/notifiers/test_nova.py
@@ -16,11 +16,10 @@
 
 import mock
 from novaclient import exceptions as nova_exceptions
+from oslo_config import cfg
 from oslo_utils import uuidutils
 from sqlalchemy.orm import attributes as sql_attr
 
-from oslo_config import cfg
-
 from neutron.common import constants as n_const
 from neutron.db import models_v2
 from neutron.notifiers import nova
diff --git a/neutron/tests/unit/plugins/common/test_utils.py b/neutron/tests/unit/plugins/common/test_utils.py
index c4dfdfe271b..c899243a4e2 100644
--- a/neutron/tests/unit/plugins/common/test_utils.py
+++ b/neutron/tests/unit/plugins/common/test_utils.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import hashlib
+
 import mock
 
 from neutron.common import constants
diff --git a/neutron/tests/unit/plugins/ml2/drivers/ext_test.py b/neutron/tests/unit/plugins/ml2/drivers/ext_test.py
index 90c0f72ba8f..0a0005bfb5d 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/ext_test.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/ext_test.py
@@ -16,11 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import oslo_db.sqlalchemy.session
 import sqlalchemy as sa
 from sqlalchemy import orm
 
-import oslo_db.sqlalchemy.session
-
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.db import model_base
diff --git a/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
index 3d128fd1a13..165c7292f4a 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 import collections
+
 import mock
 
 from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
diff --git a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
index b9ae9734955..429a5769689 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
@@ -13,9 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
-
 import mock
+import testtools
 
 from neutron.common import constants
 from neutron.common import topics
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge_test_base.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge_test_base.py
index 1437e0cd420..d879ba3b9b6 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge_test_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/native/ovs_bridge_test_base.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import mock
-
 from oslo_utils import importutils
 
 from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
index b3961030037..75297e6962b 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
@@ -17,7 +17,6 @@
 import mock
 
 from neutron.common import constants
-
 from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
     import ovs_test_base
 
diff --git a/neutron/tests/unit/plugins/ml2/test_extension_driver_api.py b/neutron/tests/unit/plugins/ml2/test_extension_driver_api.py
index 2297007f497..a1f2500bd23 100644
--- a/neutron/tests/unit/plugins/ml2/test_extension_driver_api.py
+++ b/neutron/tests/unit/plugins/ml2/test_extension_driver_api.py
@@ -10,9 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import uuid
 
+import mock
+
 from neutron import context
 from neutron import manager
 from neutron.plugins.ml2 import config
diff --git a/neutron/tests/unit/plugins/ml2/test_plugin.py b/neutron/tests/unit/plugins/ml2/test_plugin.py
index 4db89f88664..1a239469c04 100644
--- a/neutron/tests/unit/plugins/ml2/test_plugin.py
+++ b/neutron/tests/unit/plugins/ml2/test_plugin.py
@@ -14,12 +14,12 @@
 #    under the License.
 
 import functools
+import uuid
 
 import fixtures
 import mock
 import six
 import testtools
-import uuid
 import webob
 
 from oslo_db import exception as db_exc
diff --git a/neutron/tests/unit/plugins/ml2/test_security_group.py b/neutron/tests/unit/plugins/ml2/test_security_group.py
index b1f1e5d8e3f..3389a77fb96 100644
--- a/neutron/tests/unit/plugins/ml2/test_security_group.py
+++ b/neutron/tests/unit/plugins/ml2/test_security_group.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 import math
+
 import mock
 
 from neutron.common import constants as const
diff --git a/neutron/tests/unit/quota/test_resource.py b/neutron/tests/unit/quota/test_resource.py
index 2811e3f8774..935f47a175d 100644
--- a/neutron/tests/unit/quota/test_resource.py
+++ b/neutron/tests/unit/quota/test_resource.py
@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import uuid
 
+import mock
 from oslo_config import cfg
 
 from neutron import context
diff --git a/neutron/tests/unit/quota/test_resource_registry.py b/neutron/tests/unit/quota/test_resource_registry.py
index fcf27c8f290..5f265a8833d 100644
--- a/neutron/tests/unit/quota/test_resource_registry.py
+++ b/neutron/tests/unit/quota/test_resource_registry.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import mock
-
 from oslo_config import cfg
 
 from neutron import context
diff --git a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
index 26f2c148000..154928f6ff4 100644
--- a/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
+++ b/neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
@@ -19,13 +19,12 @@ import datetime
 import uuid
 
 import mock
-import testscenarios
-
 from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_utils import importutils
 from oslo_utils import timeutils
 from sqlalchemy.orm import query
+import testscenarios
 
 from neutron.common import constants
 from neutron import context as n_context
diff --git a/neutron/tests/unit/services/test_provider_configuration.py b/neutron/tests/unit/services/test_provider_configuration.py
index 7a06694f96f..690e36a0b13 100644
--- a/neutron/tests/unit/services/test_provider_configuration.py
+++ b/neutron/tests/unit/services/test_provider_configuration.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import mock
-
 from oslo_config import cfg
 
 from neutron.common import exceptions as n_exc