Alphabetize imports

Except for nova/api/, nova/tests/, nova/virt/
In preparation for automated checking being enabled (N306)

Change-Id: I5af70ea13b470ce58695ef0a5e0ff9da3ac1b135

23 files changed, 31 insertions, 31 deletions

diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 05f34176f..758336805 100755
--- a/bin/instance-usage-audit
+++ b/bin/instance-usage-audit
@@ -50,6 +50,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 gettext.install('nova', unicode=1)
+import nova.compute.utils
 from nova import context
 from nova import db
 from nova import exception
@@ -57,7 +58,6 @@ from nova import flags
 from nova import log as logging
 from nova import rpc
 from nova import utils
-import nova.compute.utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py
index 1d337fee9..a6ce5a4c4 100644
--- a/nova/auth/dbdriver.py
+++ b/nova/auth/dbdriver.py
@@ -21,8 +21,8 @@ Auth driver using the DB as its backend.
 """
 
 from nova import context
-from nova import exception
 from nova import db
+from nova import exception
 
 
 class DbDriver(object):
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 234b527bf..c4e438daf 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -28,6 +28,7 @@ import string  # pylint: disable=W0402
 import uuid
 import zipfile
 
+from nova.auth import signer
 from nova import context
 from nova import crypto
 from nova import db
@@ -37,7 +38,6 @@ from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova import utils
-from nova.auth import signer
 
 
 auth_opts = [
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index b77336347..9f405a934 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -46,13 +46,13 @@ import traceback
 from eventlet import greenthread
 
 from nova import block_device
-import nova.context
 from nova.compute import aggregate_states
 from nova.compute import instance_types
 from nova.compute import power_state
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
+import nova.context
 from nova import exception
 from nova import flags
 import nova.image
diff --git a/nova/console/manager.py b/nova/console/manager.py
index 64ed45926..335de3284 100644
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@@ -22,9 +22,9 @@ import socket
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import manager
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
-from nova import manager
 from nova import rpc
 from nova import utils
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 4e8e69313..4574e8033 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -25,24 +25,24 @@ import re
 import warnings
 
 from nova import block_device
-from nova import db
-from nova import exception
-from nova import flags
-from nova import utils
-from nova import log as logging
 from nova.compute import aggregate_states
 from nova.compute import vm_states
+from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import utils
 from sqlalchemy import and_
-from sqlalchemy import or_
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm import joinedload_all
-from sqlalchemy.sql import func
 from sqlalchemy.sql.expression import asc
 from sqlalchemy.sql.expression import desc
 from sqlalchemy.sql.expression import literal_column
+from sqlalchemy.sql import func
 
 FLAGS = flags.FLAGS
 flags.DECLARE('reserved_host_disk_mb', 'nova.scheduler.host_manager')
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
index d0ebe9b68..a2bffe2af 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py
@@ -17,8 +17,8 @@
 from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey
 from sqlalchemy import Index, Integer, MetaData, String, Table, Text
 from migrate import ForeignKeyConstraint
-from nova import log as logging
 from nova import flags
+from nova import log as logging
 
 from sets import Set
 
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index 8658e7697..e7c659a70 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -26,9 +26,9 @@ from nova import flags
 from nova import log as logging
 
 
-import sqlalchemy
 import migrate
 from migrate.versioning import util as migrate_util
+import sqlalchemy
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/image/s3.py b/nova/image/s3.py
index de5d10f1f..31dfa1916 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -29,14 +29,14 @@ import boto.s3.connection
 import eventlet
 from lxml import etree
 
-from nova import rpc
+from nova.api.ec2 import ec2utils
 from nova import exception
 from nova import flags
 from nova import image
 from nova import log as logging
 from nova.openstack.common import cfg
+from nova import rpc
 from nova import utils
-from nova.api.ec2 import ec2utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/network/__init__.py b/nova/network/__init__.py
index 283fed1f6..ed84c5268 100644
--- a/nova/network/__init__.py
+++ b/nova/network/__init__.py
@@ -19,8 +19,8 @@
 # Importing full names to not pollute the namespace and cause possible
 # collisions with use of 'from nova.network import <foo>' elsewhere.
 import nova.flags
-import nova.utils
 import nova.openstack.common.importutils
+import nova.utils
 
 API = nova.openstack.common.importutils.import_class(
         nova.flags.FLAGS.network_api_class)
diff --git a/nova/network/l3.py b/nova/network/l3.py
index 4603bdf90..9aa6136fc 100644
--- a/nova/network/l3.py
+++ b/nova/network/l3.py
@@ -19,8 +19,8 @@ import random
 
 from nova import flags
 from nova import log as logging
-from nova import utils
 from nova.network import linux_net
+from nova import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py
index 36ff21439..25e6e55ad 100644
--- a/nova/network/ldapdns.py
+++ b/nova/network/ldapdns.py
@@ -19,8 +19,8 @@ from nova.auth import fakeldap
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import utils
 from nova.openstack.common import cfg
+from nova import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 621744f6c..c0d51ef5a 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -67,8 +67,8 @@ from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 import nova.policy
 from nova import quota
-from nova import utils
 from nova import rpc
+from nova import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/network/quantum/fake_client.py b/nova/network/quantum/fake_client.py
index 5d9757548..6be08449d 100644
--- a/nova/network/quantum/fake_client.py
+++ b/nova/network/quantum/fake_client.py
@@ -18,8 +18,8 @@
 
 import copy
 
-from nova import utils
 from nova.network.quantum import client
+from nova import utils
 
 #TODO(danwent): would be nice to have these functions raise QuantumIOErrors
 # to make sure such errors are caught and reported properly
diff --git a/nova/quota.py b/nova/quota.py
index 2fdecd1e2..486fe3271 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -19,8 +19,8 @@
 """Quotas for instances, volumes, and floating ips."""
 
 from nova import db
-from nova.openstack.common import cfg
 from nova import flags
+from nova.openstack.common import cfg
 
 
 quota_opts = [
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index 6ff87646c..7285acbe3 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -24,9 +24,9 @@ import uuid
 import eventlet
 import greenlet
 import kombu
+import kombu.connection
 import kombu.entity
 import kombu.messaging
-import kombu.connection
 
 from nova.openstack.common import cfg
 from nova.rpc import amqp as rpc_amqp
diff --git a/nova/rpc/impl_qpid.py b/nova/rpc/impl_qpid.py
index 37bb62430..f2f669a54 100644
--- a/nova/rpc/impl_qpid.py
+++ b/nova/rpc/impl_qpid.py
@@ -16,9 +16,9 @@
 #    under the License.
 
 import itertools
+import json
 import time
 import uuid
-import json
 
 import eventlet
 import greenlet
diff --git a/nova/test.py b/nova/test.py
index b1ce0622d..4f9c607cb 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -26,8 +26,8 @@ inline callbacks.
 import functools
 import os
 import shutil
-import uuid
 import unittest
+import uuid
 
 import mox
 import nose.plugins.skip
@@ -37,9 +37,9 @@ from nova import flags
 import nova.image.fake
 from nova import log as logging
 from nova.openstack.common import cfg
-from nova import utils
 from nova import service
 from nova import tests
+from nova import utils
 from nova.virt import fake
 
 
diff --git a/nova/testing/runner.py b/nova/testing/runner.py
index 4ee88553b..2b5004394 100644
--- a/nova/testing/runner.py
+++ b/nova/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/nova/utils.py b/nova/utils.py
index fea255a26..2b495d1ff 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -46,9 +46,9 @@ from xml.sax import saxutils
 
 from eventlet import corolocal
 from eventlet import event
+from eventlet.green import subprocess
 from eventlet import greenthread
 from eventlet import semaphore
-from eventlet.green import subprocess
 import iso8601
 import lockfile
 import netaddr
diff --git a/nova/volume/api.py b/nova/volume/api.py
index 33643954c..e029aa233 100644
--- a/nova/volume/api.py
+++ b/nova/volume/api.py
@@ -24,6 +24,7 @@ import functools
 
 from eventlet import greenthread
 
+from nova.db import base
 from nova import exception
 from nova import flags
 from nova import log as logging
@@ -31,7 +32,6 @@ import nova.policy
 from nova import quota
 from nova import rpc
 from nova import utils
-from nova.db import base
 
 FLAGS = flags.FLAGS
 flags.DECLARE('storage_availability_zone', 'nova.volume.manager')
diff --git a/nova/volume/netapp.py b/nova/volume/netapp.py
index 5ee0a0371..711d8a140 100644
--- a/nova/volume/netapp.py
+++ b/nova/volume/netapp.py
@@ -23,8 +23,8 @@ ONTAP 7-mode storage systems with installed iSCSI licenses.
 
 """
 
-import time
 import string
+import time
 
 import suds
 from suds import client
diff --git a/nova/volume/nexenta/jsonrpc.py b/nova/volume/nexenta/jsonrpc.py
index 6487333ec..03921bfdb 100644
--- a/nova/volume/nexenta/jsonrpc.py
+++ b/nova/volume/nexenta/jsonrpc.py
@@ -25,8 +25,8 @@
 import json
 import urllib2
 
-from nova.volume import nexenta
 from nova import log as logging
+from nova.volume import nexenta
 
 LOG = logging.getLogger("nova.volume.nexenta.jsonrpc")