diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index 128b16cb..5b990026 100644 --- a/nova/tests/baremetal/test_proxy_bare_metal.py +++ b/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 diff --git a/nova/tests/notifier/test_list_notifier.py b/nova/tests/notifier/test_list_notifier.py index b647f501..bd1da994 100644 --- a/nova/tests/notifier/test_list_notifier.py +++ b/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 diff --git a/nova/tests/rpc/test_common.py b/nova/tests/rpc/test_common.py index 4b505db9..08332350 100644 --- a/nova/tests/rpc/test_common.py +++ b/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 diff --git a/nova/tests/rpc/test_kombu.py b/nova/tests/rpc/test_kombu.py index f331ad80..83749527 100644 --- a/nova/tests/rpc/test_kombu.py +++ b/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: diff --git a/nova/tests/rpc/test_qpid.py b/nova/tests/rpc/test_qpid.py index 7959f378..f01c8a25 100644 --- a/nova/tests/rpc/test_qpid.py +++ b/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 diff --git a/nova/tests/test_SolidFireSanISCSIDriver.py b/nova/tests/test_SolidFireSanISCSIDriver.py index e2b5732a..9ebab6d5 100644 --- a/nova/tests/test_SolidFireSanISCSIDriver.py +++ b/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__) diff --git a/nova/tests/test_access.py b/nova/tests/test_access.py index 9bc6c804..ecc706da 100644 --- a/nova/tests/test_access.py +++ b/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 diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index fdf3c3a6..fc78e1d4 100644 --- a/nova/tests/test_api.py +++ b/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): diff --git a/nova/tests/test_auth.py b/nova/tests/test_auth.py index fb35b9c5..eaf0d481 100644 --- a/nova/tests/test_auth.py +++ b/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__) diff --git a/nova/tests/test_compat_flagfile.py b/nova/tests/test_compat_flagfile.py index d1af9c4b..21689c42 100644 --- a/nova/tests/test_compat_flagfile.py +++ b/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 diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index c574b886..ef0185ec 100644 --- a/nova/tests/test_compute.py +++ b/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 diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py index 80649539..cc069c9d 100644 --- a/nova/tests/test_compute_utils.py +++ b/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.compute import instance_types +from nova import log as logging 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__) diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 1abd44a9..33bef98c 100644 --- a/nova/tests/test_db_api.py +++ b/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 diff --git a/nova/tests/test_image.py b/nova/tests/test_image.py index 0cb13895..6482d779 100644 --- a/nova/tests/test_image.py +++ b/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): diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 2f611cb5..24605ea8 100644 --- a/nova/tests/test_imagecache.py +++ b/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 diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index 9057f189..8b8ab159 100644 --- a/nova/tests/test_instance_types.py +++ b/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__) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index d7061880..9ba45481 100644 --- a/nova/tests/test_libvirt.py +++ b/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: diff --git a/nova/tests/test_melange_ipam_lib.py b/nova/tests/test_melange_ipam_lib.py index e5092c28..9d262ed2 100644 --- a/nova/tests/test_melange_ipam_lib.py +++ b/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 diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index d8fc1a78..559a06fa 100644 --- a/nova/tests/test_migrations.py +++ b/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 diff --git a/nova/tests/test_nexenta.py b/nova/tests/test_nexenta.py index 1f553fbe..8b8f8e13 100644 --- a/nova/tests/test_nexenta.py +++ b/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 diff --git a/nova/tests/test_notifier.py b/nova/tests/test_notifier.py index b558763a..7a74c74e 100644 --- a/nova/tests/test_notifier.py +++ b/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 diff --git a/nova/tests/test_signer.py b/nova/tests/test_signer.py index 7c24f244..b714218d 100644 --- a/nova/tests/test_signer.py +++ b/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): diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index ba4948be..de06905b 100644 --- a/nova/tests/test_virt_drivers.py +++ b/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 diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py index e83a8d14..ca852c86 100644 --- a/nova/tests/test_vmwareapi.py +++ b/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 diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py index 88e8146b..607b0d49 100644 --- a/nova/tests/test_volume.py +++ b/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 diff --git a/nova/tests/test_volume_types.py b/nova/tests/test_volume_types.py index b1b62dea..d2680afa 100644 --- a/nova/tests/test_volume_types.py +++ b/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__) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 62c2f67e..7e926571 100644 --- a/nova/tests/test_xenapi.py +++ b/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__) diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py index 7911d3f3..a469c470 100644 --- a/nova/tests/vmwareapi/db_fakes.py +++ b/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): diff --git a/nova/tests/vmwareapi/stubs.py b/nova/tests/vmwareapi/stubs.py index cbb0da0f..e4d7a25d 100644 --- a/nova/tests/vmwareapi/stubs.py +++ b/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):