Fixes import reorder nits

Fixes bug #1133080

Change-Id: I31e56cea9b7310cfd16c0340ba270c4a777c200c

diff --git a/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py
index ea44ad461b15091980930700990da2314f1fdd79..359c8768be4cf4d0c17145784c70b5b2c87067cb 100644 (file)
--- a/quantum/agent/netns_cleanup_util.py
+++ b/quantum/agent/netns_cleanup_util.py
@@ -20,9 +20,9 @@ import re
 import eventlet
 from oslo.config import cfg
 
+from quantum.agent.common import config as agent_config
 from quantum.agent import dhcp_agent
 from quantum.agent import l3_agent
-from quantum.agent.common import config as agent_config
 from quantum.agent.linux import dhcp
 from quantum.agent.linux import ip_lib
 from quantum.agent.linux import ovs_lib

diff --git a/quantum/agent/ovs_cleanup_util.py b/quantum/agent/ovs_cleanup_util.py
index 819bcab0900e8d979e68630d636f3489588545e8..585232c93622d87a71d5fa5e094c27ce10c75668 100644 (file)
--- a/quantum/agent/ovs_cleanup_util.py
+++ b/quantum/agent/ovs_cleanup_util.py
@@ -17,8 +17,8 @@
 
 from oslo.config import cfg
 
-from quantum.agent import l3_agent
 from quantum.agent.common import config as agent_config
+from quantum.agent import l3_agent
 from quantum.agent.linux import interface
 from quantum.agent.linux import ip_lib
 from quantum.agent.linux import ovs_lib

diff --git a/quantum/db/routerservicetype_db.py b/quantum/db/routerservicetype_db.py
index d764769feefa6494f9b8a9569856623140d2497d..f667bd36383c9d095c2b815af8aaa04a5fbd946f 100644 (file)
--- a/quantum/db/routerservicetype_db.py
+++ b/quantum/db/routerservicetype_db.py
@@ -16,8 +16,8 @@
 #
 # @author: Kaiwei Fan, VMware, 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 routerservicetype as rst

diff --git a/quantum/plugins/nec/drivers/pfc.py b/quantum/plugins/nec/drivers/pfc.py
index 92614573fc8581839b7a4e33dff65d390aef52dd..1694e989154b3f74be3d989562f94089c4f1f5ca 100644 (file)
--- a/quantum/plugins/nec/drivers/pfc.py
+++ b/quantum/plugins/nec/drivers/pfc.py
@@ -19,8 +19,8 @@
 import re
 import uuid
 
-from quantum.plugins.nec.db import api as ndb
 from quantum.plugins.nec.common import ofc_client
+from quantum.plugins.nec.db import api as ndb
 from quantum.plugins.nec import ofc_driver_base
 
 

diff --git a/quantum/plugins/nec/drivers/trema.py b/quantum/plugins/nec/drivers/trema.py
index 4336994e2e304b638d888bc8bbd5aff6d6ce3c37..b97f81da98cbf48021cdb8d0b38478572dd7091f 100644 (file)
--- a/quantum/plugins/nec/drivers/trema.py
+++ b/quantum/plugins/nec/drivers/trema.py
@@ -17,8 +17,8 @@
 # @author: Akihiro MOTOKI
 
 from quantum.openstack.common import uuidutils
-from quantum.plugins.nec.db import api as ndb
 from quantum.plugins.nec.common import ofc_client
+from quantum.plugins.nec.db import api as ndb
 from quantum.plugins.nec import ofc_driver_base
 
 

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
index 70aa16f6036324919965891858cf342128cd3be2..821a24bee4252da664ccab16e4a53363dcae5131 100644 (file)
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_db.py
@@ -19,8 +19,8 @@ from sqlalchemy.orm import exc
 
 import quantum.db.api as db
 from quantum.openstack.common import log as logging
-from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db
 from quantum.plugins.nicira.nicira_nvp_plugin import nicira_models
+from quantum.plugins.nicira.nicira_nvp_plugin import nicira_networkgw_db
 
 LOG = logging.getLogger(__name__)
 

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py
index d01eedaed5d571a0262e1f56d2ce4d8e7b46ab0a..172bc3f9ff6c4cdf57a06ddcd31bdf73fbccd9c4 100644 (file)
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_networkgw_db.py
@@ -29,8 +29,8 @@ from quantum.common import exceptions
 from quantum.db import db_base_plugin_v2
 from quantum.db import model_base
 from quantum.db import models_v2
-from quantum.openstack.common import uuidutils
 from quantum.openstack.common import log as logging
+from quantum.openstack.common import uuidutils
 from quantum.plugins.nicira.nicira_nvp_plugin.extensions import nvp_networkgw
 from quantum import policy
 

diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index 070e2209b7e3bf847a6e2f95c6fb5c10106a71fc..2c384ec30fcc15cee86601ac37e26c628b0a4c66 100644 (file)
--- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
@@ -36,11 +36,11 @@ from quantum.common import constants as q_const
 from quantum.common import topics
 from quantum.common import utils as q_utils
 from quantum import context
