From 300ba2df117f457986d9ce77b8e709b5ad02c8b4 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Mon, 14 May 2012 14:42:29 -0700 Subject: Alphabetize imports in nova/tests/ Change-Id: Ib8e747f91f5277aecc3be01a5e8cee5bc911e823 --- nova/tests/api/openstack/compute/contrib/test_accounts.py | 2 +- .../api/openstack/compute/contrib/test_admin_actions.py | 4 ++-- nova/tests/api/openstack/compute/contrib/test_cloudpipe.py | 2 +- .../api/openstack/compute/contrib/test_deferred_delete.py | 2 +- .../compute/contrib/test_extended_server_attributes.py | 2 +- .../api/openstack/compute/contrib/test_extended_status.py | 2 +- .../api/openstack/compute/contrib/test_flavor_manage.py | 4 ++-- .../api/openstack/compute/contrib/test_flavorextradata.py | 2 +- .../openstack/compute/contrib/test_flavors_extra_specs.py | 2 +- .../tests/api/openstack/compute/contrib/test_floating_ips.py | 4 ++-- nova/tests/api/openstack/compute/contrib/test_hosts.py | 8 ++++---- nova/tests/api/openstack/compute/contrib/test_keypairs.py | 4 ++-- .../api/openstack/compute/contrib/test_quota_classes.py | 4 ++-- nova/tests/api/openstack/compute/contrib/test_quotas.py | 4 ++-- .../openstack/compute/contrib/test_simple_tenant_usage.py | 2 +- nova/tests/api/openstack/compute/contrib/test_snapshots.py | 2 +- .../tests/api/openstack/compute/contrib/test_volume_types.py | 4 ++-- nova/tests/api/openstack/compute/test_api.py | 6 +++--- nova/tests/api/openstack/compute/test_consoles.py | 2 +- nova/tests/api/openstack/compute/test_extensions.py | 6 +++--- nova/tests/api/openstack/compute/test_flavors.py | 2 +- nova/tests/api/openstack/compute/test_images.py | 6 +++--- nova/tests/api/openstack/compute/test_servers.py | 2 +- nova/tests/api/openstack/fakes.py | 4 ++-- nova/tests/api/openstack/test_common.py | 4 ++-- nova/tests/api/openstack/test_faults.py | 2 +- nova/tests/api/openstack/test_wsgi.py | 6 +++--- nova/tests/api/openstack/test_xmlutil.py | 2 +- nova/tests/api/openstack/volume/contrib/test_types_manage.py | 2 +- nova/tests/api/openstack/volume/test_extensions.py | 4 ++-- nova/tests/api/openstack/volume/test_router.py | 2 +- nova/tests/api/openstack/volume/test_snapshots.py | 2 +- nova/tests/api/openstack/volume/test_types.py | 2 +- nova/tests/api/test_validator.py | 2 +- nova/tests/baremetal/test_proxy_bare_metal.py | 8 ++++---- nova/tests/fake_network.py | 4 ++-- nova/tests/image/test_glance.py | 2 +- nova/tests/image/test_s3.py | 2 +- nova/tests/integrated/api/client.py | 2 +- nova/tests/integrated/test_servers.py | 4 ++-- nova/tests/integrated/test_volumes.py | 6 +++--- nova/tests/integrated/test_xml.py | 4 ++-- nova/tests/network/test_linux_net.py | 2 +- nova/tests/network/test_quantum.py | 2 +- nova/tests/notifier/test_list_notifier.py | 2 +- nova/tests/rpc/test_common.py | 2 +- nova/tests/rpc/test_kombu.py | 2 +- nova/tests/rpc/test_qpid.py | 2 +- nova/tests/test_SolidFireSanISCSIDriver.py | 2 +- nova/tests/test_access.py | 4 ++-- nova/tests/test_api.py | 8 ++++---- nova/tests/test_auth.py | 4 ++-- nova/tests/test_compat_flagfile.py | 2 +- nova/tests/test_compute.py | 2 +- nova/tests/test_compute_utils.py | 12 ++++++------ nova/tests/test_db_api.py | 2 +- nova/tests/test_exception.py | 4 ++-- nova/tests/test_image.py | 2 +- nova/tests/test_imagecache.py | 2 +- nova/tests/test_instance_types.py | 6 +++--- nova/tests/test_iptables_network.py | 2 +- nova/tests/test_libvirt.py | 6 +++--- nova/tests/test_melange_ipam_lib.py | 2 +- nova/tests/test_metadata.py | 2 +- nova/tests/test_migrations.py | 4 ++-- nova/tests/test_nexenta.py | 2 +- nova/tests/test_notifier.py | 2 +- nova/tests/test_objectstore.py | 4 ++-- nova/tests/test_policy.py | 2 +- nova/tests/test_service.py | 4 ++-- nova/tests/test_signer.py | 2 +- nova/tests/test_utils.py | 2 +- nova/tests/test_virt_drivers.py | 2 +- nova/tests/test_vmwareapi.py | 4 ++-- nova/tests/test_volume.py | 2 +- nova/tests/test_volume_types.py | 4 ++-- nova/tests/test_xenapi.py | 8 ++++---- nova/tests/vmwareapi/db_fakes.py | 4 ++-- nova/tests/vmwareapi/stubs.py | 6 +++--- nova/tests/volume/test_HpSanISCSIDriver.py | 2 +- 80 files changed, 135 insertions(+), 135 deletions(-) diff --git a/nova/tests/api/openstack/compute/contrib/test_accounts.py b/nova/tests/api/openstack/compute/contrib/test_accounts.py index 0d8270db4..d98baf7e9 100644 --- a/nova/tests/api/openstack/compute/contrib/test_accounts.py +++ b/nova/tests/api/openstack/compute/contrib/test_accounts.py @@ -19,9 +19,9 @@ import json from lxml import etree import webob -from nova import test from nova.api.openstack.compute.contrib import accounts from nova.auth import manager as auth_manager +from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py index a2e831133..e5217703f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -22,10 +22,10 @@ from nova import compute from nova import context from nova import exception from nova import flags -from nova import test -from nova import utils from nova.scheduler import api as scheduler_api +from nova import test from nova.tests.api.openstack import fakes +from nova import utils FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index 531590cb3..e2a249a2f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -18,8 +18,8 @@ import datetime from lxml import etree from nova.api.openstack import common -from nova.api.openstack import wsgi from nova.api.openstack.compute.contrib import cloudpipe +from nova.api.openstack import wsgi from nova import db from nova import flags from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py index 58102aa62..abfa89655 100644 --- a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py +++ b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py @@ -18,8 +18,8 @@ import webob from nova.api.openstack.compute.contrib import deferred_delete -import nova.context from nova import compute +import nova.context from nova import exception from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py index 80fb5ea73..63efba6d3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_server_attributes.py @@ -15,8 +15,8 @@ import json -import webob from lxml import etree +import webob from nova.api.openstack.compute.contrib import extended_server_attributes from nova import compute diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_status.py b/nova/tests/api/openstack/compute/contrib/test_extended_status.py index b63c08c6f..2bfe797ec 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_status.py @@ -15,8 +15,8 @@ import json -import webob from lxml import etree +import webob from nova.api.openstack.compute.contrib import extended_status from nova import compute diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py index 0639d99cc..f0b51b960 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py @@ -18,11 +18,11 @@ import json import webob +from nova.api.openstack.compute.contrib import flavormanage +from nova.compute import instance_types from nova import exception from nova import test from nova.tests.api.openstack import fakes -from nova.compute import instance_types -from nova.api.openstack.compute.contrib import flavormanage def fake_get_instance_type_by_flavor_id(flavorid): diff --git a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py index 5fa294df1..295772889 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavorextradata.py @@ -18,9 +18,9 @@ import json import webob +from nova.compute import instance_types from nova import test from nova.tests.api.openstack import fakes -from nova.compute import instance_types def fake_get_instance_type_by_flavor_id(flavorid): diff --git a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py index 94aac9621..bc9f66eb2 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavors_extra_specs.py @@ -17,8 +17,8 @@ import webob -from nova.api.openstack import wsgi from nova.api.openstack.compute.contrib import flavorextraspecs +from nova.api.openstack import wsgi from nova import test from nova.tests.api.openstack import fakes import nova.wsgi diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py index 452e0eef2..730484f7d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py @@ -18,16 +18,16 @@ from lxml import etree import webob from nova.api.openstack.compute.contrib import floating_ips +from nova import compute from nova import context from nova import db from nova import exception from nova import network -from nova import compute from nova import rpc from nova.rpc import common as rpc_common from nova import test -from nova.tests import fake_network from nova.tests.api.openstack import fakes +from nova.tests import fake_network from nova import utils FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index 77beeae8c..b838280fa 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -16,16 +16,16 @@ from lxml import etree import webob.exc +from nova.api.openstack.compute.contrib import hosts as os_hosts +from nova.compute import power_state +from nova.compute import vm_states from nova import context from nova import db from nova import exception from nova import flags from nova import log as logging -from nova import test -from nova.api.openstack.compute.contrib import hosts as os_hosts -from nova.compute import power_state -from nova.compute import vm_states from nova.scheduler import api as scheduler_api +from nova import test FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/compute/contrib/test_keypairs.py b/nova/tests/api/openstack/compute/contrib/test_keypairs.py index fd6fcbdb6..da8c44f86 100644 --- a/nova/tests/api/openstack/compute/contrib/test_keypairs.py +++ b/nova/tests/api/openstack/compute/contrib/test_keypairs.py @@ -15,11 +15,11 @@ import json -import webob from lxml import etree +import webob -from nova.api.openstack import wsgi from nova.api.openstack.compute.contrib import keypairs +from nova.api.openstack import wsgi from nova import db from nova import exception from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py index e67a8d76d..1287b482c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py +++ b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -import webob from lxml import etree +import webob -from nova.api.openstack import wsgi from nova.api.openstack.compute.contrib import quota_classes +from nova.api.openstack import wsgi from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_quotas.py b/nova/tests/api/openstack/compute/contrib/test_quotas.py index 2bda31595..fac37897c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_quotas.py +++ b/nova/tests/api/openstack/compute/contrib/test_quotas.py @@ -15,11 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -import webob from lxml import etree +import webob -from nova.api.openstack import wsgi from nova.api.openstack.compute.contrib import quotas +from nova.api.openstack import wsgi from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py index a5da32aa4..86c8b5f00 100644 --- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py +++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py @@ -22,11 +22,11 @@ from lxml import etree import webob from nova.api.openstack.compute.contrib import simple_tenant_usage -from nova import policy from nova.common import policy as common_policy from nova.compute import api from nova import context from nova import flags +from nova import policy from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py index ed0c8d33c..a62ea84c1 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py @@ -25,8 +25,8 @@ from nova import exception from nova import flags from nova import log as logging from nova import test -from nova import volume from nova.tests.api.openstack import fakes +from nova import volume FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/compute/contrib/test_volume_types.py b/nova/tests/api/openstack/compute/contrib/test_volume_types.py index 1cb0113f6..3d0254790 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volume_types.py +++ b/nova/tests/api/openstack/compute/contrib/test_volume_types.py @@ -18,10 +18,10 @@ import webob from nova.api.openstack.compute.contrib import volumetypes from nova import exception -from nova import test from nova import log as logging -from nova.volume import volume_types +from nova import test from nova.tests.api.openstack import fakes +from nova.volume import volume_types LOG = logging.getLogger(__name__) diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/api/openstack/compute/test_api.py index 99210cc80..c451f86ab 100644 --- a/nova/tests/api/openstack/compute/test_api.py +++ b/nova/tests/api/openstack/compute/test_api.py @@ -19,13 +19,13 @@ import json from lxml import etree import webob -import webob.exc import webob.dec +import webob.exc -import nova.context -from nova import test from nova.api import openstack as openstack_api from nova.api.openstack import wsgi +import nova.context +from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py index 3d5493e59..33cb9392d 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/api/openstack/compute/test_consoles.py @@ -22,9 +22,9 @@ from lxml import etree import webob from nova.api.openstack.compute import consoles +from nova.compute import vm_states from nova import console from nova import db -from nova.compute import vm_states from nova import exception from nova import flags from nova import test diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index 4be7e9c58..c9455bbe7 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -18,13 +18,13 @@ import json -import webob -from lxml import etree import iso8601 +from lxml import etree +import webob from nova.api.openstack import compute -from nova.api.openstack import extensions as base_extensions from nova.api.openstack.compute import extensions as compute_extensions +from nova.api.openstack import extensions as base_extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import flags diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 2e9a43507..65474e3b0 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -26,8 +26,8 @@ import nova.compute.instance_types from nova import exception from nova import flags from nova import test -from nova import utils from nova.tests.api.openstack import fakes +from nova import utils FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index d9bcc1e14..2867d7efa 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -25,14 +25,14 @@ import urlparse from lxml import etree import webob -from nova import exception -from nova import flags from nova.api.openstack.compute import images from nova.api.openstack.compute.views import images as images_view from nova.api.openstack import xmlutil +from nova import exception +from nova import flags from nova import test -from nova import utils from nova.tests.api.openstack import fakes +from nova import utils FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 99b9442e6..2230f0ea3 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -39,8 +39,8 @@ from nova import flags import nova.image.fake import nova.rpc from nova import test -from nova.tests import fake_network from nova.tests.api.openstack import fakes +from nova.tests import fake_network from nova import utils diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 1b51249d6..4fc55d730 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -26,11 +26,11 @@ from glance import client as glance_client from nova.api import auth as api_auth from nova.api import openstack as openstack_api -from nova.api.openstack import compute from nova.api.openstack import auth +from nova.api.openstack import compute from nova.api.openstack.compute import limits -from nova.api.openstack import urlmap from nova.api.openstack.compute import versions +from nova.api.openstack import urlmap from nova.api.openstack import wsgi as os_wsgi import nova.auth.manager as auth_manager from nova.compute import instance_types diff --git a/nova/tests/api/openstack/test_common.py b/nova/tests/api/openstack/test_common.py index 5e1e6e0ba..a22f4c05e 100644 --- a/nova/tests/api/openstack/test_common.py +++ b/nova/tests/api/openstack/test_common.py @@ -24,10 +24,10 @@ import webob import webob.exc import xml.dom.minidom as minidom -from nova import exception -from nova import test from nova.api.openstack import common from nova.api.openstack import xmlutil +from nova import exception +from nova import test from nova.tests import utils as test_utils diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py index 3eb2bb8dc..9cb76b7fd 100644 --- a/nova/tests/api/openstack/test_faults.py +++ b/nova/tests/api/openstack/test_faults.py @@ -22,9 +22,9 @@ import webob import webob.dec import webob.exc -from nova import test from nova.api.openstack import common from nova.api.openstack import wsgi +from nova import test class TestFaults(test.TestCase): diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 8f9a7a5a5..a0a0c8284 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -4,12 +4,12 @@ import inspect import json import webob +from nova.api.openstack import wsgi +import nova.context from nova import exception from nova import test -from nova import utils -from nova.api.openstack import wsgi from nova.tests.api.openstack import fakes -import nova.context +from nova import utils class RequestTest(test.TestCase): diff --git a/nova/tests/api/openstack/test_xmlutil.py b/nova/tests/api/openstack/test_xmlutil.py index 87e374c95..83382cb58 100644 --- a/nova/tests/api/openstack/test_xmlutil.py +++ b/nova/tests/api/openstack/test_xmlutil.py @@ -17,8 +17,8 @@ from lxml import etree -from nova import test from nova.api.openstack import xmlutil +from nova import test class SelectorTest(test.TestCase): diff --git a/nova/tests/api/openstack/volume/contrib/test_types_manage.py b/nova/tests/api/openstack/volume/contrib/test_types_manage.py index 6ec049dfa..70c89d896 100644 --- a/nova/tests/api/openstack/volume/contrib/test_types_manage.py +++ b/nova/tests/api/openstack/volume/contrib/test_types_manage.py @@ -18,8 +18,8 @@ import webob from nova.api.openstack.volume.contrib import types_manage from nova import exception from nova import test -from nova.volume import volume_types from nova.tests.api.openstack import fakes +from nova.volume import volume_types def stub_volume_type(id): diff --git a/nova/tests/api/openstack/volume/test_extensions.py b/nova/tests/api/openstack/volume/test_extensions.py index f538c8b90..e86d18fd4 100644 --- a/nova/tests/api/openstack/volume/test_extensions.py +++ b/nova/tests/api/openstack/volume/test_extensions.py @@ -18,9 +18,9 @@ import json -import webob -from lxml import etree import iso8601 +from lxml import etree +import webob from nova.api.openstack import volume from nova.api.openstack import xmlutil diff --git a/nova/tests/api/openstack/volume/test_router.py b/nova/tests/api/openstack/volume/test_router.py index 8d6cf1e78..53d96c191 100644 --- a/nova/tests/api/openstack/volume/test_router.py +++ b/nova/tests/api/openstack/volume/test_router.py @@ -16,8 +16,8 @@ from nova.api.openstack import volume from nova.api.openstack.volume import snapshots -from nova.api.openstack.volume import volumes from nova.api.openstack.volume import versions +from nova.api.openstack.volume import volumes from nova.api.openstack import wsgi from nova import flags from nova import log as logging diff --git a/nova/tests/api/openstack/volume/test_snapshots.py b/nova/tests/api/openstack/volume/test_snapshots.py index 663337eb1..ac5e97cfa 100644 --- a/nova/tests/api/openstack/volume/test_snapshots.py +++ b/nova/tests/api/openstack/volume/test_snapshots.py @@ -23,8 +23,8 @@ from nova import exception from nova import flags from nova import log as logging from nova import test -from nova import volume from nova.tests.api.openstack import fakes +from nova import volume FLAGS = flags.FLAGS diff --git a/nova/tests/api/openstack/volume/test_types.py b/nova/tests/api/openstack/volume/test_types.py index 4e1026c7c..0caa80da4 100644 --- a/nova/tests/api/openstack/volume/test_types.py +++ b/nova/tests/api/openstack/volume/test_types.py @@ -19,8 +19,8 @@ import webob from nova.api.openstack.volume import types from nova import exception from nova import test -from nova.volume import volume_types from nova.tests.api.openstack import fakes +from nova.volume import volume_types def stub_volume_type(id): diff --git a/nova/tests/api/test_validator.py b/nova/tests/api/test_validator.py index 0562ddc18..875cb6de4 100644 --- a/nova/tests/api/test_validator.py +++ b/nova/tests/api/test_validator.py @@ -18,8 +18,8 @@ import base64 -from nova import test from nova.api import validator +from nova import test class ValidatorTestCase(test.TestCase): diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index 128b16cb8..5b9900265 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 import exception +from nova import flags from nova.openstack.common import jsonutils +from nova import test from nova.tests import fake_utils -from nova import exception -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/fake_network.py b/nova/tests/fake_network.py index 03ad472b7..d2d9ba017 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -15,15 +15,15 @@ # License for the specific language governing permissions and limitations # under the License. +import nova.compute.utils import nova.context from nova import db from nova import exception from nova import flags -from nova import utils -import nova.compute.utils from nova.network import manager as network_manager from nova.network.quantum import nova_ipam_lib from nova.tests import fake_network_cache_model +from nova import utils HOST = "testhost" diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index 8fa136aad..362eda809 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -20,11 +20,11 @@ import datetime import glance.common.exception as glance_exception -from nova.tests.api.openstack import fakes from nova import context from nova import exception from nova.image import glance from nova import test +from nova.tests.api.openstack import fakes from nova.tests.glance import stubs as glance_stubs diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py index 637acc36e..124666df9 100644 --- a/nova/tests/image/test_s3.py +++ b/nova/tests/image/test_s3.py @@ -20,8 +20,8 @@ import os from nova import context import nova.db.api from nova import exception -from nova import test from nova.image import s3 +from nova import test ami_manifest_xml = """ diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py index a9a3d4a56..978caa9d3 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/integrated/api/client.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -import json import httplib +import json import urllib import urlparse diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py index 46dc99d97..2d59c49e3 100644 --- a/nova/tests/integrated/test_servers.py +++ b/nova/tests/integrated/test_servers.py @@ -18,10 +18,10 @@ import time import unittest -import nova.virt.fake from nova.log import logging -from nova.tests.integrated import integrated_helpers from nova.tests.integrated.api import client +from nova.tests.integrated import integrated_helpers +import nova.virt.fake LOG = logging.getLogger(__name__) diff --git a/nova/tests/integrated/test_volumes.py b/nova/tests/integrated/test_volumes.py index 5e61f759f..24bc43462 100644 --- a/nova/tests/integrated/test_volumes.py +++ b/nova/tests/integrated/test_volumes.py @@ -15,13 +15,13 @@ # License for the specific language governing permissions and limitations # under the License. -import unittest import time +import unittest -from nova import service from nova.log import logging -from nova.tests.integrated import integrated_helpers +from nova import service from nova.tests.integrated.api import client +from nova.tests.integrated import integrated_helpers from nova.volume import driver diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py index 78d77a6ba..58ca4f726 100644 --- a/nova/tests/integrated/test_xml.py +++ b/nova/tests/integrated/test_xml.py @@ -17,10 +17,10 @@ from lxml import etree -from nova.log import logging -from nova.tests.integrated import integrated_helpers from nova.api.openstack import common from nova.api.openstack import xmlutil +from nova.log import logging +from nova.tests.integrated import integrated_helpers LOG = logging.getLogger(__name__) diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index 1e7d3e0ff..4b60b624a 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -23,10 +23,10 @@ from nova import context from nova import db from nova import flags from nova import log as logging +from nova.network import linux_net from nova.openstack.common import importutils from nova import test from nova import utils -from nova.network import linux_net FLAGS = flags.FLAGS diff --git a/nova/tests/network/test_quantum.py b/nova/tests/network/test_quantum.py index 9f03c13f8..255444c7b 100644 --- a/nova/tests/network/test_quantum.py +++ b/nova/tests/network/test_quantum.py @@ -27,9 +27,9 @@ from nova import log as logging from nova.network.quantum import client as quantum_client from nova.network.quantum import fake_client from nova.network.quantum import manager as quantum_manager -from nova.network.quantum import quantum_connection from nova.network.quantum import melange_connection from nova.network.quantum import melange_ipam_lib +from nova.network.quantum import quantum_connection from nova import test from nova import utils diff --git a/nova/tests/notifier/test_list_notifier.py b/nova/tests/notifier/test_list_notifier.py index b647f501b..bd1da9947 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 4b505db97..083323504 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 f331ad80c..837495273 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 7959f3783..f01c8a25b 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 e2b5732ab..9ebab6d5f 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 9bc6c8047..ecc706da5 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 fdf3c3a63..fc78e1d4c 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 fb35b9c5a..eaf0d4815 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 d1af9c4b4..21689c429 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 c574b8863..ef0185ec6 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 80649539f..cc069c9d5 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 c1002d98a..24e219849 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_exception.py b/nova/tests/test_exception.py index 5615ea2d4..0db8067a2 100644 --- a/nova/tests/test_exception.py +++ b/nova/tests/test_exception.py @@ -16,9 +16,9 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import test -from nova import exception from nova import context +from nova import exception +from nova import test class EC2APIErrorTestCase(test.TestCase): diff --git a/nova/tests/test_image.py b/nova/tests/test_image.py index 0cb138956..6482d779b 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 2f611cb59..24605ea8b 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 9057f1896..8b8ab1592 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_iptables_network.py b/nova/tests/test_iptables_network.py index 4399e15f6..b23846bb5 100644 --- a/nova/tests/test_iptables_network.py +++ b/nova/tests/test_iptables_network.py @@ -17,8 +17,8 @@ # under the License. """Unit Tests for network code.""" -from nova import test from nova.network import linux_net +from nova import test class IptablesManagerTestCase(test.TestCase): diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index d70618807..9ba45481c 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 e5092c28e..9d262ed23 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_metadata.py b/nova/tests/test_metadata.py index 4a54d55ce..018941a46 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -22,8 +22,8 @@ import base64 import webob from nova.api.metadata import handler -from nova.db.sqlalchemy import api from nova import db +from nova.db.sqlalchemy import api from nova import exception from nova import flags from nova import network diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index d8fc1a78c..559a06faf 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 1f553fbeb..8b8f8e138 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 b558763a9..7a74c74e8 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_objectstore.py b/nova/tests/test_objectstore.py index 0b2dce20e..50ce67c80 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -29,9 +29,9 @@ from boto import exception as boto_exception from boto.s3 import connection as s3 from nova import flags -from nova import wsgi -from nova import test from nova.objectstore import s3server +from nova import test +from nova import wsgi FLAGS = flags.FLAGS diff --git a/nova/tests/test_policy.py b/nova/tests/test_policy.py index 9f7fb27d6..f4219d74d 100644 --- a/nova/tests/test_policy.py +++ b/nova/tests/test_policy.py @@ -22,10 +22,10 @@ import StringIO import urllib2 from nova.common import policy as common_policy +import nova.common.policy from nova import context from nova import exception from nova import flags -import nova.common.policy from nova import policy from nova import test from nova import utils diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index fbc3e57a1..2b6c83653 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -28,10 +28,10 @@ from nova import context from nova import db from nova import exception from nova import flags +from nova import manager from nova.openstack.common import cfg -from nova import test from nova import service -from nova import manager +from nova import test from nova import wsgi diff --git a/nova/tests/test_signer.py b/nova/tests/test_signer.py index 7c24f2443..b714218d4 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_utils.py b/nova/tests/test_utils.py index 0abc19c6d..d8a8969d8 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -19,8 +19,8 @@ import datetime import hashlib import os import os.path -import socket import shutil +import socket import StringIO import tempfile diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index ba4948be2..de06905b6 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 e83a8d14b..ca852c86a 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 88e8146b6..607b0d49c 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 b1b62dea0..d2680afaf 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 62c2f67ea..7e9265718 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 7911d3f37..a469c4706 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 cbb0da0fd..e4d7a25d5 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): diff --git a/nova/tests/volume/test_HpSanISCSIDriver.py b/nova/tests/volume/test_HpSanISCSIDriver.py index 43ed3e019..705152536 100644 --- a/nova/tests/volume/test_HpSanISCSIDriver.py +++ b/nova/tests/volume/test_HpSanISCSIDriver.py @@ -13,8 +13,8 @@ # under the License. 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__) -- cgit