From a79b1c34258616eb25bd77e4ec5b253c32d90fa3 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <lzyeval@gmail.com>
Date: Tue, 19 Jun 2012 01:52:17 +0800
Subject: [PATCH] Reorder imports by full module path

Fixes bug #1014765

Change-Id: I849d73fc756b830b78492a6ed0e8cf2d32fde8cd
---
 quantum/agent/linux/utils.py                              | 2 +-
 quantum/api/__init__.py                                   | 2 +-
 quantum/api/api_common.py                                 | 2 +-
 quantum/api/v2/resource.py                                | 4 ++--
 quantum/api/v2/router.py                                  | 4 ++--
 quantum/api/versions.py                                   | 2 +-
 quantum/db/db_base_plugin_v2.py                           | 2 +-
 quantum/db/model_base.py                                  | 2 +-
 quantum/extensions/novatenant.py                          | 2 +-
 quantum/plugins/cisco/client/cli.py                       | 2 +-
 quantum/plugins/cisco/db/l2network_db.py                  | 2 +-
 quantum/plugins/cisco/db/l2network_models.py              | 2 +-
 quantum/plugins/cisco/db/ucs_models.py                    | 2 +-
 quantum/plugins/cisco/l2network_plugin.py                 | 4 ++--
 quantum/plugins/cisco/models/l2network_multi_blade.py     | 2 +-
 quantum/plugins/cisco/models/l2network_single_blade.py    | 2 +-
 quantum/plugins/cisco/services/services_logistics.py      | 4 ++--
 quantum/plugins/cisco/tests/unit/__init__.py              | 2 ++
 quantum/plugins/cisco/tests/unit/test_l2networkApi.py     | 4 ++--
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py         | 2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py          | 6 +++---
 quantum/plugins/linuxbridge/db/l2network_db.py            | 2 +-
 .../linuxbridge/tests/unit/_test_linuxbridgeAgent.py      | 2 +-
 .../nicira_nvp_plugin/api_client/client_eventlet.py       | 2 +-
 .../nicira_nvp_plugin/api_client/request_eventlet.py      | 2 +-
 .../plugins/nicira/nicira_nvp_plugin/tests/test_check.py  | 2 +-
 .../nicira/nicira_nvp_plugin/tests/test_network.py        | 2 +-
 .../plugins/nicira/nicira_nvp_plugin/tests/test_port.py   | 2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py         | 2 +-
 quantum/plugins/openvswitch/tests/unit/test_tunnel.py     | 2 +-
 quantum/plugins/ryu/ovs_quantum_plugin_base.py            | 2 +-
 quantum/plugins/ryu/ryu_quantum_plugin.py                 | 4 ++--
 quantum/plugins/ryu/tests/unit/test_plugin_base.py        | 2 +-
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py         | 2 +-
 quantum/plugins/ryu/tests/unit/utils.py                   | 2 +-
 quantum/policy.py                                         | 2 +-
 quantum/quantum_plugin_base.py                            | 2 +-
 quantum/tests/unit/_test_api.py                           | 4 ++--
 quantum/tests/unit/test_api_v2.py                         | 6 +++---
 quantum/tests/unit/test_db_plugin.py                      | 8 ++++----
 40 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/quantum/agent/linux/utils.py b/quantum/agent/linux/utils.py
index 8e9739474..a2a0294c8 100644
--- a/quantum/agent/linux/utils.py
+++ b/quantum/agent/linux/utils.py
@@ -17,9 +17,9 @@
 #
 # @author: Juliano Martinez, Locaweb.
 
+import logging
 import os
 import shlex
-import logging
 import subprocess
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/api/__init__.py b/quantum/api/__init__.py
index 813ff40ec..2cec49a81 100644
--- a/quantum/api/__init__.py
+++ b/quantum/api/__init__.py
@@ -24,11 +24,11 @@ import routes
 import webob.dec
 import webob.exc
 
-from quantum import manager
 from quantum.api import attachments
 from quantum.api import networks
 from quantum.api import ports
 from quantum.common import flags
+from quantum import manager
 from quantum import wsgi
 
 
diff --git a/quantum/api/api_common.py b/quantum/api/api_common.py
index 49a16b440..4e0880232 100644
--- a/quantum/api/api_common.py
+++ b/quantum/api/api_common.py
@@ -19,8 +19,8 @@ import logging
 
 from webob import exc
 
