Import order cleanup per HACKING

Change-Id: I5540a5d24f45aa51e0ef58b43427fbaf7726da89

diff --git a/cinder/api/auth.py b/cinder/api/auth.py
index 9930b7352f6d42f7002de04a48af65f7336a2bed..cea6c60c5d7e4f299263fee5dad88cfac19cc3e8 100644 (file)
--- a/cinder/api/auth.py
+++ b/cinder/api/auth.py
@@ -23,8 +23,8 @@ import webob.exc
 
 from cinder import context
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder import wsgi
 
 

diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index 117babd98403bfb4b445feeb0a55a12691136bef..9f6079dd3a5936673cdd839767a4716ba57931ac 100644 (file)
--- a/cinder/api/openstack/__init__.py
+++ b/cinder/api/openstack/__init__.py
@@ -24,9 +24,9 @@ import routes
 import webob.dec
 import webob.exc
 
-from cinder import utils
 from cinder.api.openstack import wsgi
 from cinder.openstack.common import log as logging
+from cinder import utils
 from cinder import wsgi as base_wsgi
 
 

diff --git a/cinder/api/openstack/common.py b/cinder/api/openstack/common.py
index 255a0a743a08bb0bd082668fe789f3bbf42f39d3..465269cd50b587900271a6a086a265be23e8954b 100644 (file)
--- a/cinder/api/openstack/common.py
+++ b/cinder/api/openstack/common.py
@@ -21,9 +21,9 @@ import urlparse
 
 import webob
 
-from cinder import flags
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
+from cinder import flags
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/api/openstack/extensions.py b/cinder/api/openstack/extensions.py
index a615f2a08e6d09f0a68c34c6e040f5fc9a77ea76..718607b9498b98e6e331411ef846e6cfb92ec533 100644 (file)
--- a/cinder/api/openstack/extensions.py
+++ b/cinder/api/openstack/extensions.py
@@ -26,9 +26,9 @@ from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import exception as common_exception
 from cinder.openstack.common import importutils
+from cinder.openstack.common import log as logging
 import cinder.policy
 
 

diff --git a/cinder/api/openstack/urlmap.py b/cinder/api/openstack/urlmap.py
index 52b7298600e0f111e529f0a35b6a3cbb2877faab..894d36cb8ef2fca732df5e19625e6d657e366e83 100644 (file)
--- a/cinder/api/openstack/urlmap.py
+++ b/cinder/api/openstack/urlmap.py
@@ -19,8 +19,8 @@ import paste.urlmap
 import re
 import urllib2
 
-from cinder.openstack.common import log as logging
 from cinder.api.openstack import wsgi
+from cinder.openstack.common import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'

diff --git a/cinder/api/openstack/volume/__init__.py b/cinder/api/openstack/volume/__init__.py
index 9a99451008f0eeafa0f6d8d8c0adc8374ebff9c8..8f5095597424f2f147e1e9e8d73a853e00b435ac 100644 (file)
--- a/cinder/api/openstack/volume/__init__.py
+++ b/cinder/api/openstack/volume/__init__.py
@@ -25,8 +25,8 @@ from cinder.api.openstack.volume import extensions
 from cinder.api.openstack.volume import limits
 from cinder.api.openstack.volume import snapshots
 from cinder.api.openstack.volume import types
-from cinder.api.openstack.volume import volumes
 from cinder.api.openstack.volume import versions