+from quantum.extensions import securitygroup as ext_sg
 from quantum.openstack.common import log as logging
 from quantum.openstack.common import loopingcall
 from quantum.openstack.common.rpc import dispatcher
 from quantum.plugins.openvswitch.common import config
-from quantum.extensions import securitygroup as ext_sg
 from quantum.plugins.openvswitch.common import constants
 
 

diff --git a/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py b/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py
index f3e299ab8cd74c496ddadf4873c7745b1b29c5c6..67771d73840f1678979460f1106ff4a242cc362d 100644 (file)
--- a/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py
+++ b/quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py
@@ -29,9 +29,9 @@ from quantum.db import api as db
 from quantum.db import db_base_plugin_v2
 from quantum.openstack.common import log as logging
 from quantum.plugins.plumgrid.common import exceptions as plum_excep
+from quantum.plugins.plumgrid.plumgrid_nos_plugin.plugin_ver import VERSION
 from quantum.plugins.plumgrid.plumgrid_nos_plugin import plumgrid_nos_snippets
 from quantum.plugins.plumgrid.plumgrid_nos_plugin import rest_connection
-from quantum.plugins.plumgrid.plumgrid_nos_plugin.plugin_ver import VERSION
 
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/plugins/ryu/agent/ryu_quantum_agent.py b/quantum/plugins/ryu/agent/ryu_quantum_agent.py
index 684b13961eb580fb33cec0550afd10bcd06a5666..ff292e8e9ccff3cb017e6d0145a9c5533b15c037 100755 (executable)
--- a/quantum/plugins/ryu/agent/ryu_quantum_agent.py
+++ b/quantum/plugins/ryu/agent/ryu_quantum_agent.py
@@ -40,9 +40,9 @@ from quantum.common import config as logging_config
 from quantum.common import exceptions as q_exc
 from quantum.common import topics
 from quantum import context as q_context
+from quantum.extensions import securitygroup as ext_sg
 from quantum.openstack.common import log
 from quantum.openstack.common.rpc import dispatcher
-from quantum.extensions import securitygroup as ext_sg
 from quantum.plugins.ryu.common import config
 
 

diff --git a/quantum/tests/unit/extensions/extensionattribute.py b/quantum/tests/unit/extensions/extensionattribute.py
index 0690538f9894f50f3ad27a41a5c10a6b8c18155d..4f8d5fd7f1b04f6279b98eee04884a3c9659c079 100644 (file)
--- a/quantum/tests/unit/extensions/extensionattribute.py
+++ b/quantum/tests/unit/extensions/extensionattribute.py
@@ -20,9 +20,10 @@
 
 from abc import abstractmethod
 
-from quantum import manager, quota
 from quantum.api import extensions
 from quantum.api.v2 import base
+from quantum import manager
+from quantum import quota
 
 
 # Attribute Map

diff --git a/quantum/tests/unit/nec/test_db.py b/quantum/tests/unit/nec/test_db.py
index 922a7b2b7aa92c344b672696f3f2868472fb7669..58cbaef5558cbadf92f26de4bff2436bea88a648 100644 (file)
--- a/quantum/tests/unit/nec/test_db.py
+++ b/quantum/tests/unit/nec/test_db.py
@@ -18,8 +18,8 @@
 import random
 import unittest
 
-from quantum.openstack.common import uuidutils
 from quantum.db import api as db_api
+from quantum.openstack.common import uuidutils
 from quantum.plugins.nec.common import exceptions as nexc
 from quantum.plugins.nec.db import api as ndb
 from quantum.plugins.nec.db import models as nmodels

diff --git a/quantum/tests/unit/nicira/test_networkgw.py b/quantum/tests/unit/nicira/test_networkgw.py
index de9305c0a929e42036c4ef5491b9c99a2700b2cf..03aac871918fa03b49c3bb65f801834a9cc242ea 100644 (file)
--- a/quantum/tests/unit/nicira/test_networkgw.py
+++ b/quantum/tests/unit/nicira/test_networkgw.py
@@ -17,8 +17,8 @@ import contextlib
 
 import mock
 import unittest2 as unittest
-import webtest
 from webob import exc
+import webtest
 
 from quantum.api import extensions
 from quantum.api.extensions import PluginAwareExtensionManager

diff --git a/quantum/tests/unit/nicira/test_nicira_plugin.py b/quantum/tests/unit/nicira/test_nicira_plugin.py
index 5411fd1d1b872e23ad786f461636fb3ddc3dbec9..803b7039032109d4c8934683305dd63bd7d45d20 100644 (file)
--- a/quantum/tests/unit/nicira/test_nicira_plugin.py
+++ b/quantum/tests/unit/nicira/test_nicira_plugin.py
@@ -18,8 +18,8 @@ import logging
 import os
 
 import mock
-from oslo.config import cfg
 import netaddr
+from oslo.config import cfg
 import webob.exc
 
 from quantum.common import constants