-from quantum import wsgi
 from quantum.api import faults
+from quantum import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/api/v2/resource.py b/quantum/api/v2/resource.py
index 6e2f9ecda..adf574e90 100644
--- a/quantum/api/v2/resource.py
+++ b/quantum/api/v2/resource.py
@@ -19,11 +19,11 @@ Utility methods for working with WSGI servers redux
 import logging
 
 import webob
-import webob.exc
 import webob.dec
+import webob.exc
 
-from quantum import context
 from quantum.common import exceptions
+from quantum import context
 from quantum.openstack.common import jsonutils as json
 from quantum import wsgi
 
diff --git a/quantum/api/v2/router.py b/quantum/api/v2/router.py
index 0b2d7a6f8..2177bbe66 100644
--- a/quantum/api/v2/router.py
+++ b/quantum/api/v2/router.py
@@ -21,10 +21,10 @@ import webob
 import webob.dec
 import webob.exc
 
-from quantum import manager
-from quantum import wsgi
 from quantum.api.v2 import base
+from quantum import manager
 from quantum.openstack.common import cfg
+from quantum import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/api/versions.py b/quantum/api/versions.py
index a2fa135e8..e3fe4785b 100644
--- a/quantum/api/versions.py
+++ b/quantum/api/versions.py
@@ -18,8 +18,8 @@
 import logging
 import webob.dec
 
-from quantum import wsgi
 from quantum.api.views import versions as versions_view
+from quantum import wsgi
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/db/db_base_plugin_v2.py b/quantum/db/db_base_plugin_v2.py
index ffeae64f7..8bc51bf9b 100644
--- a/quantum/db/db_base_plugin_v2.py
+++ b/quantum/db/db_base_plugin_v2.py
@@ -20,11 +20,11 @@ import netaddr
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
-from quantum import quantum_plugin_base_v2
 from quantum.api.v2 import router as api_router
 from quantum.common import exceptions as q_exc
 from quantum.db import api as db
 from quantum.db import models_v2
+from quantum import quantum_plugin_base_v2
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/db/model_base.py b/quantum/db/model_base.py
index 4c27f4a6b..54842b815 100644
--- a/quantum/db/model_base.py
+++ b/quantum/db/model_base.py
@@ -16,8 +16,8 @@
 import uuid
 
 import sqlalchemy as sa
-from sqlalchemy import orm
 from sqlalchemy.ext import declarative
+from sqlalchemy import orm
 
 
 def str_uuid():
diff --git a/quantum/extensions/novatenant.py b/quantum/extensions/novatenant.py
index 17a1593da..e2145dae8 100644
--- a/quantum/extensions/novatenant.py
+++ b/quantum/extensions/novatenant.py
@@ -20,8 +20,8 @@ from webob import exc
 
 from quantum.api import api_common as common
 from quantum.common import exceptions as qexception
-from quantum.extensions import extensions
 from quantum.extensions import _novatenant_view as novatenant_view
+from quantum.extensions import extensions
 from quantum.manager import QuantumManager
 from quantum.plugins.cisco.common import cisco_faults as faults
 from quantum import wsgi
diff --git a/quantum/plugins/cisco/client/cli.py b/quantum/plugins/cisco/client/cli.py
index 9a455624c..7530ddb77 100644
--- a/quantum/plugins/cisco/client/cli.py
+++ b/quantum/plugins/cisco/client/cli.py
@@ -30,8 +30,8 @@ from optparse import OptionParser
 import os
 import sys
 
-from quantumclient import Client
 import quantumclient.cli as qcli
+from quantumclient import Client
 
 
 LOG = logging.getLogger('quantum')
diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py
index 5aba53272..8b252771e 100644
--- a/quantum/plugins/cisco/db/l2network_db.py
+++ b/quantum/plugins/cisco/db/l2network_db.py
@@ -18,9 +18,9 @@
 from sqlalchemy.orm import exc
 
 from quantum.common import exceptions as q_exc
-from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_exceptions as c_exc
 from quantum.plugins.cisco.db import l2network_models
+from quantum.plugins.cisco import l2network_plugin_configuration as conf
 
 import logging as LOG
 import quantum.plugins.cisco.db.api as db
