Fixes import order nits

Change-Id: Ide6dff579a126c9af5b593f9ce541873a7643415

diff --git a/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py
index db12628685cee7933948c4863e8970844eeebd8b..8d4b4eff0e1ab9ab41a373a17d411c124f888804 100644 (file)
--- 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 e7bdd8dcb7f7d07e9de39ee271d389bac013bf87..0898c8f4b42544342c0cfd825db37093bb7f9967 100644 (file)
--- 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 9425c049afd8987452c409d11809ddeccabb77dc..c5201daf5df10b0163b087b2830b6864714b5121 100644 (file)
--- 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 a492e10e3a07cfe8e0d2c03d260a501f98938581..c291d62deccdf6fb283ec1ca32639e6e40d6440d 100644 (file)
--- 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 81f5b12022be5a57febd71af29bb803c3065e710..db94a08462a8b4cc130a57f509463e31d4b2cc78 100644 (file)
--- 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 ffddbea28c3dd6be271764f46329948fe827d11c..aa8184f883458727de97d82b6f5d2aad22717da0 100644 (file)
--- 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\r
 """\r
 \r
-import mock\r
-import sys\r
+import sys
 \r
-import unittest2 as unittest\r
+import mock
+import unittest2 as unittest
 \r
-from quantum.openstack.common import cfg\r
-from quantum.plugins.hyperv.agent import hyperv_quantum_agent\r
+from quantum.openstack.common import cfg
+from quantum.plugins.hyperv.agent import hyperv_quantum_agent
 \r
 \r
 class TestHyperVQuantumAgent(unittest.TestCase):\r

diff --git a/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py b/quantum/tests/unit/hyperv/test_hyperv_quantum_plugin.py
index afcaf0e2adb2a22e60dae56a270a093a3c96cb4b..c278f4986732822019e014674b21009e21728f3a 100644 (file)
--- 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\r
 #    under the License.\r
 \r
-import contextlib\r
+import contextlib
 \r
-from quantum import context\r
-from quantum.extensions import portbindings\r
-from quantum.manager import QuantumManager\r
-from quantum.openstack.common import cfg\r
-from quantum.tests.unit import test_db_plugin as test_plugin\r
+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
 \r
 \r
 class HyperVQuantumPluginTestCase(test_plugin.QuantumDbPluginV2TestCase):\r

diff --git a/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py b/quantum/tests/unit/hyperv/test_hyperv_rpcapi.py
index f20fdf2f2e6a27afd361ed437199cec851e1bd98..dcb41223649c61fd14b9c993651109361176d0ea 100644 (file)
--- 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\r
 """\r
 \r
-import mock\r
-import unittest2\r
-\r
-from quantum.agent import rpc as agent_rpc\r
-from quantum.common import topics\r
-from quantum.openstack.common import context\r
-from quantum.openstack.common import rpc\r
-from quantum.plugins.hyperv.common import constants\r
-from quantum.plugins.hyperv import agent_notifier_api as ana\r
+import mock
+import unittest2
+\r
+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
 \r
 \r
 class rpcHyperVApiTestCase(unittest2.TestCase):\r

diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py
index e3ecdd26f9caec4ccba2527d3dd574958291ebfd..c3f7b183e120be77a22cc6a4703700675c11cd02 100644 (file)
--- 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