From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Wed, 16 Jan 2013 03:36:22 +0000 (+0800)
Subject: Fixes import order nits
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=20894c305c129e0fc7f8f21cdc339eb301024361;p=openstack-build%2Fneutron-build.git

Fixes import order nits

Change-Id: Ide6dff579a126c9af5b593f9ce541873a7643415
---

diff --git a/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py
index db1262868..8d4b4eff0 100644
--- a/quantum/db/loadbalancer/loadbalancer_db.py
+++ b/quantum/db/loadbalancer/loadbalancer_db.py
@@ -21,7 +21,6 @@ from sqlalchemy.orm import exc
 from sqlalchemy.sql import expression as expr
 import webob.exc as w_exc
 
-from quantum import policy
 from quantum.api.v2 import attributes
 from quantum.common import exceptions as q_exc
 from quantum.db import db_base_plugin_v2
@@ -33,6 +32,7 @@ from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import uuidutils
 from quantum.plugins.common import constants
+from quantum import policy
 
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/hyperv/hyperv_quantum_plugin.py b/quantum/plugins/hyperv/hyperv_quantum_plugin.py
index e7bdd8dcb..0898c8f4b 100644
--- a/quantum/plugins/hyperv/hyperv_quantum_plugin.py
+++ b/quantum/plugins/hyperv/hyperv_quantum_plugin.py
@@ -33,9 +33,9 @@ from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import proxy
+from quantum.plugins.hyperv import agent_notifier_api
 from quantum.plugins.hyperv.common import constants
 from quantum.plugins.hyperv import db as hyperv_db
-from quantum.plugins.hyperv import agent_notifier_api
 from quantum.plugins.hyperv import rpc_callbacks
 from quantum import policy
 
diff --git a/quantum/plugins/hyperv/rpc_callbacks.py b/quantum/plugins/hyperv/rpc_callbacks.py
index 9425c049a..c5201daf5 100644
--- a/quantum/plugins/hyperv/rpc_callbacks.py
+++ b/quantum/plugins/hyperv/rpc_callbacks.py
@@ -33,8 +33,8 @@ from quantum.openstack.common import cfg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import rpc
 from quantum.openstack.common.rpc import proxy
-from quantum.plugins.hyperv import db as hyperv_db
 from quantum.plugins.hyperv.common import constants
+from quantum.plugins.hyperv import db as hyperv_db
 from quantum import policy
 
 LOG = logging.getLogger(__name__)
diff --git a/quantum/plugins/nec/nec_plugin.py b/quantum/plugins/nec/nec_plugin.py
index a492e10e3..c291d62de 100644
--- a/quantum/plugins/nec/nec_plugin.py
+++ b/quantum/plugins/nec/nec_plugin.py
@@ -15,8 +15,8 @@
 #    under the License.
 # @author: Ryota MIBU
 
-from quantum.common import topics
 from quantum.common import rpc as q_rpc
+from quantum.common import topics
 from quantum import context
 from quantum.db import dhcp_rpc_base
 from quantum.db import l3_db
diff --git a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
index 81f5b1202..db94a0846 100644
--- a/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
+++ b/quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py
@@ -16,19 +16,20 @@
 import contextlib
 import logging
 import os
+
 import unittest2
 import webob.exc
 
 import quantum
-from quantum import context
-from quantum.api.extensions import PluginAwareExtensionManager
 from quantum.api.extensions import ExtensionMiddleware
+from quantum.api.extensions import PluginAwareExtensionManager
 from quantum.api.v2 import attributes
 from quantum.api.v2.attributes import ATTR_NOT_SPECIFIED
 from quantum.api.v2.router import APIRouter
 from quantum.common import config
 from quantum.common import exceptions as q_exc
 from quantum.common.test_lib import test_config
+from quantum import context
 from quantum.db import api as db
 from quantum.db import db_base_plugin_v2
 from quantum.db import models_v2
diff --git a/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py b/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py
index ffddbea28..aa8184f88 100644
--- a/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py
+++ b/quantum/tests/unit/hyperv/test_hyperv_quantum_agent.py
@@ -20,13 +20,13 @@
 Unit tests for Windows Hyper-V virtual switch quantum driver
 """
 
-import mock
-import sys
+import sys
 
-import unittest2 as unittest
+import mock
+import unittest2 as unittest
 
-from quantum.openstack.common import cfg
-from quantum.plugins.hyperv.agent import hyperv_quantum_agent
+from quantum.openstack.common import cfg
+from quantum.plugins.hyperv.agent import hyperv_quantum_agent
 
 
 class TestHyperVQuantumAgent(unittest.TestCase):
diff --git a/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py b/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py
index afcaf0e2a..c278f4986 100644
--- a/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py
+++ b/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py
@@ -16,13 +16,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import contextlib
+import contextlib
 
-from quantum import context
-from quantum.extensions import portbindings
-from quantum.manager import QuantumManager
-from quantum.openstack.common import cfg
-from quantum.tests.unit import test_db_plugin as test_plugin
+from quantum import context
+from quantum.extensions import portbindings
+from quantum.manager import QuantumManager
+from quantum.openstack.common import cfg
+from quantum.tests.unit import test_db_plugin as test_plugin
 
 
 class HyperVQuantumPluginTestCase(test_plugin.QuantumDbPluginV2TestCase):
diff --git a/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py b/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py
index f20fdf2f2..dcb412236 100644
--- a/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py
+++ b/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py
@@ -20,15 +20,15 @@
 Unit Tests for hyperv quantum rpc
 """
 
-import mock
-import unittest2
-
-from quantum.agent import rpc as agent_rpc
-from quantum.common import topics
-from quantum.openstack.common import context
-from quantum.openstack.common import rpc
-from quantum.plugins.hyperv.common import constants
-from quantum.plugins.hyperv import agent_notifier_api as ana
+import mock
+import unittest2
+
+from quantum.agent import rpc as agent_rpc
+from quantum.common import topics
+from quantum.openstack.common import context
+from quantum.openstack.common import rpc
+from quantum.plugins.hyperv import agent_notifier_api as ana
+from quantum.plugins.hyperv.common import constants
 
 
 class rpcHyperVApiTestCase(unittest2.TestCase):
diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index e3ecdd26f..c3f7b183e 100644
--- a/quantum/tests/unit/test_db_plugin.py
+++ b/quantum/tests/unit/test_db_plugin.py
@@ -22,8 +22,8 @@ import os
 import random
 
 import mock
-import unittest2
 import sqlalchemy as sa
+import unittest2
 import webob.exc
 
 import quantum