diff --git a/quantum/plugins/cisco/db/l2network_models.py b/quantum/plugins/cisco/db/l2network_models.py
index c011c1acc..cd5adfe10 100644
--- a/quantum/plugins/cisco/db/l2network_models.py
+++ b/quantum/plugins/cisco/db/l2network_models.py
@@ -20,8 +20,8 @@ import uuid
 from sqlalchemy import Column, Integer, String, ForeignKey, Boolean
 from sqlalchemy.orm import relation, object_mapper
 
-from quantum.plugins.cisco.db.models import BASE
 from quantum.plugins.cisco.db import models
+from quantum.plugins.cisco.db.models import BASE
 
 
 class L2NetworkBase(object):
diff --git a/quantum/plugins/cisco/db/ucs_models.py b/quantum/plugins/cisco/db/ucs_models.py
index e219e6cae..1c7da7771 100644
--- a/quantum/plugins/cisco/db/ucs_models.py
+++ b/quantum/plugins/cisco/db/ucs_models.py
@@ -18,8 +18,8 @@
 from sqlalchemy import Column, Integer, String, ForeignKey
 from sqlalchemy.orm import relation
 
-from quantum.plugins.cisco.db import models
 from quantum.plugins.cisco.db.l2network_models import L2NetworkBase
+from quantum.plugins.cisco.db import models
 from quantum.plugins.cisco.db.models import BASE
 
 
diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py
index b6eac458c..ae03ac439 100644
--- a/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@ -21,14 +21,14 @@ import logging
 
 from quantum.common import exceptions as exc
 from quantum.openstack.common import importutils
-from quantum.quantum_plugin_base import QuantumPluginBase
-from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_credentials as cred
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.common import cisco_utils as cutil
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
+from quantum.plugins.cisco import l2network_plugin_configuration as conf
+from quantum.quantum_plugin_base import QuantumPluginBase
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/cisco/models/l2network_multi_blade.py b/quantum/plugins/cisco/models/l2network_multi_blade.py
index a19583b2a..cc5e6ba4b 100644
--- a/quantum/plugins/cisco/models/l2network_multi_blade.py
+++ b/quantum/plugins/cisco/models/l2network_multi_blade.py
@@ -21,9 +21,9 @@ import inspect
 import logging
 
 from quantum.openstack.common import importutils
+from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
-from quantum.plugins.cisco.common import cisco_constants as const
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/cisco/models/l2network_single_blade.py b/quantum/plugins/cisco/models/l2network_single_blade.py
index 7bbc82ef8..4e44f9cdf 100644
--- a/quantum/plugins/cisco/models/l2network_single_blade.py
+++ b/quantum/plugins/cisco/models/l2network_single_blade.py
@@ -21,9 +21,9 @@ import inspect
 import logging
 
 from quantum.openstack.common import importutils
