Reorder imports by full module path

Fixes bug #1014765

Change-Id: I849d73fc756b830b78492a6ed0e8cf2d32fde8cd

diff --git a/quantum/agent/linux/utils.py b/quantum/agent/linux/utils.py
index 8e9739474dfc04dc119661f7333ea51a007c1610..a2a0294c8bcefcfadaba0140fe4719ea3439ecb0 100644 (file)
--- 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 813ff40ec4250d6973e5700fce522b1f17c1a57a..2cec49a81fe87f6b9d6ebc370933664192323b9b 100644 (file)
--- 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 49a16b440c8f7116b1c8e929666287199da0d15e..4e0880232a1c3b1b2f2ad3e56f14f206a3b9c65b 100644 (file)
--- 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 6e2f9ecdafcaa612b9f71ac835073cd398c06384..adf574e90e724176bde71011098bbaa4c6a2c841 100644 (file)
--- 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 0b2d7a6f8c44d72ab330dda05b532d90ed2b7b35..2177bbe664ac1db8c699b5a2ed89866a2f8d3e1a 100644 (file)
--- 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 a2fa135e827c255c10e8aa7008378412d02bcd04..e3fe4785ba8b090f8d7cc277d0cce61ae88b7327 100644 (file)
--- 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 ffeae64f756b23323128526a8ea462a309ba1c17..8bc51bf9be7bb1e791d5b991b065c41b7961b0bd 100644 (file)
--- 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 4c27f4a6b0a6fb2625ed616e589773e4ccfbe320..54842b81573d32571fd61f83c38f83bfd86b4dbb 100644 (file)
--- 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 17a1593dae149e5009c7b4a9eab95de714a3cc6c..e2145dae8004befd1a24acbf31fb26faa5445c7d 100644 (file)
--- 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 9a455624c5eb753a0affd4ba946b4f8c1e4a4b8a..7530ddb7704c7c50edb586680b5c6171d2b7880e 100644 (file)
--- 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 5aba53272c051887c92db5e384302677fbf7ba07..8b252771eb10f16c1c5d59e0ea0bafa6f564e96c 100644 (file)
--- 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 c011c1acc25c5958d6dcf71259f33ff93f26cc92..cd5adfe10e16cc024041823113619ce8f0d9eb2b 100644 (file)
--- 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 e219e6caef506bc6382701c9c6c03c3ad4def8ed..1c7da7771ef9d16ab225966ade8e62b04b0fba76 100644 (file)
--- 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 b6eac458ca5944ef828513c90a1d99653312832d..ae03ac4396dd9d65589ff929818635cb3b47e29c 100644 (file)
--- 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 a19583b2aa91037c7e337bb59bd5945cb3862b86..cc5e6ba4b1749f831891302647387e0b5babbaac 100644 (file)
--- 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 7bbc82ef887709bd5e3585bb8fba69ccb5c4620c..4e44f9cdff7a38821f204944380887090531121b 100644 (file)
--- 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 bf486dc95e7be55670726eaed7a0487aa75f120e..db69a1270119a169b0de6321d47ccd46f16dca96 100644 (file)
--- 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 50375f40542259ff5d81dcc8dba63b46428e3e5a..b895a356efc36e1fb48f4e4d982436e00995cbfd 100644 (file)
--- 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 d335fbd22998eb52ee4ec6a1867528096e4b76ad..3440443cc15d818facfb2d99ec9d98760e298cbd 100644 (file)
--- 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 dfa2ec913d5d15cf9508795d6ac048603a174860..8eda5c64c7e5ffbbc4a151c92508ef1d3b3d20ec 100644 (file)
--- 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 a08a09c8b21bf0192c151c2c395496ce0dbb9ebf..b6b0a3efaafaef51ea3109f8f2b908e418a936e2 100644 (file)
--- 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 8160142a738b3c1801041d127b2de9b3dcdc1c20..8b32614a3672ddcc6332c453db2f0afafe83030c 100644 (file)
--- 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 03f953715a3209a3f403cac2f781c1f02b3da2a4..5698fbaa68b52a742641cb89d2ac0b9b6492eef1 100644 (file)
--- 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 98dc4b84bb94462d105e8a2bbee063154db3ced4..6a71c49cf3fdf242830cb6e8aac934f902ade1c5 100644 (file)
--- 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 737ad5dc4264e7b8753a2bc2084609663c090770..6fcb9323024280f19ff54228b0157c6ba790ada7 100644 (file)
--- 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 d96a8d9bc635bc74b648276689691fb729741d79..e49927ed65c59a1223573c971e05566344b3418e 100644 (file)
--- 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 33b4fdae9fd75bcc81915bdfb60198b65ad5dc36..f29e105fc6bbccfa6aa9ca69ffff465987ca9065 100644 (file)
--- 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 e0bce783df7f5a0784e5f6947fd9b996d978d907..722dd130c0c28745665b91f5b8214832985c5dfe 100644 (file)
--- 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 572a0c8fcdd4c292976f052d4dcc966c611fe389..231584f747e71d2bf42870fe37d876aacd49a3de 100644 (file)
--- 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 35e5fe19c000e8f75f4d4bc7c3d9428d7b7c3651..8263869d42f977ba0d83efc195972945a52b01aa 100644 (file)
--- 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 fd9a5dfde0988a6362705f89ed5ac908f70306ca..16ec5b23557cc89ffdde8e1b004ab0471aece4f0 100644 (file)
--- 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 c6af60f3b46ed43b0e15cf6dce568a5463cfbce4..4c1a8cfb6cd6b26fdceb3b1b14a077a598bd2d08 100644 (file)
--- 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 1c81b027cf19af34fdd8dc269d4484121268e2f4..ded216d4e5739c8dc700632a8e8b4a2203f26de8 100644 (file)
--- 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 c3a10a308cf11ba14024a52dc7fccdb784a51731..0cc30cd57f892d4fd11a22774b4697ee19c8bd25 100644 (file)
--- 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 77b1f6cc60c7a50365e956a11cfee831cea049ce..de7ec20f46e5c244eed12ca1dbbabe7e76263265 100644 (file)
--- 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 702d1cc51219d3353af24c45ecc9cd634c6a8ed3..f53dff6f9f0b9f6171ac4b5e40d9eccb956c96e1 100644 (file)
--- 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 b88b4476945ef7ceeccf53dc53c8def0a0fad973..69f91dc5a77f72cc82076e6fb92a3ddc1c731971 100644 (file)
--- 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 08b0ca2f1014de0a9f62e348e16deed93d6826ab..26ac1fadeff3aab3a5be35760a80298f223c650b 100644 (file)
--- 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 90f1082f6e538fe2439890aa16f6114784c9e9e4..3faac848d6750b41157653513cd020a35195f88a 100644 (file)
--- 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 d3e89d1d71b769650f8396ee2ecb1fe2057275d1..4351ba05fc2c8d5fd8debe866424cbda1a2f6bf4 100644 (file)
--- 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