Merge "Alphabetize imports in nova/tests/"

nova/tests/baremetal/test_proxy_bare_metal.py

@@ -19,15 +19,15 @@ import functools
 import mox
 import StringIO
 
-from nova import flags
-from nova import test
 from nova.compute import power_state
-from nova.openstack.common import jsonutils
-from nova.tests import fake_utils
 from nova import exception
+from nova import flags
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests import fake_utils
 
-from nova.virt.baremetal import proxy
 from nova.virt.baremetal import dom
+from nova.virt.baremetal import proxy
 
 FLAGS = flags.FLAGS
 

nova/tests/notifier/test_list_notifier.py

@@ -16,9 +16,9 @@
 import nova
 from nova import log as logging
 import nova.notifier.api
+from nova.notifier import list_notifier
 import nova.notifier.log_notifier
 import nova.notifier.no_op_notifier
-from nova.notifier import list_notifier
 from nova import test
 
 

nova/tests/rpc/test_common.py

@@ -24,9 +24,9 @@ from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import test
 from nova.rpc import amqp as rpc_amqp
 from nova.rpc import common as rpc_common
+from nova import test
 from nova.tests.rpc import common
 
 FLAGS = flags.FLAGS

nova/tests/rpc/test_kombu.py

@@ -23,8 +23,8 @@ from nova import context
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import test
 from nova.rpc import amqp as rpc_amqp
+from nova import test
 from nova.tests.rpc import common
 
 try:

nova/tests/rpc/test_qpid.py

@@ -29,8 +29,8 @@ from nova.rpc import amqp as rpc_amqp
 from nova import test
 
 try:
-    import qpid
     from nova.rpc import impl_qpid
+    import qpid
 except ImportError:
     qpid = None
     impl_qpid = None

nova/tests/test_SolidFireSanISCSIDriver.py

@@ -17,8 +17,8 @@
 
 from nova import exception
 from nova import log as logging
-from nova.volume import san
 from nova import test
+from nova.volume import san
 
 LOG = logging.getLogger(__name__)
 

nova/tests/test_access.py

@@ -18,11 +18,11 @@
 
 import webob
 
+from nova.api import ec2
+from nova.auth import manager
 from nova import context
 from nova import flags
 from nova import test
-from nova.api import ec2
-from nova.auth import manager
 
 FLAGS = flags.FLAGS
 

nova/tests/test_api.py

@@ -28,15 +28,15 @@ from boto.ec2 import regioninfo
 from boto import exception as boto_exc
 import webob
 
-from nova import block_device
-from nova import context
-from nova import exception
-from nova import test
 from nova.api import auth
 from nova.api import ec2
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import ec2utils
+from nova import block_device
 from nova.compute import api as compute_api
+from nova import context
+from nova import exception
+from nova import test
 
 
 class FakeHttplibSocket(object):

nova/tests/test_auth.py

@@ -18,12 +18,12 @@
 
 import unittest
 
+from nova.auth import fakeldap
+from nova.auth import manager
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova.auth import manager
-from nova.auth import fakeldap
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)

nova/tests/test_compat_flagfile.py

@@ -18,8 +18,8 @@ import contextlib
 import os
 import shutil
 import StringIO
-import textwrap
 import tempfile
+import textwrap
 import unittest
 import uuid
 

nova/tests/test_compute.py

@@ -28,8 +28,8 @@ import mox
 import nova
 import nova.common.policy
 from nova import compute
-from nova.compute import api as compute_api
 from nova.compute import aggregate_states
+from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova.compute import manager as compute_manager
 from nova.compute import power_state

nova/tests/test_compute_utils.py

@@ -17,18 +17,18 @@
 
 """Tests For miscellaneous util methods used with compute."""
 
+from nova.compute import instance_types
+from nova.compute import utils as compute_utils
+from nova import context
 from nova import db
 from nova import flags
-from nova import context
-from nova import test
-from nova import log as logging
-from nova import utils
 import nova.image.fake
-from nova.compute import utils as compute_utils
+from nova import log as logging
-from nova.compute import instance_types
 from nova.notifier import test_notifier
 from nova.openstack.common import importutils
+from nova import test
 from nova.tests import fake_network
+from nova import utils
 
 
 LOG = logging.getLogger(__name__)

nova/tests/test_db_api.py

@@ -20,11 +20,11 @@
 
 import datetime
 
-from nova import test
 from nova import context
 from nova import db
 from nova import exception
 from nova import flags
+from nova import test
 from nova import utils
 
 FLAGS = flags.FLAGS

nova/tests/test_image.py

@@ -20,8 +20,8 @@ import StringIO
 
 from nova import context
 from nova import exception
-from nova import test
 import nova.image
+from nova import test
 
 
 class _ImageTestCase(test.TestCase):

nova/tests/test_imagecache.py

@@ -28,8 +28,8 @@ from nova import test
 
 from nova import db
 from nova import flags
-from nova import log
 from nova import image
+from nova import log
 from nova import utils
 from nova.virt.libvirt import imagecache
 from nova.virt.libvirt import utils as virtutils

nova/tests/test_instance_types.py