+from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
-from quantum.plugins.cisco.common import cisco_constants as const
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/cisco/services/services_logistics.py b/quantum/plugins/cisco/services/services_logistics.py
index bf486dc95..db69a1270 100644
--- a/quantum/plugins/cisco/services/services_logistics.py
+++ b/quantum/plugins/cisco/services/services_logistics.py
@@ -20,14 +20,14 @@ Logistic components for Service Insertion utility
 """
 
 import logging
-import subprocess
 import re
+import subprocess
 import time
 
 from quantum.openstack.common import importutils
-from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.db import services_db as sdb
+from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.services import services_constants as servconts
 
 
diff --git a/quantum/plugins/cisco/tests/unit/__init__.py b/quantum/plugins/cisco/tests/unit/__init__.py
index 50375f405..b895a356e 100644
--- a/quantum/plugins/cisco/tests/unit/__init__.py
+++ b/quantum/plugins/cisco/tests/unit/__init__.py
@@ -20,6 +20,8 @@
 
 import __builtin__
 import unittest
+
+
 setattr(__builtin__, '_', lambda x: x)
 
 
diff --git a/quantum/plugins/cisco/tests/unit/test_l2networkApi.py b/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
index d335fbd22..3440443cc 100644
--- a/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
+++ b/quantum/plugins/cisco/tests/unit/test_l2networkApi.py
@@ -23,10 +23,10 @@ import unittest
 from quantum.common import exceptions as exc
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
-from quantum.plugins.cisco import l2network_plugin
-from quantum.plugins.cisco import l2network_plugin_configuration as conf
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
+from quantum.plugins.cisco import l2network_plugin
+from quantum.plugins.cisco import l2network_plugin_configuration as conf
 
 
 LOG = logging.getLogger('quantum.tests.test_core_api_func')
diff --git a/quantum/plugins/cisco/tests/unit/test_vlan_mgr.py b/quantum/plugins/cisco/tests/unit/test_vlan_mgr.py
index dfa2ec913..8eda5c64c 100644
--- a/quantum/plugins/cisco/tests/unit/test_vlan_mgr.py
+++ b/quantum/plugins/cisco/tests/unit/test_vlan_mgr.py
@@ -20,8 +20,8 @@ import logging
 import unittest
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco.common import cisco_exceptions as c_exc
 from quantum.plugins.cisco.common import cisco_credentials as creds
+from quantum.plugins.cisco.common import cisco_exceptions as c_exc
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
 from quantum.plugins.cisco import l2network_plugin_configuration as conf
diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
index a08a09c8b..b6b0a3efa 100644
--- a/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_inventory.py
@@ -64,14 +64,14 @@ from copy import deepcopy
 import logging
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco.l2device_inventory_base import (
-    L2NetworkDeviceInventoryBase,
-)
 from quantum.plugins.cisco.common import cisco_constants as const
 from quantum.plugins.cisco.common import cisco_credentials as cred
 from quantum.plugins.cisco.common import cisco_exceptions as cexc
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import ucs_db as udb
+from quantum.plugins.cisco.l2device_inventory_base import (
+    L2NetworkDeviceInventoryBase,
+)
 from quantum.plugins.cisco.ucs import (
     cisco_ucs_inventory_configuration as conf,
 )
diff --git a/quantum/plugins/linuxbridge/db/l2network_db.py b/quantum/plugins/linuxbridge/db/l2network_db.py
index 8160142a7..8b32614a3 100644
--- a/quantum/plugins/linuxbridge/db/l2network_db.py
+++ b/quantum/plugins/linuxbridge/db/l2network_db.py
@@ -23,9 +23,9 @@ from sqlalchemy.orm import exc
 from quantum.common import exceptions as q_exc
 from quantum.common.utils import find_config_file
 import quantum.db.api as db
+from quantum.plugins.linuxbridge.common import config
 from quantum.plugins.linuxbridge.common import exceptions as c_exc
 from quantum.plugins.linuxbridge.db import l2network_models
-from quantum.plugins.linuxbridge.common import config
 
 LOG = logging.getLogger(__name__)
 CONF_FILE = find_config_file({'plugin': 'linuxbridge'},
diff --git a/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py b/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py
index 03f953715..5698fbaa6 100644
--- a/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py
+++ b/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py
@@ -26,12 +26,12 @@ import sys
 import unittest
 
 import quantum.db.api as db
-from quantum.plugins.linuxbridge import LinuxBridgePlugin
 from quantum.plugins.linuxbridge.agent import (
     linuxbridge_quantum_agent as linux_agent,
 )
 from quantum.plugins.linuxbridge.common import constants as lconst
 from quantum.plugins.linuxbridge.db import l2network_db as cdb
+from quantum.plugins.linuxbridge import LinuxBridgePlugin
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
index 98dc4b84b..6a71c49cf 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/client_eventlet.py
@@ -18,10 +18,10 @@ import time
 
 import eventlet
 
+import quantum.plugins.nicira.nicira_nvp_plugin.api_client.client as client
 from quantum.plugins.nicira.nicira_nvp_plugin.api_client.common import (
     _conn_str,
 )
-import quantum.plugins.nicira.nicira_nvp_plugin.api_client.client as client
 import quantum.plugins.nicira.nicira_nvp_plugin.api_client.request_eventlet
 
 
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
index 737ad5dc4..6fcb93230 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py
@@ -22,11 +22,11 @@ import eventlet
 from eventlet import timeout
 
 from quantum.openstack.common import jsonutils
+import quantum.plugins.nicira.nicira_nvp_plugin.api_client.client_eventlet
 from quantum.plugins.nicira.nicira_nvp_plugin.api_client.common import (
     _conn_str,
 )
 import quantum.plugins.nicira.nicira_nvp_plugin.api_client.request as request
-import quantum.plugins.nicira.nicira_nvp_plugin.api_client.client_eventlet
 
 
 logging.basicConfig(level=logging.INFO)
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_check.py b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_check.py
index d96a8d9bc..e49927ed6 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_check.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_check.py
@@ -17,8 +17,8 @@
 import logging
 import unittest
 
-from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
+from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_network.py b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_network.py
index 33b4fdae9..f29e105fc 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_network.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_network.py
@@ -21,11 +21,11 @@ import unittest
 
 from quantum.common import exceptions as exception
 from quantum.openstack.common import jsonutils
-from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 from quantum.plugins.nicira.nicira_nvp_plugin import (
     NvpApiClient,
     nvplib,
 )
+from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_port.py b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_port.py
index e0bce783d..722dd130c 100644
--- a/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_port.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/tests/test_port.py
@@ -20,11 +20,11 @@ import unittest
 
 from quantum.common import exceptions as exception
 from quantum.openstack.common import jsonutils
-from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 from quantum.plugins.nicira.nicira_nvp_plugin import (
     NvpApiClient,
     nvplib,
 )
+from quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin import NvpPlugin
 
 
 logging.basicConfig(level=logging.DEBUG)
diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 572a0c8fc..231584f74 100644
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -25,8 +25,8 @@ from quantum.api.api_common import OperationalStatus
 from quantum.common import exceptions as q_exc
 from quantum.common.utils import find_config_file
 import quantum.db.api as db
-from quantum.plugins.openvswitch import ovs_db
 from quantum.plugins.openvswitch.common import config
+from quantum.plugins.openvswitch import ovs_db
 from quantum.quantum_plugin_base import QuantumPluginBase
 
 LOG = logging.getLogger("ovs_quantum_plugin")
diff --git a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
index 35e5fe19c..8263869d4 100644
--- a/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
+++ b/quantum/plugins/openvswitch/tests/unit/test_tunnel.py
@@ -20,8 +20,8 @@ import unittest
 
 import mox
 
-from quantum.plugins.openvswitch.agent import ovs_quantum_agent
 from quantum.agent.linux import ovs_lib
+from quantum.plugins.openvswitch.agent import ovs_quantum_agent
 
 # Useful global dummy variables.
 NET_UUID = '3faeebfe-5d37-11e1-a64b-000c29d5f0a7'
diff --git a/quantum/plugins/ryu/ovs_quantum_plugin_base.py b/quantum/plugins/ryu/ovs_quantum_plugin_base.py
index fd9a5dfde..16ec5b235 100644
--- a/quantum/plugins/ryu/ovs_quantum_plugin_base.py
+++ b/quantum/plugins/ryu/ovs_quantum_plugin_base.py
@@ -22,8 +22,8 @@ import os
 
 from quantum.api.api_common import OperationalStatus
 from quantum.common import exceptions as q_exc
-from quantum.plugins.ryu.common import config
 import quantum.db.api as db
+from quantum.plugins.ryu.common import config
 from quantum.quantum_plugin_base import QuantumPluginBase
 
 
diff --git a/quantum/plugins/ryu/ryu_quantum_plugin.py b/quantum/plugins/ryu/ryu_quantum_plugin.py
index c6af60f3b..4c1a8cfb6 100644
--- a/quantum/plugins/ryu/ryu_quantum_plugin.py
+++ b/quantum/plugins/ryu/ryu_quantum_plugin.py
@@ -19,12 +19,12 @@
 from ryu.app import client
 from ryu.app import rest_nw_id
 
-from quantum.common.utils import find_config_file
 from quantum.common import exceptions as q_exc
+from quantum.common.utils import find_config_file
 import quantum.db.api as db
+from quantum.plugins.ryu.db import api as db_api
 from quantum.plugins.ryu import ofp_service_type
 from quantum.plugins.ryu import ovs_quantum_plugin_base
-from quantum.plugins.ryu.db import api as db_api
 
 
 CONF_FILE = find_config_file({"plugin": "ryu"}, "ryu.ini")
diff --git a/quantum/plugins/ryu/tests/unit/test_plugin_base.py b/quantum/plugins/ryu/tests/unit/test_plugin_base.py
index 1c81b027c..ded216d4e 100644
--- a/quantum/plugins/ryu/tests/unit/test_plugin_base.py
+++ b/quantum/plugins/ryu/tests/unit/test_plugin_base.py
@@ -19,9 +19,9 @@ import os
 
 import mox
 
+from quantum.plugins.ryu.tests.unit.basetest import BaseRyuTest
 from quantum.plugins.ryu.tests.unit import fake_plugin
 from quantum.plugins.ryu.tests.unit import utils
-from quantum.plugins.ryu.tests.unit.basetest import BaseRyuTest
 
 
 class PluginBaseTest(BaseRyuTest):
diff --git a/quantum/plugins/ryu/tests/unit/test_ryu_driver.py b/quantum/plugins/ryu/tests/unit/test_ryu_driver.py
index c3a10a308..0cc30cd57 100644
--- a/quantum/plugins/ryu/tests/unit/test_ryu_driver.py
+++ b/quantum/plugins/ryu/tests/unit/test_ryu_driver.py
@@ -17,8 +17,8 @@
 
 import uuid
 
-import quantum.db.api as db
 from quantum.common.utils import find_config_file
+import quantum.db.api as db
 from quantum.plugins.ryu.common import config
 from quantum.plugins.ryu.tests.unit.basetest import BaseRyuTest
 from quantum.plugins.ryu.tests.unit import utils
diff --git a/quantum/plugins/ryu/tests/unit/utils.py b/quantum/plugins/ryu/tests/unit/utils.py
index 77b1f6cc6..de7ec20f4 100644
--- a/quantum/plugins/ryu/tests/unit/utils.py
+++ b/quantum/plugins/ryu/tests/unit/utils.py
@@ -16,9 +16,9 @@
 #    under the License.
 
 import ConfigParser
-from StringIO import StringIO
 import imp
 import os
+from StringIO import StringIO
 import tempfile
 
 import mock
diff --git a/quantum/policy.py b/quantum/policy.py
index 702d1cc51..f53dff6f9 100644
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -21,8 +21,8 @@ Policy engine for quantum.  Largely copied from nova.
 
 import os.path
 
-from quantum.common.utils import find_config_file
 from quantum.common import exceptions
+from quantum.common.utils import find_config_file
 from quantum.openstack.common import policy
 
 
diff --git a/quantum/quantum_plugin_base.py b/quantum/quantum_plugin_base.py
index b88b44769..69f91dc5a 100644
--- a/quantum/quantum_plugin_base.py
+++ b/quantum/quantum_plugin_base.py
@@ -22,8 +22,8 @@ QuantumPluginBase provides the definition of minimum set of
 methods that needs to be implemented by a Quantum Plug-in.
 """
 