+from cinder.api.openstack.volume import volumes
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/api/openstack/volume/contrib/__init__.py b/cinder/api/openstack/volume/contrib/__init__.py
index 33b312f97eb9ce929ae6decf0b10cda2948fdbff..7672a74a863274749c029d23b77ba49cb77830e5 100644 (file)
--- a/cinder/api/openstack/volume/contrib/__init__.py
+++ b/cinder/api/openstack/volume/contrib/__init__.py
@@ -21,9 +21,9 @@ It can't be called 'extensions' because that causes namespacing problems.
 
 """
 
+from cinder.api.openstack import extensions
 from cinder import flags
 from cinder.openstack.common import log as logging
-from cinder.api.openstack import extensions
 
 
 FLAGS = flags.FLAGS

diff --git a/cinder/api/openstack/volume/contrib/admin_actions.py b/cinder/api/openstack/volume/contrib/admin_actions.py
index c427f3e45bff31761588f4b9086d36b17af80549..2794b11a117f87b313d871dfb6fa358cbd4bf172 100644 (file)
--- a/cinder/api/openstack/volume/contrib/admin_actions.py
+++ b/cinder/api/openstack/volume/contrib/admin_actions.py
@@ -19,8 +19,8 @@ from cinder.api.openstack import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
 from cinder import exception
-from cinder import volume
 from cinder.openstack.common import log as logging
+from cinder import volume
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py b/cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py
index 348ca510aa8c8b3c81bb17cc039a886dbb546396..3b9f8cd2bbf7168e3554de944dbad4269e3bea2d 100644 (file)
--- a/cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py
+++ b/cinder/api/openstack/volume/contrib/extended_snapshot_attributes.py
@@ -19,10 +19,10 @@ from webob import exc
 from cinder.api.openstack import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
-from cinder import volume
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging
+from cinder import volume
 
 
 FLAGS = flags.FLAGS

diff --git a/cinder/api/openstack/volume/contrib/volume_actions.py b/cinder/api/openstack/volume/contrib/volume_actions.py
index 5c6276646cea81ff56dd6edc3a44e9a4d851c643..e0882e9b20ed5620a4052af3a5fd5ff7c02d7eed 100644 (file)
--- a/cinder/api/openstack/volume/contrib/volume_actions.py
+++ b/cinder/api/openstack/volume/contrib/volume_actions.py
@@ -18,11 +18,11 @@ from xml.dom import minidom
 from cinder.api.openstack import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
-from cinder import volume
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.rpc import common as rpc_common
+from cinder import volume
 
 
 FLAGS = flags.FLAGS

diff --git a/cinder/api/openstack/volume/snapshots.py b/cinder/api/openstack/volume/snapshots.py
index 59d26a6e0501dbad711e6fe9d9e1887b126a539b..bf12d30a39384a77c032804fc9278ef242616b27 100644 (file)
--- a/cinder/api/openstack/volume/snapshots.py
+++ b/cinder/api/openstack/volume/snapshots.py
@@ -15,13 +15,13 @@
 
 """The volumes snapshots api."""
 
-from webob import exc
 import webob
+from webob import exc
 
 from cinder.api.openstack import common
+from cinder.api.openstack.volume import volumes
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
-from cinder.api.openstack.volume import volumes
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging

diff --git a/cinder/api/openstack/volume/types.py b/cinder/api/openstack/volume/types.py
index 2a9bd364a16069a9a4ff2ca880887f4b32aea2d7..467c22c87d3a6300d6d19d8a9068e4614414f2f6 100644 (file)
--- a/cinder/api/openstack/volume/types.py
+++ b/cinder/api/openstack/volume/types.py
@@ -19,9 +19,9 @@
 
 from webob import exc
 
+from cinder.api.openstack.volume.views import types as views_types
 from cinder.api.openstack import wsgi
 from cinder.api.openstack import xmlutil
-from cinder.api.openstack.volume.views import types as views_types
 from cinder import exception
 from cinder.volume import volume_types
 

diff --git a/cinder/api/openstack/volume/volumes.py b/cinder/api/openstack/volume/volumes.py
index f283fd8fa60bf68301346680c8b2a98ab71d1f68..20208a16e89ecdc703fc9f81c20d8ed92775cb68 100644 (file)
--- a/cinder/api/openstack/volume/volumes.py
+++ b/cinder/api/openstack/volume/volumes.py
@@ -15,8 +15,8 @@
 
 """The volumes api."""
 
-from webob import exc
 import webob
+from webob import exc
 from xml.dom import minidom
 
 from cinder.api.openstack import common

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 9bfc8b061f6ac56c8c531df137613465bd319ab4..e38a85cd4ffee8df320ffca66d6712e195d06902 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -21,9 +21,9 @@ import time
 import webob
 
 from cinder import exception
-from cinder import wsgi
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import jsonutils
+from cinder.openstack.common import log as logging
+from cinder import wsgi
 
 from lxml import etree
 from xml.dom import minidom

diff --git a/cinder/context.py b/cinder/context.py
index a257f0a701a05a65fc5ba90acc0dfe7201392dcf..fc80f53ed16652eddc5c8fa68d32f6db25a079fe 100644 (file)
--- a/cinder/context.py
+++ b/cinder/context.py
@@ -21,8 +21,8 @@
 
 import copy
 
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import local
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import policy
 from cinder import utils

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index f490978f5f34891a05d303c88a289e7c33e8ba5b..8dd3abc283becee3f040b232065901de26ff4f92 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -23,15 +23,6 @@ import datetime
 import functools
 import warnings
 
-from cinder import db
-from cinder import exception
-from cinder import flags
-from cinder import utils
-from cinder.openstack.common import log as logging
-from cinder.db.sqlalchemy import models
-from cinder.db.sqlalchemy.session import get_session
-from cinder.openstack.common import timeutils
-from cinder.openstack.common import uuidutils
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
@@ -39,8 +30,19 @@ from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import asc
 from sqlalchemy.sql.expression import desc
 from sqlalchemy.sql.expression import literal_column
-from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import literal_column
+from sqlalchemy.sql import func
+
+from cinder import db
+from cinder.db.sqlalchemy import models
+from cinder.db.sqlalchemy.session import get_session
+from cinder import exception
+from cinder import flags
+from cinder.openstack.common import log as logging
+from cinder.openstack.common import timeutils
+from cinder.openstack.common import uuidutils
+from cinder import utils
+
 
 FLAGS = flags.FLAGS
 

diff --git a/cinder/db/sqlalchemy/models.py b/cinder/db/sqlalchemy/models.py
index ae2a6f51f96bf7371af89726933afc3f40958a36..b053e284d86c168c9c437485ca2ce947cac84e0d 100644 (file)
--- a/cinder/db/sqlalchemy/models.py
+++ b/cinder/db/sqlalchemy/models.py
@@ -21,11 +21,11 @@
 SQLAlchemy models for cinder data.
 """
 
-from sqlalchemy.orm import relationship, backref, object_mapper
 from sqlalchemy import Column, Integer, String, schema