@@ -17,15 +17,15 @@ Unit Tests for instance types code
 """
 import time
 
+from nova.compute import instance_types
 from nova import context
 from nova import db
+from nova.db.sqlalchemy import models
+from nova.db.sqlalchemy import session as sql_session
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova.compute import instance_types
-from nova.db.sqlalchemy import models
-from nova.db.sqlalchemy import session as sql_session
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)

nova/tests/test_libvirt.py

@@ -40,18 +40,18 @@ from nova import log as logging
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova import test
-from nova.tests import fake_network
 from nova.tests import fake_libvirt_utils
+from nova.tests import fake_network
 from nova import utils
-from nova.virt import images
 from nova.virt import driver
 from nova.virt import firewall as base_firewall
+from nova.virt import images
 from nova.virt.libvirt import config
 from nova.virt.libvirt import connection
 from nova.virt.libvirt import firewall
+from nova.virt.libvirt import utils as libvirt_utils
 from nova.virt.libvirt import volume
 from nova.volume import driver as volume_driver
-from nova.virt.libvirt import utils as libvirt_utils
 
 
 try:

nova/tests/test_melange_ipam_lib.py

@@ -18,9 +18,9 @@
 from nova import db
 from nova import exception
 from nova import flags
-from nova import test
 from nova.network.quantum import melange_connection
 from nova.network.quantum import melange_ipam_lib
+from nova import test
 
 FLAGS = flags.FLAGS
 

nova/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 nova.db.sqlalchemy.migrate_repo
 import nova.db.migration as migration
+import nova.db.sqlalchemy.migrate_repo
 from nova.db.sqlalchemy.migration import versioning_api as migration_api
 from nova import log as logging
 from nova import test

nova/tests/test_nexenta.py

@@ -25,8 +25,8 @@ import urllib2
 import nova.flags
 import nova.test
 from nova.volume import nexenta
-from nova.volume.nexenta import volume
 from nova.volume.nexenta import jsonrpc
+from nova.volume.nexenta import volume
 
 FLAGS = nova.flags.FLAGS
 

nova/tests/test_notifier.py

@@ -17,8 +17,8 @@ import nova
 from nova import context
 from nova import flags
 from nova import log
-import nova.notifier.no_op_notifier
 from nova.notifier import api as notifier_api
+import nova.notifier.no_op_notifier
 from nova import test
 
 

nova/tests/test_signer.py

@@ -18,9 +18,9 @@
 
 """Tests for Signer."""
 
+from nova.auth import signer
 from nova import exception
 from nova import test
-from nova.auth import signer
 
 
 class ClassWithStrRepr(object):

nova/tests/test_virt_drivers.py

@@ -436,8 +436,8 @@ class LibvirtConnTestCase(_VirtDriverTestCase):
         else:
             self.saved_libvirt = None
 
-        import fakelibvirt
         import fake_libvirt_utils
+        import fakelibvirt
 
         sys.modules['libvirt'] = fakelibvirt
 

nova/tests/test_vmwareapi.py

@@ -19,17 +19,17 @@
 Test suite for VMWareAPI.
 """
 
+from nova.compute import power_state
 from nova import context
 from nova import db
 from nova import exception
 from nova import flags
 from nova import test
-from nova.compute import power_state
 from nova.tests.glance import stubs as glance_stubs
 from nova.tests.vmwareapi import db_fakes
 from nova.tests.vmwareapi import stubs
-from nova.virt import vmwareapi_conn
 from nova.virt.vmwareapi import fake as vmwareapi_fake
+from nova.virt import vmwareapi_conn
 
 
 FLAGS = flags.FLAGS

nova/tests/test_volume.py

@@ -25,8 +25,8 @@ import cStringIO
 import mox
 
 from nova import context
-from nova import exception
 from nova import db
+from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.notifier import test_notifier

nova/tests/test_volume_types.py

@@ -19,13 +19,13 @@ Unit Tests for volume types code
 import time
 
 from nova import context
+from nova.db.sqlalchemy import models
+from nova.db.sqlalchemy import session as sql_session
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
 from nova.volume import volume_types
-from nova.db.sqlalchemy import session as sql_session
-from nova.db.sqlalchemy import models
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger(__name__)

nova/tests/test_xenapi.py

@@ -39,15 +39,15 @@ from nova import log as logging
 from nova.openstack.common import importutils
 from nova import test
 from nova.tests.db import fakes as db_fakes
-from nova.tests.xenapi import stubs
-from nova.tests.glance import stubs as glance_stubs
 from nova.tests import fake_network
 from nova.tests import fake_utils
+from nova.tests.glance import stubs as glance_stubs
+from nova.tests.xenapi import stubs
 from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
-from nova.virt.xenapi import volume_utils
-from nova.virt.xenapi import vmops
 from nova.virt.xenapi import vm_utils
+from nova.virt.xenapi import vmops
+from nova.virt.xenapi import volume_utils
 
 LOG = logging.getLogger(__name__)
 

nova/tests/vmwareapi/db_fakes.py

@@ -21,10 +21,10 @@ Stubouts, mocks and fixtures for the test suite
 
 import time
 
-from nova import db
-from nova import utils
 from nova.compute import task_states
 from nova.compute import vm_states
+from nova import db
+from nova import utils
 
 
 def stub_out_db_instance_api(stubs):

nova/tests/vmwareapi/stubs.py

@@ -19,11 +19,11 @@
 Stubouts for the test suite
 """
 
-from nova.virt import vmwareapi_conn
 from nova.virt.vmwareapi import fake
-from nova.virt.vmwareapi import vmware_images
-from nova.virt.vmwareapi import vmops
 from nova.virt.vmwareapi import network_utils
+from nova.virt.vmwareapi import vmops
+from nova.virt.vmwareapi import vmware_images
+from nova.virt import vmwareapi_conn
 
 
 def fake_get_vim_object(arg):