@@ -35,10 +35,10 @@ from quantum.plugins.nicira.nicira_nvp_plugin.extensions import (nvp_qos
 from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
 from quantum.tests.unit.nicira import fake_nvpapiclient
 import quantum.tests.unit.nicira.test_networkgw as test_l2_gw
-from quantum.tests.unit import test_extensions
 import quantum.tests.unit.test_db_plugin as test_plugin
 import quantum.tests.unit.test_extension_portsecurity as psec
 import quantum.tests.unit.test_extension_security_group as ext_sg
+from quantum.tests.unit import test_extensions
 import quantum.tests.unit.test_l3_plugin as test_l3_plugin
 
 LOG = logging.getLogger(__name__)

diff --git a/quantum/tests/unit/nicira/test_nvplib.py b/quantum/tests/unit/nicira/test_nvplib.py
index 50fa53b80593fc9024b79f043f3ca307185bcfd1..9f40b6218847d0b5c141c5b9384b9541ed4cf83e 100644 (file)
--- a/quantum/tests/unit/nicira/test_nvplib.py
+++ b/quantum/tests/unit/nicira/test_nvplib.py
@@ -21,10 +21,10 @@ import mock
 import unittest2 as unittest
 
 from quantum.openstack.common import jsonutils as json
-from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
+import quantum.plugins.nicira.nicira_nvp_plugin as nvp_plugin
 from quantum.plugins.nicira.nicira_nvp_plugin import nvp_cluster
+from quantum.plugins.nicira.nicira_nvp_plugin import NvpApiClient
 from quantum.plugins.nicira.nicira_nvp_plugin import nvplib
-import quantum.plugins.nicira.nicira_nvp_plugin as nvp_plugin
 from quantum.tests.unit.nicira import fake_nvpapiclient
 from quantum.tests.unit import test_api_v2
 

diff --git a/quantum/tests/unit/test_agent_ext_plugin.py b/quantum/tests/unit/test_agent_ext_plugin.py
index 60f65d97fdee0e47ad72c015f27eb8a16970554f..f38b72c48968e8693880366c95fbf9a1bfe6ffc4 100644 (file)
--- a/quantum/tests/unit/test_agent_ext_plugin.py
+++ b/quantum/tests/unit/test_agent_ext_plugin.py
@@ -21,8 +21,8 @@ import time
 from webob import exc
 
 from quantum.common import constants
-from quantum.common import topics
 from quantum.common.test_lib import test_config
+from quantum.common import topics
 from quantum import context
 from quantum.db import agents_db
 from quantum.db import db_base_plugin_v2

diff --git a/quantum/tests/unit/test_api_v2.py b/quantum/tests/unit/test_api_v2.py
index 0256fe3b86e89a3d47924fa9795a797e3836e71e..732cfd35bcdc1d8d381557987e49d46129bd060e 100644 (file)
--- a/quantum/tests/unit/test_api_v2.py
+++ b/quantum/tests/unit/test_api_v2.py
@@ -25,8 +25,8 @@ import webob
 from webob import exc
 import webtest
 
-from quantum.api.extensions import PluginAwareExtensionManager
 from quantum.api import api_common
+from quantum.api.extensions import PluginAwareExtensionManager
 from quantum.api.v2 import attributes
 from quantum.api.v2 import base
 from quantum.api.v2 import router

diff --git a/quantum/tests/unit/test_l3_agent.py b/quantum/tests/unit/test_l3_agent.py
index 7cf8b430710202cdbaec99a75bbf4a258e7ff2a5..2bb024cc892d989198745fd884585f6080169b17 100644 (file)
--- a/quantum/tests/unit/test_l3_agent.py
+++ b/quantum/tests/unit/test_l3_agent.py
@@ -21,8 +21,8 @@ import unittest2
 import mock
 from oslo.config import cfg
 
-from quantum.agent import l3_agent
 from quantum.agent.common import config as agent_config
+from quantum.agent import l3_agent
 from quantum.agent.linux import interface
 from quantum.common import config as base_config
 from quantum.common import constants as l3_constants

diff --git a/quantum/tests/unit/test_routerserviceinsertion.py b/quantum/tests/unit/test_routerserviceinsertion.py
index 633629f27ecdfca8ce29f30623a22f723f39806d..a764026b153195c80d7491ea451967698761b33b 100644 (file)
--- a/quantum/tests/unit/test_routerserviceinsertion.py
+++ b/quantum/tests/unit/test_routerserviceinsertion.py
@@ -21,9 +21,9 @@ import quantum
 from quantum.api import extensions
 from quantum.api.v2 import router
 from quantum.common import config
-from quantum.db.loadbalancer import loadbalancer_db as lb_db
 from quantum.db import db_base_plugin_v2
 from quantum.db import l3_db
+from quantum.db.loadbalancer import loadbalancer_db as lb_db
 from quantum.db import routedserviceinsertion_db as rsi_db
 from quantum.db import routerservicetype_db as rst_db
 from quantum.db import servicetype_db as st_db