Import order cleanup per HACKING

Change-Id: I5540a5d24f45aa51e0ef58b43427fbaf7726da89

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
 
 

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
 
 

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
 
 

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
 
 

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'"[^"\\]*(?:\\.[^"\\]*)*"'

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
 
 

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

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__)

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

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

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

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
 

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

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

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

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
 

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
 

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

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',

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

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

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

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

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'

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}"

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):

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
 
 

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):

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():

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):

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
 
 

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):

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'
 

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

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):

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

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__)

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
 
 

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__)

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
 
 

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

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

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
 

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
 

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.openstack.common import cfg
-from cinder import test
-from cinder import service
 from cinder import manager
+from cinder.openstack.common import cfg
+from cinder import service
+from cinder import test
 from cinder import wsgi
 
 

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

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__)

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__)

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
 

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
 
 

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

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
 

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
 
 

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,

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
 

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
 
 

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

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
 

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")
 

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")
 

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

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")
 

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

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
 

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

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