-import inspect
 from abc import ABCMeta, abstractmethod
+import inspect
 
 
 class QuantumPluginBase(object):
diff --git a/quantum/tests/unit/_test_api.py b/quantum/tests/unit/_test_api.py
index 08b0ca2f1..26ac1fade 100644
--- a/quantum/tests/unit/_test_api.py
+++ b/quantum/tests/unit/_test_api.py
@@ -25,12 +25,12 @@ import os
 
 from quantum.api.api_common import APIFaultWrapper
 from quantum.api.networks import Controller
-from quantum.common.test_lib import test_config
 from quantum.common import config
+from quantum.common.test_lib import test_config
 from quantum.db import api as db
+from quantum.openstack.common import cfg
 from quantum.openstack.common import importutils
 import quantum.tests.unit.testlib_api as testlib
-from quantum.openstack.common import cfg
 from quantum.wsgi import XMLDeserializer, JSONDeserializer
 
 
diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py
index 90f1082f6..3faac848d 100644
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@ -12,8 +12,8 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the spec
 
-import os
 import logging
+import os
 import unittest
 import uuid
 
@@ -22,12 +22,12 @@ import webtest
 
 from webob import exc
 
-from quantum import context
-from quantum.common import exceptions as q_exc
 from quantum.api.v2 import resource as wsgi_resource
 from quantum.api.v2 import router
 from quantum.api.v2 import views
 from quantum.common import config
+from quantum.common import exceptions as q_exc
+from quantum import context
 from quantum.openstack.common import cfg
 
 
diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index d3e89d1d7..4351ba05f 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -13,17 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-import logging
-import unittest
 import contextlib
+import logging
 import mock
+import os
+import unittest
 
 import quantum
 from quantum.api.v2.router import APIRouter
+from quantum.common import config
 from quantum.common import exceptions as q_exc
 from quantum.db import api as db
-from quantum.common import config
 from quantum.openstack.common import cfg
 from quantum.tests.unit.testlib_api import create_request
 from quantum.wsgi import Serializer, JSONDeserializer
-- 
2.45.2