-from sqlalchemy import ForeignKey, DateTime, Boolean
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import ForeignKey, DateTime, Boolean
+from sqlalchemy.orm import relationship, backref, object_mapper
 
 from cinder.db.sqlalchemy.session import get_session
 

diff --git a/cinder/db/sqlalchemy/session.py b/cinder/db/sqlalchemy/session.py
index ef94c4b2bceee76b5ecedcbdf8fa959f8c514c49..26b02299d36f72f50fb7f12c71e985e80b63851e 100644 (file)
--- a/cinder/db/sqlalchemy/session.py
+++ b/cinder/db/sqlalchemy/session.py
@@ -20,9 +20,9 @@
 
 import time
 
+from sqlalchemy.exc import DisconnectionError, OperationalError
 import sqlalchemy.interfaces
 import sqlalchemy.orm
-from sqlalchemy.exc import DisconnectionError, OperationalError
 from sqlalchemy.pool import NullPool, StaticPool
 
 import cinder.exception

diff --git a/cinder/openstack/common/rpc/impl_kombu.py b/cinder/openstack/common/rpc/impl_kombu.py
index 01f67defd510d0af853851aa561f3140e8068e4c..f3759cb21fabd2c16dba3396b7985759cda99204 100644 (file)
--- a/cinder/openstack/common/rpc/impl_kombu.py
+++ b/cinder/openstack/common/rpc/impl_kombu.py
@@ -31,9 +31,9 @@ import kombu.messaging
 
 from cinder.openstack.common import cfg
 from cinder.openstack.common.gettextutils import _
+from cinder.openstack.common import network_utils
 from cinder.openstack.common.rpc import amqp as rpc_amqp
 from cinder.openstack.common.rpc import common as rpc_common
