Fixes import order errors

Change-Id: I3df7bfb2e0812b006fa41bd76fb6156ebcd74362

diff --git a/quantum/common/exceptions.py b/quantum/common/exceptions.py
index 2892c451844846972fb9f0bdd4022abe14e57e3b..cc91eeca57ac9e35c6fc72bd61152ea0cc0923ba 100644 (file)
--- a/quantum/common/exceptions.py
+++ b/quantum/common/exceptions.py
@@ -20,8 +20,8 @@ Quantum base exception handling.
 """
 
 from quantum.openstack.common.exception import Error
-from quantum.openstack.common.exception import OpenstackException
 from quantum.openstack.common.exception import InvalidContentType
+from quantum.openstack.common.exception import OpenstackException
 
 
 class QuantumException(OpenstackException):

diff --git a/quantum/db/portsecurity_db.py b/quantum/db/portsecurity_db.py
index c409990645351e04f62979818f35c3de73705d99..e4f2f44d9c20cc28ca0df73ae655acbda12f01fd 100644 (file)
--- a/quantum/db/portsecurity_db.py
+++ b/quantum/db/portsecurity_db.py
@@ -16,8 +16,8 @@
 #
 # @author: Aaron Rosen, Nicira, Inc
 
-from sqlalchemy.orm import exc
 import sqlalchemy as sa
+from sqlalchemy.orm import exc
 
 from quantum.db import model_base
 from quantum.extensions import portsecurity as psec

diff --git a/quantum/plugins/nec/nec_plugin.py b/quantum/plugins/nec/nec_plugin.py
index b4f94443c117c5b8134df565449c27941e5cef8b..552f8ce0588087c0cfd01fdd761c251bd2f26424 100644 (file)
--- a/quantum/plugins/nec/nec_plugin.py
+++ b/quantum/plugins/nec/nec_plugin.py
@@ -21,9 +21,9 @@ from quantum import context
 from quantum.db import dhcp_rpc_base
 from quantum.db import l3_db
 from quantum.db import l3_rpc_base
-from quantum.extensions import portbindings
 #NOTE(amotoki): quota_db cannot be removed, it is for db model
 from quantum.db import quota_db
+from quantum.extensions import portbindings
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.plugins.nec.common import config

diff --git a/quantum/tests/unit/nec/test_nec_plugin.py b/quantum/tests/unit/nec/test_nec_plugin.py
index 54412ac59cabf3699f73608b60d7a9d51b52c6e0..9a06f96d779c14339905ce6bc9b56920bd3e6477 100644 (file)
--- a/quantum/tests/unit/nec/test_nec_plugin.py
+++ b/quantum/tests/unit/nec/test_nec_plugin.py
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from quantum.extensions import portbindings
-from quantum.tests.unit import test_db_plugin as test_plugin
 from quantum.tests.unit import _test_extension_portbindings as test_bindings
+from quantum.tests.unit import test_db_plugin as test_plugin
 
 
 class NecPluginV2TestCase(test_plugin.QuantumDbPluginV2TestCase):

diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py
index ce954e2d564115205bc5fe6c4aada396cde7a58a..01a0a7e7b012a291e7f977dbb5529a1640cd5db6 100644 (file)
--- a/quantum/tests/unit/test_l3_plugin.py
+++ b/quantum/tests/unit/test_l3_plugin.py
@@ -42,8 +42,8 @@ from quantum.extensions import l3
 from quantum import manager
 from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
-from quantum.openstack.common.notifier import test_notifier
 from quantum.openstack.common.notifier import api as notifier_api
+from quantum.openstack.common.notifier import test_notifier
 from quantum.openstack.common import uuidutils
 from quantum.tests.unit import test_api_v2
 from quantum.tests.unit import test_db_plugin

diff --git a/quantum/tests/unit/test_wsgi.py b/quantum/tests/unit/test_wsgi.py
index 049b54f282a12f74c103834b1190eb855ce15858..d455fe41bedbbeec4d375f40b98dbb0fbdfd43d4 100644 (file)
--- a/quantum/tests/unit/test_wsgi.py
+++ b/quantum/tests/unit/test_wsgi.py
@@ -20,8 +20,8 @@ import socket
 
 import unittest2 as unittest
 
-from quantum import wsgi
 from quantum.common import exceptions as exception
+from quantum import wsgi
 
 
 class TestWSGIServer(unittest.TestCase):