-from cinder.openstack.common import network_utils
 
 kombu_opts = [
     cfg.StrOpt('kombu_ssl_version',

diff --git a/cinder/scheduler/driver.py b/cinder/scheduler/driver.py
index a4e545c3f524c1caba571e0c7c5753c92433fcda..9f5646dd92419d797eda4a122f41f86915bd9166 100644 (file)
--- a/cinder/scheduler/driver.py
+++ b/cinder/scheduler/driver.py
@@ -23,9 +23,9 @@ Scheduler base class that all Schedulers should inherit from
 
 from cinder import db
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder.openstack.common import timeutils
 from cinder import utils

diff --git a/cinder/service.py b/cinder/service.py
index ecbea86e5c3efbe113d37cfcaf2f742a2d5827d1..6f0ac4b82ee735128b46f8434413c102f7641968 100644 (file)
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -31,9 +31,9 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder import utils
 from cinder import version

diff --git a/cinder/test.py b/cinder/test.py
index dd111e9d9131f821f0c07c07e687493bd7c098ff..e6a81bbe53435afd0c555b876df96726b0506c07 100644 (file)
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -24,16 +24,16 @@ inline callbacks.
 """
 
 import functools
-import uuid
 import unittest
+import uuid
 
 import mox
 import nose.plugins.skip
 import stubout
 
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import service
 from cinder import tests

diff --git a/cinder/testing/runner.py b/cinder/testing/runner.py
old mode 100644 (file)
new mode 100755 (executable)
index d92179f..23661ec
--- a/cinder/testing/runner.py
+++ b/cinder/testing/runner.py
@@ -59,9 +59,9 @@ To run a single test:
 import gettext
 import heapq
 import os
-import unittest
 import sys
 import time
+import unittest
 
 import eventlet
 from nose import config

diff --git a/cinder/tests/api/openstack/fakes.py b/cinder/tests/api/openstack/fakes.py
index b8555339731807616b7e92aa8c70b610fcd26ca8..81d6148a41f46a0659f8c0a2bd6192089323888a 100644 (file)
--- a/cinder/tests/api/openstack/fakes.py
+++ b/cinder/tests/api/openstack/fakes.py
@@ -25,16 +25,16 @@ import webob.request
 from cinder.api import auth as api_auth
 from cinder.api import openstack as openstack_api
 from cinder.api.openstack import auth
-from cinder.api.openstack.volume import limits
 from cinder.api.openstack import urlmap
 from cinder.api.openstack import volume
+from cinder.api.openstack.volume import limits
 from cinder.api.openstack.volume import versions
 from cinder.api.openstack import wsgi as os_wsgi
 from cinder import context
 from cinder import exception as exc
+from cinder.openstack.common import timeutils
 from cinder import utils
 from cinder import wsgi
-from cinder.openstack.common import timeutils
 
 
 FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'

diff --git a/cinder/tests/api/openstack/test_common.py b/cinder/tests/api/openstack/test_common.py
index 374937db384b1fcaff6400871f93abc82dc717a3..b9b1c10152c62dc9f6e70421d00bda48702e2ec2 100644 (file)
--- a/cinder/tests/api/openstack/test_common.py
+++ b/cinder/tests/api/openstack/test_common.py
@@ -22,8 +22,8 @@ Test suites for 'common' code used throughout the OpenStack HTTP API.
 import webob
 import webob.exc
 
-from cinder import test
 from cinder.api.openstack import common
+from cinder import test
 
 
 NS = "{http://docs.openstack.org/compute/api/v1.1}"

diff --git a/cinder/tests/api/openstack/test_faults.py b/cinder/tests/api/openstack/test_faults.py
index 33f83000503763316bc5be2598f042310abe00b9..9c874c8f0200c1a880d3af1e9a13c4bb044de7b8 100644 (file)
--- a/cinder/tests/api/openstack/test_faults.py
+++ b/cinder/tests/api/openstack/test_faults.py
@@ -21,10 +21,10 @@ import webob
 import webob.dec
 import webob.exc
 
-from cinder import test
 from cinder.api.openstack import common
 from cinder.api.openstack import wsgi
 from cinder.openstack.common import jsonutils
+from cinder import test
 
 
 class TestFaults(test.TestCase):

diff --git a/cinder/tests/api/openstack/test_wsgi.py b/cinder/tests/api/openstack/test_wsgi.py
index 8792984f99238e734ed393468621b1395a6abd1f..83248de943067a0467e46e8ffa2f486217e5b32d 100644 (file)
--- a/cinder/tests/api/openstack/test_wsgi.py
+++ b/cinder/tests/api/openstack/test_wsgi.py
@@ -3,9 +3,9 @@
 import inspect
 import webob
 
+from cinder.api.openstack import wsgi
 from cinder import exception
 from cinder import test
-from cinder.api.openstack import wsgi
 from cinder.tests.api.openstack import fakes
 
 

diff --git a/cinder/tests/api/openstack/test_xmlutil.py b/cinder/tests/api/openstack/test_xmlutil.py
index 7f2a26044edef688f2f608e087f0cecfbcec90d6..2c1ab0fb43fd8ea2d42efe785946494215058f1f 100644 (file)
--- a/cinder/tests/api/openstack/test_xmlutil.py
+++ b/cinder/tests/api/openstack/test_xmlutil.py
@@ -17,8 +17,8 @@
 
 from lxml import etree
 
-from cinder import test
 from cinder.api.openstack import xmlutil
+from cinder import test
 
 
 class SelectorTest(test.TestCase):

diff --git a/cinder/tests/api/openstack/volume/contrib/test_admin_actions.py b/cinder/tests/api/openstack/volume/contrib/test_admin_actions.py
index e8fcc688de0be7618070ca4c4ddc24e0766edd93..3494e62cfa55451d079eb1f982c1c3137a55ef8f 100644 (file)
--- a/cinder/tests/api/openstack/volume/contrib/test_admin_actions.py
+++ b/cinder/tests/api/openstack/volume/contrib/test_admin_actions.py
@@ -3,10 +3,10 @@ import webob
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder import test
-from cinder.volume import api as volume_api
 from cinder.openstack.common import jsonutils
+from cinder import test
 from cinder.tests.api.openstack import fakes
+from cinder.volume import api as volume_api
 
 
 def app():

diff --git a/cinder/tests/api/openstack/volume/contrib/test_types_manage.py b/cinder/tests/api/openstack/volume/contrib/test_types_manage.py
index c2ee34989f8ce186c0de60a539b8ac46da90028a..ddba008d79d27616b39b1ed08088169549fd7cac 100644 (file)
--- a/cinder/tests/api/openstack/volume/contrib/test_types_manage.py
+++ b/cinder/tests/api/openstack/volume/contrib/test_types_manage.py
@@ -18,8 +18,8 @@ import webob
 from cinder.api.openstack.volume.contrib import types_manage
 from cinder import exception
 from cinder import test
-from cinder.volume import volume_types
 from cinder.tests.api.openstack import fakes
+from cinder.volume import volume_types
 
 
 def stub_volume_type(id):

diff --git a/cinder/tests/api/openstack/volume/contrib/test_volume_actions.py b/cinder/tests/api/openstack/volume/contrib/test_volume_actions.py
index 2448c9f37ca4f0b0886b53a6cdd398a2dbb7f1d0..227680dab6194b6cc568111ccf0b2c4e88b2f480 100644 (file)
--- a/cinder/tests/api/openstack/volume/contrib/test_volume_actions.py
+++ b/cinder/tests/api/openstack/volume/contrib/test_volume_actions.py
@@ -15,15 +15,15 @@
 import datetime
 import webob
 
+from cinder.api.openstack.volume.contrib import volume_actions
 from cinder import exception
 from cinder import flags
-from cinder import test
-from cinder import utils
-from cinder import volume
-from cinder.api.openstack.volume.contrib import volume_actions
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common.rpc import common as rpc_common
+from cinder import test
 from cinder.tests.api.openstack import fakes
+from cinder import utils
+from cinder import volume
 from cinder.volume import api as volume_api
 
 

diff --git a/cinder/tests/api/openstack/volume/contrib/test_volume_host_attribute.py b/cinder/tests/api/openstack/volume/contrib/test_volume_host_attribute.py
index 2acec10336ea1facae10b010812e67fddd5c3f49..2ce957b4492e87b71d96baead6fa4eeacb84437f 100644 (file)
--- a/cinder/tests/api/openstack/volume/contrib/test_volume_host_attribute.py
+++ b/cinder/tests/api/openstack/volume/contrib/test_volume_host_attribute.py
@@ -12,17 +12,17 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import json
 import datetime
+import json
 
 from lxml import etree
 import webob
 
 from cinder import context
 from cinder import test
+from cinder.tests.api.openstack import fakes
 from cinder import utils
 from cinder import volume
-from cinder.tests.api.openstack import fakes
 
 
 def fake_volume_get(*args, **kwargs):

diff --git a/cinder/tests/api/openstack/volume/contrib/test_volume_tenant_attribute.py b/cinder/tests/api/openstack/volume/contrib/test_volume_tenant_attribute.py
index 5949b21d81f8ee5b042edcabfbffef9ab914f717..f3428888058bae690ae8d7c32c1326ac07e9671a 100644 (file)
--- a/cinder/tests/api/openstack/volume/contrib/test_volume_tenant_attribute.py
+++ b/cinder/tests/api/openstack/volume/contrib/test_volume_tenant_attribute.py
@@ -12,17 +12,17 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import json
 import datetime
+import json
 
 from lxml import etree
 import webob
 
 from cinder import context
 from cinder import test
+from cinder.tests.api.openstack import fakes
 from cinder import utils
 from cinder import volume
-from cinder.tests.api.openstack import fakes
 
 PROJECT_ID = '88fd1da4-f464-4a87-9ce5-26f2f40743b9'
 

diff --git a/cinder/tests/api/openstack/volume/test_snapshots.py b/cinder/tests/api/openstack/volume/test_snapshots.py
index 6e32ea14e96ebb13c017fe6498d3702f40b5c796..6d115d8ea9e32878f05f01edb867903eb3aa8a70 100644 (file)
--- a/cinder/tests/api/openstack/volume/test_snapshots.py
+++ b/cinder/tests/api/openstack/volume/test_snapshots.py
@@ -24,8 +24,8 @@ from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder import volume
 from cinder.tests.api.openstack import fakes
+from cinder import volume
 
 
 FLAGS = flags.FLAGS

diff --git a/cinder/tests/api/openstack/volume/test_types.py b/cinder/tests/api/openstack/volume/test_types.py
index 2ad26de2e0f53d136713ea02a3075aa0e7117eb2..52380928e4c2c7211ae9df3acf67a7cc15bd8814 100644 (file)
--- a/cinder/tests/api/openstack/volume/test_types.py
+++ b/cinder/tests/api/openstack/volume/test_types.py
@@ -16,13 +16,13 @@
 from lxml import etree
 import webob
 
-from cinder.api.openstack.volume.views import types as views_types
 from cinder.api.openstack.volume import types
+from cinder.api.openstack.volume.views import types as views_types
 from cinder import exception
 from cinder.openstack.common import timeutils
 from cinder import test
-from cinder.volume import volume_types
 from cinder.tests.api.openstack import fakes
+from cinder.volume import volume_types
 
 
 def stub_volume_type(id):

diff --git a/cinder/tests/api/openstack/volume/test_volumes.py b/cinder/tests/api/openstack/volume/test_volumes.py
index 8764bf070b71442cdad743b87704f099074d40be..851e599bdf64275a76b26624237d007d819350d9 100644 (file)
--- a/cinder/tests/api/openstack/volume/test_volumes.py
+++ b/cinder/tests/api/openstack/volume/test_volumes.py
@@ -18,10 +18,10 @@ import datetime
 from lxml import etree
 import webob
 
+from cinder.api.openstack.volume import extensions
 from cinder.api.openstack.volume import volumes
 from cinder import context
 from cinder import db
-from cinder.api.openstack.volume import extensions
 from cinder import exception
 from cinder import flags
 from cinder import test

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index 7a7e5a931689cf0bb4f560008e95802140b3d373..793101fd914da5be08508297f04524a130f635b5 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -17,8 +17,8 @@
 import httplib
 import urlparse
 
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import jsonutils
+from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/integrated/test_volumes.py b/cinder/tests/integrated/test_volumes.py
old mode 100644 (file)
new mode 100755 (executable)
index e08b9ad..8882820
--- a/cinder/tests/integrated/test_volumes.py
+++ b/cinder/tests/integrated/test_volumes.py
@@ -18,11 +18,11 @@
 import time
 import unittest
 
-from cinder import service
 from cinder.openstack.common import log as logging
-from cinder.tests.integrated import integrated_helpers
-from cinder.tests.integrated.api import client
+from cinder import service
 from cinder.tests import fake_driver
+from cinder.tests.integrated.api import client
+from cinder.tests.integrated import integrated_helpers
 from cinder.volume import driver
 
 

diff --git a/cinder/tests/integrated/test_xml.py b/cinder/tests/integrated/test_xml.py
index 52da4c96cce8cda2dd310bdb3ffc06d968122228..fb579d3f12285c7bf6d8470ae29fc14a56a316a4 100644 (file)
--- a/cinder/tests/integrated/test_xml.py
+++ b/cinder/tests/integrated/test_xml.py
@@ -17,9 +17,9 @@
 
 from lxml import etree
 
+from cinder.api.openstack import common
 from cinder.openstack.common import log as logging
 from cinder.tests.integrated import integrated_helpers
-from cinder.api.openstack import common
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/test_exception.py b/cinder/tests/test_exception.py
index f87a71cef56b8caf0059577e1fd9e45cb37f567f..2119297a44a3aa84691d91ba122608b12e64203f 100644 (file)
--- a/cinder/tests/test_exception.py
+++ b/cinder/tests/test_exception.py
@@ -16,8 +16,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from cinder import test
 from cinder import exception
+from cinder import test
 from cinder import utils
 
 

diff --git a/cinder/tests/test_migrations.py b/cinder/tests/test_migrations.py
index 913baae593ea86f9657d37b9051ae02ff5731bfd..5c160f799e1a39a54e84e3ba72305ae52458dddf 100644 (file)
--- a/cinder/tests/test_migrations.py
+++ b/cinder/tests/test_migrations.py
@@ -24,16 +24,16 @@ properly both upgrading and downgrading, and that no data loss occurs
 if possible.
 """
 
-import ConfigParser
 import commands
+import ConfigParser
 import os
 import urlparse
 
 from migrate.versioning import repository
 import sqlalchemy
 
-import cinder.db.sqlalchemy.migrate_repo
 import cinder.db.migration as migration
+import cinder.db.sqlalchemy.migrate_repo
 from cinder.db.sqlalchemy.migration import versioning_api as migration_api
 from cinder.openstack.common import log as logging
 from cinder import test

diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index 1ebd842cf68bc2f6d6051a264c95c2aa66e06168..939c7b720f9fafc3b0203da394113c49887ed4c3 100644 (file)
--- a/cinder/tests/test_netapp_nfs.py
+++ b/cinder/tests/test_netapp_nfs.py
@@ -17,14 +17,14 @@
 """Unit tests for the NetApp-specific NFS driver module (netapp_nfs)"""
 
 from cinder import context
-from cinder import test
 from cinder import exception
+from cinder import test
 
-from cinder.volume import netapp_nfs
 from cinder.volume import netapp
+from cinder.volume import netapp_nfs
 from cinder.volume import nfs
-from mox import IsA
 from mox import IgnoreArg
+from mox import IsA
 from mox import MockObject
 
 import mox

diff --git a/cinder/tests/test_nexenta.py b/cinder/tests/test_nexenta.py
index 5a33318b1c96cc6449a9b0c5dab256c1141308af..1ed8e194ac20aaa81e161d4f2f009569c5f574af 100644 (file)
--- a/cinder/tests/test_nexenta.py
+++ b/cinder/tests/test_nexenta.py
@@ -25,8 +25,8 @@ import urllib2
 import cinder.flags
 import cinder.test
 from cinder.volume import nexenta
-from cinder.volume.nexenta import volume
 from cinder.volume.nexenta import jsonrpc
+from cinder.volume.nexenta import volume
 
 FLAGS = cinder.flags.FLAGS
 

diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index 402d84b06a75e139b18957f98e1c343151cee84b..f042b1a9f444aaa8ac0782a2cb3c0d1ae85becee 100644 (file)
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -16,19 +16,19 @@
 #    under the License.
 """Unit tests for the NFS driver module"""
 
-import os
-import errno
 import __builtin__
+import errno
+import os
 
 import mox as mox_lib
-from mox import IsA
 from mox import IgnoreArg
+from mox import IsA
 from mox import stubout
 
 from cinder import context
 from cinder import exception
-from cinder import test
 from cinder.exception import ProcessExecutionError
+from cinder import test
 
 from cinder.volume import nfs
 

diff --git a/cinder/tests/test_service.py b/cinder/tests/test_service.py
index 38b0c3922bd24038ff95f6b240fcfa87472f037a..4bda2beee1b701288987fd6424332f79191bfab4 100644 (file)
--- a/cinder/tests/test_service.py
+++ b/cinder/tests/test_service.py
@@ -26,10 +26,10 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flags
+from cinder import manager
 from cinder.openstack.common import cfg
-from cinder import test
 from cinder import service
-from cinder import manager
+from cinder import test
 from cinder import wsgi
 
 

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index bb848d8d4f89610d443f6dda7716bfb129b25822..2b1231330c503f6b8852e2bff8557dee9a18b92b 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -20,18 +20,17 @@ Tests for Volume Code.
 
 """
 
-import os
 import datetime
+import os
 
 import mox
 import shutil
 import tempfile
 
 from cinder import context
-from cinder import exception
 from cinder import db
+from cinder import exception
 from cinder import flags
-from cinder.tests.image import fake as fake_image
 from cinder.openstack.common import importutils
 from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common.notifier import test_notifier
@@ -39,8 +38,9 @@ from cinder.openstack.common import rpc
 import cinder.policy
 from cinder import quota
 from cinder import test
-from cinder.volume import iscsi
 from cinder.tests import fake_flags
+from cinder.tests.image import fake as fake_image
+from cinder.volume import iscsi
 
 QUOTAS = quota.QUOTAS
 FLAGS = flags.FLAGS

diff --git a/cinder/tests/test_volume_types.py b/cinder/tests/test_volume_types.py
index 847ff8814180ba17724cc68e44c9f0a5b932c9b0..db61bf925ac0cc1f4a5805c8fb7e60cf5de94eb7 100644 (file)
--- a/cinder/tests/test_volume_types.py
+++ b/cinder/tests/test_volume_types.py
@@ -19,14 +19,14 @@ Unit Tests for volume types code
 import time
 
 from cinder import context
+from cinder.db.sqlalchemy import models
+from cinder.db.sqlalchemy import session as sql_session
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder.volume import volume_types
-from cinder.db.sqlalchemy import session as sql_session
-from cinder.db.sqlalchemy import models
 from cinder.tests import fake_flags
+from cinder.volume import volume_types
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py
index 3a644d34b0858775961ed4b4aa78b67f59cc3ccd..9691a5dcc0edee45c28127ba19866b98f94a1733 100644 (file)
--- a/cinder/tests/test_volume_utils.py
+++ b/cinder/tests/test_volume_utils.py
@@ -17,15 +17,15 @@
 
 """Tests For miscellaneous util methods used with volume."""
 
+from cinder import context
 from cinder import db
 from cinder import flags
-from cinder import context
-from cinder import test
-from cinder.volume import utils as volume_utils
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common.notifier import test_notifier
+from cinder import test
+from cinder.volume import utils as volume_utils
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/test_windows.py b/cinder/tests/test_windows.py
index 1b1bfcbb03a4c3dcf2de2f2e7aa9260b17da6292..c125fdd15ac2662022ea8d31a34528c29749b0af 100644 (file)
--- a/cinder/tests/test_windows.py
+++ b/cinder/tests/test_windows.py
@@ -21,10 +21,10 @@ Unit tests for Windows Server 2012 OpenStack Cinder volume driver
 import sys
 
 import cinder.flags
-from cinder.volume import windows
 from cinder.tests.windows import basetestcase
 from cinder.tests.windows import db_fakes
 from cinder.tests.windows import windowsutils
+from cinder.volume import windows
 
 FLAGS = cinder.flags.FLAGS
 

diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py
index 87eb6a25fec12eee5708ccd5438ade1c48ea6cad..222607f8a3d9f2783f3b72153d78b17de939c1b1 100644 (file)
--- a/cinder/tests/test_wsgi.py
+++ b/cinder/tests/test_wsgi.py
@@ -26,8 +26,8 @@ import webob.dec
 
 from cinder.api import openstack as openstack_api
 from cinder import exception
-from cinder.volume import xiv
 from cinder import test
+from cinder.volume import xiv
 import cinder.wsgi
 
 

diff --git a/cinder/tests/test_zadara.py b/cinder/tests/test_zadara.py
index b999ade393377c000335e53e9d7373bfe65a1eca..8dab4419c833baf6784843b59cbedf6b19abf30c 100644 (file)
--- a/cinder/tests/test_zadara.py
+++ b/cinder/tests/test_zadara.py
@@ -23,8 +23,8 @@ import copy
 import httplib
 
 from cinder import exception
-from cinder import test
 from cinder.openstack.common import log as logging
+from cinder import test
 from cinder.volume import zadara
 
 from lxml import etree

diff --git a/cinder/tests/windows/basetestcase.py b/cinder/tests/windows/basetestcase.py
index 24fcb91c23c32f710da717340c1d20cac42f2974..0ff394ddd7ac10ea30200b42c1fa990f1238dc22 100644 (file)
--- a/cinder/tests/windows/basetestcase.py
+++ b/cinder/tests/windows/basetestcase.py
@@ -18,10 +18,10 @@
 TestCase for MockProxy based tests and related classes.
 """
 
+import cinder.test
 import gzip
 import os
 import pickle
-import cinder.test
 
 from cinder.tests.windows import mockproxy
 

diff --git a/cinder/utils.py b/cinder/utils.py
index 31c9e4c3443538c0be81ce6dc6f83aa547f83916..df2894d5e1a2e004fdc012baacb610a4169cb959 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -46,16 +46,16 @@ import warnings
 from xml.sax import saxutils
 
 from eventlet import event
+from eventlet.green import subprocess
 from eventlet import greenthread
 from eventlet import pools
-from eventlet.green import subprocess
 
 from cinder.common import deprecated
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import excutils
 from cinder.openstack.common import importutils
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 
 

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index c4bc66e67590f7b684b80c6e162c555025e45a79..f3135eb2dc8f9e764158bb3c49672f3f30a7bfea 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -25,17 +25,17 @@ import functools
 from cinder.db import base
 from cinder import exception
 from cinder import flags
+from cinder.image import glance
 from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
-from cinder.image import glance
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder.openstack.common import timeutils
-from cinder.volume import volume_types
 import cinder.policy
 from cinder import quota
 from cinder.scheduler import rpcapi as scheduler_rpcapi
 from cinder.volume import volume_types
+from cinder.volume import volume_types
 
 volume_host_opt = cfg.BoolOpt('snapshot_same_host',
         default=True,

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 98ef8f0e1da5b8b96736dd332d8850eeccade77a..35af09935344a9d11eace7e0b134af70c2e1b1c1 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -26,8 +26,8 @@ import time
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import iscsi
 

diff --git a/cinder/volume/drivers/rbd.py b/cinder/volume/drivers/rbd.py
index 60be2eba23b461a550a913058cc889db7adda02c..234e183907879fc0397ef6a180c29549d7614558 100644 (file)
--- a/cinder/volume/drivers/rbd.py
+++ b/cinder/volume/drivers/rbd.py
@@ -21,8 +21,8 @@ import urllib
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.volume import driver
 
 

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 7b4e2b8e289a6b7045d8cd32d2a7085ec4827056..56a8aa872eef995a31b7b6fa43bcd7d59ec735f9 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -41,11 +41,11 @@ from cinder import context
 from cinder import exception
 from cinder import flags
 from cinder.image import glance
-from cinder.openstack.common import log as logging
 from cinder import manager
 from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import importutils
+from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import uuidutils
 from cinder import quota

diff --git a/cinder/volume/netapp.py b/cinder/volume/netapp.py
index 9d1cc47517fa11d47f8bc019d69f2014f2a02141..d40b190a7bc3f68b09f39a74e1171dbe06343a0c 100644 (file)
--- a/cinder/volume/netapp.py
+++ b/cinder/volume/netapp.py
@@ -31,8 +31,8 @@ from suds.sax import text
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume import volume_types
 

diff --git a/cinder/volume/netapp_nfs.py b/cinder/volume/netapp_nfs.py
index dd69c6deca9fbb81b8e7747f2c108847acf62eb5..70605525efca3dfca42eff42f0dd790470b66799 100644 (file)
--- a/cinder/volume/netapp_nfs.py
+++ b/cinder/volume/netapp_nfs.py
@@ -19,16 +19,16 @@ Volume driver for NetApp NFS storage.
 """
 
 import os
-import time
 import suds
 from suds.sax import text
+import time
 
 from cinder import exception
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
-from cinder.volume import nfs
 from cinder.volume.netapp import netapp_opts
+from cinder.volume import nfs
 
 LOG = logging.getLogger("cinder.volume.driver")
 

diff --git a/cinder/volume/nexenta/jsonrpc.py b/cinder/volume/nexenta/jsonrpc.py
index 2853303c42944020b00ec2f5e5ca9ff381f5126a..487b34c233855ad06a2633d335fb7d6a222587d4 100644 (file)
--- a/cinder/volume/nexenta/jsonrpc.py
+++ b/cinder/volume/nexenta/jsonrpc.py
@@ -25,8 +25,8 @@
 import urllib2
 
 from cinder.openstack.common import jsonutils
-from cinder.volume import nexenta
 from cinder.openstack.common import log as logging
+from cinder.volume import nexenta
 
 LOG = logging.getLogger("cinder.volume.nexenta.jsonrpc")
 

diff --git a/cinder/volume/nexenta/volume.py b/cinder/volume/nexenta/volume.py
index 9bac207ec8b57e705000f869319f18989fd845c7..6925c3217bf6ab9d72f3037ed20db75b6b5d140f 100644 (file)
--- a/cinder/volume/nexenta/volume.py
+++ b/cinder/volume/nexenta/volume.py
@@ -24,8 +24,8 @@
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume import nexenta
 from cinder.volume.nexenta import jsonrpc

diff --git a/cinder/volume/nfs.py b/cinder/volume/nfs.py
index deec01672440de93ee8b29efed72fa7cb4f85ec6..4ac5df418d89e3ae389593fd5360c8a009552d8c 100644 (file)
--- a/cinder/volume/nfs.py
+++ b/cinder/volume/nfs.py
@@ -15,15 +15,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
 import errno
 import hashlib
+import os
 
+from cinder import exception
 from cinder import flags
 from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
-from cinder import exception
 
 LOG = logging.getLogger("cinder.volume.driver")
 

diff --git a/cinder/volume/san/__init__.py b/cinder/volume/san/__init__.py
index 12984975ea7dae60df01eeb23d21506a6b977d8a..f890b1e792e2dd69df2d919859951e1748044986 100644 (file)
--- a/cinder/volume/san/__init__.py
+++ b/cinder/volume/san/__init__.py
@@ -22,6 +22,6 @@
 """
 
 # Adding imports for backwards compatibility in loading volume_driver.
+from hp_lefthand import HpSanISCSIDriver
 from san import SanISCSIDriver
 from solaris import SolarisISCSIDriver
-from hp_lefthand import HpSanISCSIDriver

diff --git a/cinder/volume/san/san.py b/cinder/volume/san/san.py
index feda4fc1243e1ebac2963213341e8c0084f44ae5..c38a98cef620d33efe1de5fa12e878ecdfdca50d 100644 (file)
--- a/cinder/volume/san/san.py
+++ b/cinder/volume/san/san.py
@@ -28,8 +28,8 @@ from eventlet import greenthread
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume.driver import ISCSIDriver
 

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index a79a39a69e0b52ee08f4ca60b86ac30e13369d63..ee73a0f6b882c56149f3a87f60a0367c57423f29 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -17,10 +17,10 @@
 """Volume-related Utilities and helpers."""
 
 from cinder import flags
-from cinder import utils
-from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common import log as logging
+from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common import timeutils
+from cinder import utils
 
 
 FLAGS = flags.FLAGS

diff --git a/cinder/volume/zadara.py b/cinder/volume/zadara.py
index 053b7b5e8946c980f69b247ca6c321262f450230..b83996ea96eea8322d37c254005025f13b67f9b9 100644 (file)
--- a/cinder/volume/zadara.py
+++ b/cinder/volume/zadara.py
@@ -25,8 +25,8 @@ import httplib
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import cfg
+from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver
 from cinder.volume import iscsi