From 6e92a67fc3e6dcd587e3fd225b7142bc74116e52 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 15 Nov 2012 19:41:58 -0500 Subject: [PATCH] Remove nova.flags Now that options have all moved from nova.flags to nova.config, we can safely remove the nova.flags imports and replace them with nova.config imports. Change-Id: Ic077a72dd6419bbf1e1babe71acfa43c4e8b55c8 --- nova/api/auth.py | 1 - nova/api/ec2/__init__.py | 1 - nova/api/ec2/apirequest.py | 2 +- nova/api/ec2/cloud.py | 1 - nova/api/ec2/ec2utils.py | 2 +- nova/api/ec2/faults.py | 1 - nova/api/manager.py | 1 - nova/api/metadata/base.py | 1 - nova/api/metadata/handler.py | 1 - nova/api/openstack/auth.py | 1 - nova/api/openstack/common.py | 1 - nova/api/openstack/compute/__init__.py | 1 - .../api/openstack/compute/contrib/__init__.py | 1 - .../compute/contrib/admin_actions.py | 2 +- .../openstack/compute/contrib/certificates.py | 2 +- .../openstack/compute/contrib/cloudpipe.py | 1 - .../openstack/compute/contrib/config_drive.py | 2 +- .../contrib/extended_server_attributes.py | 2 +- .../compute/contrib/extended_status.py | 2 +- nova/api/openstack/compute/contrib/hosts.py | 2 +- .../contrib/instance_usage_audit_log.py | 1 - .../api/openstack/compute/contrib/networks.py | 2 +- nova/api/openstack/compute/contrib/rescue.py | 1 - .../compute/contrib/security_groups.py | 2 +- .../compute/contrib/simple_tenant_usage.py | 2 +- nova/api/openstack/compute/contrib/volumes.py | 2 +- nova/api/openstack/compute/extensions.py | 1 - nova/api/openstack/compute/image_metadata.py | 2 +- nova/api/openstack/compute/images.py | 2 +- nova/api/openstack/compute/ips.py | 2 +- nova/api/openstack/compute/servers.py | 1 - nova/api/openstack/compute/views/addresses.py | 2 +- nova/api/openstack/compute/views/images.py | 1 - nova/api/openstack/compute/views/versions.py | 1 - nova/api/openstack/extensions.py | 2 +- nova/api/sizelimit.py | 1 - nova/block_device.py | 1 - nova/cert/manager.py | 2 +- nova/cert/rpcapi.py | 1 - nova/cloudpipe/pipelib.py | 1 - nova/console/api.py | 1 - nova/console/manager.py | 1 - nova/console/rpcapi.py | 1 - nova/console/vmrc.py | 1 - nova/console/vmrc_manager.py | 1 - nova/console/xvp.py | 1 - nova/consoleauth/__init__.py | 1 - nova/consoleauth/manager.py | 1 - nova/consoleauth/rpcapi.py | 1 - nova/crypto.py | 1 - nova/db/api.py | 1 - nova/db/base.py | 1 - nova/db/sqlalchemy/api.py | 1 - .../migrate_repo/versions/082_essex.py | 2 +- nova/db/sqlalchemy/migration.py | 2 +- nova/db/sqlalchemy/models.py | 1 - nova/db/sqlalchemy/session.py | 1 - nova/flags.py | 26 ------------------- nova/image/glance.py | 1 - nova/image/s3.py | 1 - nova/ipv6/api.py | 1 - nova/manager.py | 1 - nova/network/__init__.py | 1 - nova/network/api.py | 2 +- nova/network/l3.py | 2 +- nova/network/ldapdns.py | 1 - nova/network/linux_net.py | 1 - nova/network/manager.py | 1 - nova/network/minidns.py | 1 - nova/network/quantum/nova_ipam_lib.py | 2 +- nova/network/quantumv2/__init__.py | 1 - nova/network/quantumv2/api.py | 1 - nova/network/rpcapi.py | 1 - nova/notifications.py | 1 - nova/objectstore/s3server.py | 1 - nova/policy.py | 1 - nova/quota.py | 1 - nova/scheduler/filters/disk_filter.py | 1 - nova/scheduler/filters/io_ops_filter.py | 1 - .../filters/isolated_hosts_filter.py | 1 - .../scheduler/filters/num_instances_filter.py | 1 - nova/scheduler/filters/ram_filter.py | 1 - nova/scheduler/filters/trusted_filter.py | 1 - nova/service.py | 1 - nova/test.py | 1 - nova/tests/__init__.py | 1 - nova/tests/api/ec2/test_cinder_cloud.py | 1 - nova/tests/api/ec2/test_cloud.py | 1 - nova/tests/api/ec2/test_ec2_validate.py | 1 - nova/tests/api/ec2/test_middleware.py | 1 - .../compute/contrib/test_admin_actions.py | 1 - .../compute/contrib/test_cloudpipe.py | 1 - .../compute/contrib/test_createserverext.py | 2 +- .../compute/contrib/test_disk_config.py | 2 +- .../test_extended_server_attributes.py | 2 +- .../compute/contrib/test_extended_status.py | 2 +- .../compute/contrib/test_flavor_disabled.py | 2 +- .../compute/contrib/test_flavor_rxtx.py | 2 +- .../compute/contrib/test_flavor_swap.py | 2 +- .../openstack/compute/contrib/test_hosts.py | 1 - .../compute/contrib/test_networks.py | 1 - .../openstack/compute/contrib/test_rescue.py | 1 - .../compute/contrib/test_security_groups.py | 1 - .../contrib/test_simple_tenant_usage.py | 2 +- .../compute/contrib/test_snapshots.py | 2 +- .../openstack/compute/contrib/test_volumes.py | 1 - .../api/openstack/compute/test_consoles.py | 2 +- .../api/openstack/compute/test_extensions.py | 1 - .../api/openstack/compute/test_flavors.py | 2 +- .../openstack/compute/test_image_metadata.py | 1 - .../api/openstack/compute/test_images.py | 2 +- .../openstack/compute/test_server_actions.py | 1 - .../openstack/compute/test_server_metadata.py | 1 - .../api/openstack/compute/test_servers.py | 1 - nova/tests/api/test_sizelimit.py | 1 - nova/tests/baremetal/test_proxy_bare_metal.py | 2 +- nova/tests/cert/test_rpcapi.py | 1 - nova/tests/compute/test_compute.py | 1 - nova/tests/compute/test_compute_utils.py | 1 - nova/tests/compute/test_rpcapi.py | 1 - nova/tests/console/test_console.py | 1 - nova/tests/console/test_rpcapi.py | 1 - nova/tests/consoleauth/test_consoleauth.py | 2 +- nova/tests/consoleauth/test_rpcapi.py | 1 - nova/tests/fake_flags.py | 1 - nova/tests/fake_network.py | 1 - nova/tests/image/fake.py | 1 - nova/tests/integrated/test_api_samples.py | 1 - nova/tests/integrated/test_extensions.py | 1 - .../tests/integrated/test_multiprocess_api.py | 2 +- nova/tests/network/test_linux_net.py | 1 - nova/tests/network/test_rpcapi.py | 1 - nova/tests/scheduler/test_host_filters.py | 1 - nova/tests/scheduler/test_rpcapi.py | 1 - nova/tests/scheduler/test_scheduler.py | 2 +- nova/tests/test_api.py | 2 +- nova/tests/test_configdrive2.py | 2 +- nova/tests/test_crypto.py | 2 +- nova/tests/test_db_api.py | 1 - nova/tests/test_flags.py | 1 - nova/tests/test_hypervapi.py | 1 - nova/tests/test_imagebackend.py | 1 - nova/tests/test_imagecache.py | 1 - nova/tests/test_instance_types.py | 2 +- nova/tests/test_libvirt.py | 1 - nova/tests/test_libvirt_vif.py | 1 - nova/tests/test_metadata.py | 1 - nova/tests/test_notifications.py | 2 +- nova/tests/test_objectstore.py | 1 - nova/tests/test_pipelib.py | 1 - nova/tests/test_policy.py | 2 +- nova/tests/test_powervm.py | 2 +- nova/tests/test_quota.py | 1 - nova/tests/test_service.py | 1 - nova/tests/test_utils.py | 1 - nova/tests/test_virt.py | 2 +- nova/tests/test_vmwareapi.py | 2 +- nova/tests/test_xenapi.py | 1 - nova/tests/utils.py | 1 - nova/utils.py | 1 - .../virt/baremetal/db/sqlalchemy/migration.py | 1 + nova/virt/baremetal/dom.py | 2 +- nova/virt/baremetal/driver.py | 1 - nova/virt/baremetal/nodes.py | 1 - nova/virt/baremetal/tilera.py | 1 - nova/virt/configdrive.py | 1 - nova/virt/disk/api.py | 1 - nova/virt/disk/mount/nbd.py | 1 - nova/virt/driver.py | 2 +- nova/virt/firewall.py | 1 - nova/virt/hyperv/livemigrationops.py | 1 - nova/virt/hyperv/snapshotops.py | 1 - nova/virt/hyperv/volumeops.py | 1 - nova/virt/hyperv/volumeutils.py | 1 - nova/virt/images.py | 1 - nova/virt/libvirt/driver.py | 1 - nova/virt/libvirt/firewall.py | 1 - nova/virt/libvirt/imagebackend.py | 1 - nova/virt/libvirt/imagecache.py | 1 - nova/virt/libvirt/utils.py | 1 - nova/virt/libvirt/vif.py | 1 - nova/virt/libvirt/volume.py | 1 - nova/virt/libvirt/volume_nfs.py | 1 - nova/virt/netutils.py | 1 - nova/virt/powervm/driver.py | 1 - nova/virt/powervm/operator.py | 1 - nova/virt/vmwareapi/driver.py | 1 - nova/virt/vmwareapi/read_write_util.py | 2 +- nova/virt/vmwareapi/vif.py | 1 - nova/virt/vmwareapi/vim.py | 1 - nova/virt/vmwareapi/vmops.py | 1 - nova/virt/xenapi/agent.py | 1 - nova/virt/xenapi/driver.py | 1 - nova/virt/xenapi/firewall.py | 2 +- nova/virt/xenapi/pool.py | 1 - nova/virt/xenapi/vif.py | 1 - nova/virt/xenapi/vm_utils.py | 1 - nova/virt/xenapi/vmops.py | 1 - nova/virt/xenapi/volume_utils.py | 1 - nova/vnc/__init__.py | 1 - nova/vnc/xvp_proxy.py | 1 - nova/volume/__init__.py | 1 - nova/volume/cinder.py | 1 - nova/wsgi.py | 1 - tools/xenserver/destroy_cached_images.py | 2 +- tools/xenserver/vm_vdi_cleaner.py | 1 - 206 files changed, 54 insertions(+), 230 deletions(-) delete mode 100644 nova/flags.py diff --git a/nova/api/auth.py b/nova/api/auth.py index 1562aeede1dc..167c897cf972 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -23,7 +23,6 @@ import webob.exc from nova import config from nova import context -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 1bf1f9f70f21..a4a52a22a747 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -34,7 +34,6 @@ from nova.api import validator from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 6cd7c4431524..c3b2065b4db1 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -25,8 +25,8 @@ import datetime from xml.dom import minidom from nova.api.ec2 import ec2utils +from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 9d73673a4e5e..a061931b0dd6 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -36,7 +36,6 @@ from nova.compute import vm_states from nova import config from nova import db from nova import exception -from nova import flags from nova.image import s3 from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 997197d3806c..238bbecb944e 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -18,10 +18,10 @@ import re +from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.network import model as network_model from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py index 331603a3a96a..fd2e46fcd731 100644 --- a/nova/api/ec2/faults.py +++ b/nova/api/ec2/faults.py @@ -17,7 +17,6 @@ import webob.exc from nova import config from nova import context -from nova import flags from nova import utils CONF = config.CONF diff --git a/nova/api/manager.py b/nova/api/manager.py index dc081d9a670a..d74e0ad24cd1 100644 --- a/nova/api/manager.py +++ b/nova/api/manager.py @@ -17,7 +17,6 @@ # under the License. from nova import config -from nova import flags from nova import manager from nova.openstack.common import importutils diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 6fd8b13747b0..937938b4093d 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -28,7 +28,6 @@ from nova import block_device from nova import config from nova import context from nova import db -from nova import flags from nova import network from nova.openstack.common import cfg from nova.virt import netutils diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index 14ec696cd27b..434d8deba00a 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -25,7 +25,6 @@ import webob.exc from nova.api.metadata import base from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 78064012bbc6..4d680fa940b7 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -23,7 +23,6 @@ import webob.exc from nova.api.openstack import wsgi from nova import config from nova import context -from nova import flags from nova.openstack.common import log as logging from nova import wsgi as base_wsgi diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 50ac76179267..38247a55b550 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -30,7 +30,6 @@ from nova.compute import utils as compute_utils from nova.compute import vm_states from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova import quota diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index e6704951f375..dc18a01a5450 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -32,7 +32,6 @@ from nova.api.openstack.compute import server_metadata from nova.api.openstack.compute import servers from nova.api.openstack.compute import versions from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index e6a1e9c4de48..fc29433808fa 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -23,7 +23,6 @@ It can't be called 'extensions' because that causes namespacing problems. from nova.api.openstack import extensions from nova import config -from nova import flags from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 1bac0851dd2b..3614d7ba1ce9 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -23,8 +23,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova.compute import vm_states +from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index c05a208a3b98..c53fdabd589d 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.cert.rpcapi -from nova import flags +from nova import config from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 77d88144af1d..302ff7cf30d9 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -24,7 +24,6 @@ from nova.compute import vm_states from nova import config from nova import db from nova import exception -from nova import flags from nova import network from nova.openstack.common import fileutils from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py index ac294f660769..b972cf9b97eb 100644 --- a/nova/api/openstack/compute/contrib/config_drive.py +++ b/nova/api/openstack/compute/contrib/config_drive.py @@ -21,7 +21,7 @@ from nova.api.openstack.compute import servers from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import flags +from nova import config authorize = extensions.soft_extension_authorizer('compute', 'config_drive') diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py index 15f6456eafcd..06847c727afe 100644 --- a/nova/api/openstack/compute/contrib/extended_server_attributes.py +++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py @@ -18,8 +18,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute +from nova import config from nova import db -from nova import flags from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py index f7ccdcbff401..55ff930f2fe3 100644 --- a/nova/api/openstack/compute/contrib/extended_status.py +++ b/nova/api/openstack/compute/contrib/extended_status.py @@ -18,7 +18,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index 237872405847..32582548c423 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -23,9 +23,9 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.compute import api as compute_api +from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py index 7c98cb8d68b1..31a66b8febc1 100644 --- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py +++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py @@ -23,7 +23,6 @@ import webob.exc from nova.api.openstack import extensions from nova import config from nova import db -from nova import flags from nova import utils CONF = config.CONF diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index 4537e1ec779e..e7b7ac8a6532 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -21,8 +21,8 @@ import webob from webob import exc from nova.api.openstack import extensions +from nova import config from nova import exception -from nova import flags from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 054eaf870c37..b76b54e8b433 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -23,7 +23,6 @@ from nova.api.openstack import wsgi from nova import compute from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index b86397694f77..ac5206a632f1 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -27,9 +27,9 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova.compute import api as compute_api +from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py index f6e9a63f6f03..c51faef1bf36 100644 --- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py @@ -22,8 +22,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova.compute import api +from nova import config from nova import exception -from nova import flags from nova.openstack.common import timeutils authorize_show = extensions.extension_authorizer('compute', diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index 39792771ca87..c58a70d3cba2 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -24,8 +24,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute +from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova import utils from nova import volume diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index c46a6b0348e2..4805ba4e6c3f 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -17,7 +17,6 @@ from nova.api.openstack import extensions as base_extensions from nova import config -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common.plugin import pluginmanager diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 3bc81707636e..375bbc4d59a7 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -19,8 +19,8 @@ from webob import exc from nova.api.openstack import common from nova.api.openstack import wsgi +from nova import config from nova import exception -from nova import flags from nova.image import glance diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 0c280618e0a3..bdd0e091624f 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -19,8 +19,8 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import images as views_images from nova.api.openstack import wsgi from nova.api.openstack import xmlutil +from nova import config from nova import exception -from nova import flags import nova.image.glance from nova.openstack.common import log as logging import nova.utils diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index ec9759759559..a01066d0e1d4 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -22,7 +22,7 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import addresses as view_addresses from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index d8d2f1c28028..2c22ccc48f9c 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -32,7 +32,6 @@ from nova import compute from nova.compute import instance_types from nova import config from nova import exception -from nova import flags from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common.rpc import common as rpc_common diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index ec5fda64a7fa..c5ccb02fdcde 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -18,7 +18,7 @@ import itertools from nova.api.openstack import common -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index d1d7d008f5a3..228af7c8d7ef 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -19,7 +19,6 @@ import os.path from nova.api.openstack import common from nova import config -from nova import flags from nova import utils CONF = config.CONF diff --git a/nova/api/openstack/compute/views/versions.py b/nova/api/openstack/compute/views/versions.py index 826c8b4a5465..594369490a21 100644 --- a/nova/api/openstack/compute/views/versions.py +++ b/nova/api/openstack/compute/views/versions.py @@ -20,7 +20,6 @@ import os from nova.api.openstack import common from nova import config -from nova import flags CONF = config.CONF diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 298e9860345f..b44ebefbbb8b 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -24,8 +24,8 @@ import webob.exc import nova.api.openstack from nova.api.openstack import wsgi from nova.api.openstack import xmlutil +from nova import config from nova import exception -from nova import flags from nova.openstack.common import importutils from nova.openstack.common import log as logging import nova.policy diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index 1d22e74fc3be..95fa381ff65c 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.py @@ -22,7 +22,6 @@ import webob.dec import webob.exc from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/block_device.py b/nova/block_device.py index fa59fe32553a..bf923ecc0ad2 100644 --- a/nova/block_device.py +++ b/nova/block_device.py @@ -18,7 +18,6 @@ import re from nova import config -from nova import flags CONF = config.CONF diff --git a/nova/cert/manager.py b/nova/cert/manager.py index d23a15450173..0d0e795c70bc 100644 --- a/nova/cert/manager.py +++ b/nova/cert/manager.py @@ -26,8 +26,8 @@ Cert manager manages x509 certificates. import base64 +from nova import config from nova import crypto -from nova import flags from nova import manager from nova.openstack.common import log as logging diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index f6ba11579746..7665f544c01b 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -19,7 +19,6 @@ Client side of the cert manager RPC API. """ from nova import config -from nova import flags import nova.openstack.common.rpc.proxy CONF = config.CONF diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 414954670dd8..5a74f1f8b06b 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -32,7 +32,6 @@ from nova import config from nova import crypto from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import log as logging diff --git a/nova/console/api.py b/nova/console/api.py index 5fb506fe0cc0..0ddea69d8ccd 100644 --- a/nova/console/api.py +++ b/nova/console/api.py @@ -21,7 +21,6 @@ from nova.compute import rpcapi as compute_rpcapi from nova import config from nova.console import rpcapi as console_rpcapi from nova.db import base -from nova import flags from nova.openstack.common import rpc from nova.openstack.common import uuidutils diff --git a/nova/console/manager.py b/nova/console/manager.py index a2f48494b902..b4732844a22e 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -22,7 +22,6 @@ import socket from nova.compute import rpcapi as compute_rpcapi from nova import config from nova import exception -from nova import flags from nova import manager from nova.openstack.common import cfg from nova.openstack.common import importutils diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 06e282dcef71..b401c4c4ee7a 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -19,7 +19,6 @@ Client side of the console RPC API. """ from nova import config -from nova import flags import nova.openstack.common.rpc.proxy CONF = config.CONF diff --git a/nova/console/vmrc.py b/nova/console/vmrc.py index ae66d5f0514f..a10bf9951ada 100644 --- a/nova/console/vmrc.py +++ b/nova/console/vmrc.py @@ -21,7 +21,6 @@ import base64 from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.virt.vmwareapi import vim_util diff --git a/nova/console/vmrc_manager.py b/nova/console/vmrc_manager.py index c40067daa9ad..3990b48b94ca 100644 --- a/nova/console/vmrc_manager.py +++ b/nova/console/vmrc_manager.py @@ -20,7 +20,6 @@ from nova.compute import rpcapi as compute_rpcapi from nova import config from nova import exception -from nova import flags from nova import manager from nova.openstack.common import cfg from nova.openstack.common import importutils diff --git a/nova/console/xvp.py b/nova/console/xvp.py index 12a7f3fd384d..6bcd8534542b 100644 --- a/nova/console/xvp.py +++ b/nova/console/xvp.py @@ -26,7 +26,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/consoleauth/__init__.py b/nova/consoleauth/__init__.py index 11253ea917b4..dbff115ffd32 100644 --- a/nova/consoleauth/__init__.py +++ b/nova/consoleauth/__init__.py @@ -19,7 +19,6 @@ """Module to authenticate Consoles.""" from nova import config -from nova import flags from nova.openstack.common import cfg diff --git a/nova/consoleauth/manager.py b/nova/consoleauth/manager.py index c772101ebea1..9a3f03e5a429 100644 --- a/nova/consoleauth/manager.py +++ b/nova/consoleauth/manager.py @@ -21,7 +21,6 @@ import time from nova import config -from nova import flags from nova import manager from nova.openstack.common import cfg from nova.openstack.common import jsonutils diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 51d28cb04cf3..822f401bc6b5 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -19,7 +19,6 @@ Client side of the consoleauth RPC API. """ from nova import config -from nova import flags import nova.openstack.common.rpc.proxy CONF = config.CONF diff --git a/nova/crypto.py b/nova/crypto.py index ef7b40419f19..52c8923781e7 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -32,7 +32,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import log as logging diff --git a/nova/db/api.py b/nova/db/api.py index 51d6dc6ab10f..26463cd013c8 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -45,7 +45,6 @@ these objects be simple dictionaries. from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova import utils diff --git a/nova/db/base.py b/nova/db/base.py index e1393e2ef5e6..650edd42f650 100644 --- a/nova/db/base.py +++ b/nova/db/base.py @@ -19,7 +19,6 @@ """Base class for classes that need modular database access.""" from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 89c4cfcda4f3..1ede7b05e4a0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -43,7 +43,6 @@ 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.openstack.common import log as logging from nova.openstack.common import timeutils from nova.openstack.common import uuidutils diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py index 99254d35eff2..ce795b071576 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py @@ -18,7 +18,7 @@ from migrate import ForeignKeyConstraint from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey from sqlalchemy import Index, Integer, MetaData, String, Table, Text -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 31c40234a406..5f17f96f4a45 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -19,10 +19,10 @@ import distutils.version as dist_version import os +from nova import config from nova.db import migration from nova.db.sqlalchemy.session import get_engine from nova import exception -from nova import flags from nova.openstack.common import log as logging diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index d002a941d728..e4980e57b19d 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -30,7 +30,6 @@ from sqlalchemy.orm import relationship, backref, object_mapper from nova import config from nova.db.sqlalchemy.session import get_session from nova import exception -from nova import flags from nova.openstack.common import timeutils diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 9f9ccf797d74..f16b9d1614cc 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -171,7 +171,6 @@ from sqlalchemy.pool import NullPool, StaticPool from nova import config import nova.exception -import nova.flags as flags import nova.openstack.common.log as logging diff --git a/nova/flags.py b/nova/flags.py deleted file mode 100644 index c092d966a368..000000000000 --- a/nova/flags.py +++ /dev/null @@ -1,26 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# Copyright 2012 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Deprecated module. One should use nova.config instead. - -This is left to support backwards compatibility. -""" - -from nova import config diff --git a/nova/image/glance.py b/nova/image/glance.py index 0cbc915313e5..6e0a57773898 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -31,7 +31,6 @@ import glanceclient.exc from nova import config from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/image/s3.py b/nova/image/s3.py index d252baba080e..e6ab8bb156d6 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -33,7 +33,6 @@ from nova.api.ec2 import ec2utils import nova.cert.rpcapi from nova import config from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/ipv6/api.py b/nova/ipv6/api.py index 96e30e9668dd..23a6a365faf6 100644 --- a/nova/ipv6/api.py +++ b/nova/ipv6/api.py @@ -15,7 +15,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova import utils diff --git a/nova/manager.py b/nova/manager.py index 100e0757c96e..8beae2732ecb 100644 --- a/nova/manager.py +++ b/nova/manager.py @@ -57,7 +57,6 @@ import eventlet from nova import config from nova.db import base -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common.plugin import pluginmanager from nova.openstack.common.rpc import dispatcher as rpc_dispatcher diff --git a/nova/network/__init__.py b/nova/network/__init__.py index 221130a915fb..79955e1eb434 100644 --- a/nova/network/__init__.py +++ b/nova/network/__init__.py @@ -19,7 +19,6 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from nova.network import ' elsewhere. import nova.config -import nova.flags import nova.openstack.common.importutils diff --git a/nova/network/api.py b/nova/network/api.py index 526b969f6f20..049b8c7c0a32 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -20,9 +20,9 @@ import functools import inspect +from nova import config from nova.db import base from nova import exception -from nova import flags from nova.network import model as network_model from nova.network import rpcapi as network_rpcapi from nova.openstack.common import log as logging diff --git a/nova/network/l3.py b/nova/network/l3.py index 6c16dbeb60d8..e937245e77a8 100644 --- a/nova/network/l3.py +++ b/nova/network/l3.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import flags +from nova import config from nova.network import linux_net from nova.openstack.common import log as logging from nova import utils diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py index 661c3ad562c9..15b6ca235b62 100644 --- a/nova/network/ldapdns.py +++ b/nova/network/ldapdns.py @@ -17,7 +17,6 @@ import time from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 6b06a8f8961b..c57e9a730110 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -27,7 +27,6 @@ import os from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import importutils diff --git a/nova/network/manager.py b/nova/network/manager.py index 456ab2fb1857..66d26f960366 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -58,7 +58,6 @@ from nova.compute import api as compute_api from nova import config from nova import context from nova import exception -from nova import flags from nova import ipv6 from nova import manager from nova.network import api as network_api diff --git a/nova/network/minidns.py b/nova/network/minidns.py index 35e77f63a90f..37b85fb66c3d 100644 --- a/nova/network/minidns.py +++ b/nova/network/minidns.py @@ -18,7 +18,6 @@ import tempfile from nova import config from nova import exception -from nova import flags CONF = config.CONF diff --git a/nova/network/quantum/nova_ipam_lib.py b/nova/network/quantum/nova_ipam_lib.py index b296715c2ce3..4e6f5dbed3d8 100644 --- a/nova/network/quantum/nova_ipam_lib.py +++ b/nova/network/quantum/nova_ipam_lib.py @@ -17,9 +17,9 @@ import netaddr +from nova import config from nova import db from nova import exception -from nova import flags from nova import ipv6 from nova.network import manager from nova.openstack.common import log as logging diff --git a/nova/network/quantumv2/__init__.py b/nova/network/quantumv2/__init__.py index a5fac840c8b0..3377a32ab33c 100644 --- a/nova/network/quantumv2/__init__.py +++ b/nova/network/quantumv2/__init__.py @@ -17,7 +17,6 @@ from nova import config from nova import exception -from nova import flags from nova.openstack.common import excutils from nova.openstack.common import log as logging from quantumclient import client diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 8c2438669c6a..38692351e201 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -20,7 +20,6 @@ from nova.compute import api as compute_api from nova import config from nova.db import base from nova import exception -from nova import flags from nova.network.api import refresh_cache from nova.network import model as network_model from nova.network import quantumv2 diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index e8a02f6f5c52..c0742b1ca0ef 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -19,7 +19,6 @@ Client side of the network RPC API. """ from nova import config -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova.openstack.common.rpc import proxy as rpc_proxy diff --git a/nova/notifications.py b/nova/notifications.py index 7153933ee8d7..d43aef3c760f 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -23,7 +23,6 @@ from nova import config import nova.context from nova import db from nova import exception -from nova import flags from nova import network from nova.network import model as network_model from nova.openstack.common import cfg diff --git a/nova/objectstore/s3server.py b/nova/objectstore/s3server.py index 5b4ee916c150..0975ca76f8ec 100644 --- a/nova/objectstore/s3server.py +++ b/nova/objectstore/s3server.py @@ -45,7 +45,6 @@ import routes import webob from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova import utils diff --git a/nova/policy.py b/nova/policy.py index 9506635e9089..dc4bc70311d4 100644 --- a/nova/policy.py +++ b/nova/policy.py @@ -21,7 +21,6 @@ import os.path from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import policy from nova import utils diff --git a/nova/quota.py b/nova/quota.py index 4fda1cc39c85..730c466d9c85 100644 --- a/nova/quota.py +++ b/nova/quota.py @@ -23,7 +23,6 @@ import datetime from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging diff --git a/nova/scheduler/filters/disk_filter.py b/nova/scheduler/filters/disk_filter.py index 358583b8a147..77ee75c99fc8 100644 --- a/nova/scheduler/filters/disk_filter.py +++ b/nova/scheduler/filters/disk_filter.py @@ -14,7 +14,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/io_ops_filter.py b/nova/scheduler/filters/io_ops_filter.py index 1b40bae6265c..3f04815a0eb0 100644 --- a/nova/scheduler/filters/io_ops_filter.py +++ b/nova/scheduler/filters/io_ops_filter.py @@ -14,7 +14,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/isolated_hosts_filter.py b/nova/scheduler/filters/isolated_hosts_filter.py index d1d16b80bd1d..213953b1832f 100644 --- a/nova/scheduler/filters/isolated_hosts_filter.py +++ b/nova/scheduler/filters/isolated_hosts_filter.py @@ -14,7 +14,6 @@ # under the License. from nova import config -from nova import flags from nova.scheduler import filters CONF = config.CONF diff --git a/nova/scheduler/filters/num_instances_filter.py b/nova/scheduler/filters/num_instances_filter.py index 17c7ebc22ee0..b34e715265d2 100644 --- a/nova/scheduler/filters/num_instances_filter.py +++ b/nova/scheduler/filters/num_instances_filter.py @@ -14,7 +14,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/ram_filter.py b/nova/scheduler/filters/ram_filter.py index 85370dc2c90e..832a7c41ae10 100644 --- a/nova/scheduler/filters/ram_filter.py +++ b/nova/scheduler/filters/ram_filter.py @@ -15,7 +15,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.scheduler import filters diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index 4fd0488d97be..1e0470b61c67 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -49,7 +49,6 @@ import socket import ssl from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/service.py b/nova/service.py index 0c3ad3f085c9..109fbc06c776 100644 --- a/nova/service.py +++ b/nova/service.py @@ -34,7 +34,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import eventlet_backdoor from nova.openstack.common import importutils diff --git a/nova/test.py b/nova/test.py index 666f94f107ce..25572600f684 100644 --- a/nova/test.py +++ b/nova/test.py @@ -32,7 +32,6 @@ import stubout import testtools from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 9adb9f701f62..f0c117b32856 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -33,7 +33,6 @@ import shutil from nova import config from nova.db.sqlalchemy.session import get_engine -from nova import flags from nova.openstack.common import log as logging import eventlet diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index a9f4f742f6ad..cbdfc3aee371 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -28,7 +28,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py index 017466ff0168..bdf2cbe7c351 100644 --- a/nova/tests/api/ec2/test_cloud.py +++ b/nova/tests/api/ec2/test_cloud.py @@ -36,7 +36,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.image import s3 from nova.network import api as network_api from nova.openstack.common import log as logging diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index 7c16713a45c0..0f15c66b803d 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -25,7 +25,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.openstack.common import rpc from nova.openstack.common import timeutils diff --git a/nova/tests/api/ec2/test_middleware.py b/nova/tests/api/ec2/test_middleware.py index fbc10d86d066..25cba1c4dcf3 100644 --- a/nova/tests/api/ec2/test_middleware.py +++ b/nova/tests/api/ec2/test_middleware.py @@ -25,7 +25,6 @@ from nova.api import ec2 from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova import test 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 f6337f035ea1..9ede7dd17f48 100644 --- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py +++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py @@ -24,7 +24,6 @@ from nova.compute import vm_states from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index 0be17e47aaf8..348816833380 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -20,7 +20,6 @@ from nova.api.openstack import wsgi from nova.compute import utils as compute_utils from nova import config from nova import db -from nova import flags from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py index a08a63efc9bc..07f7f6eec733 100644 --- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py +++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py @@ -21,9 +21,9 @@ from xml.dom import minidom import webob from nova.compute import api as compute_api +from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py index 78ffb62e68f7..c79fda9105b0 100644 --- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py +++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py @@ -18,8 +18,8 @@ import datetime from nova.api.openstack import compute +from nova import config import nova.db.api -from nova import flags from nova.openstack.common import jsonutils import nova.openstack.common.rpc 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 7154d06bb764..e9c0c0bc8340 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 @@ -18,9 +18,9 @@ import webob from nova.api.openstack.compute.contrib import extended_server_attributes from nova import compute +from nova import config from nova import db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes 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 bff7773b1fd0..457b8bd32938 100644 --- a/nova/tests/api/openstack/compute/contrib/test_extended_status.py +++ b/nova/tests/api/openstack/compute/contrib/test_extended_status.py @@ -18,8 +18,8 @@ import webob from nova.api.openstack.compute.contrib import extended_status from nova import compute +from nova import config from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py index a90fa19c7a10..b2400bc51b36 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_disabled.py @@ -17,7 +17,7 @@ import webob from nova.api.openstack.compute.contrib import flavor_disabled from nova.compute import instance_types -from nova import flags +from nova import config from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py index 3965fbbd7e4b..a6624e88d905 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_rxtx.py @@ -16,7 +16,7 @@ from lxml import etree import webob from nova.compute import instance_types -from nova import flags +from nova import config from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py index b9f57f8ce076..e8c66962ad6d 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py @@ -16,7 +16,7 @@ from lxml import etree import webob from nova.compute import instance_types -from nova import flags +from nova import config from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index 9445947883e8..f5bce3184bf3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -21,7 +21,6 @@ from nova.compute import power_state from nova.compute import vm_states from nova import context from nova import db -from nova import flags from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py index 1ee77c54702b..2540904eecf8 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/api/openstack/compute/contrib/test_networks.py @@ -25,7 +25,6 @@ import webob from nova.api.openstack.compute.contrib import networks from nova import config from nova import exception -from nova import flags from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_rescue.py b/nova/tests/api/openstack/compute/contrib/test_rescue.py index 5baff7717386..2a7e973ffe35 100644 --- a/nova/tests/api/openstack/compute/contrib/test_rescue.py +++ b/nova/tests/api/openstack/compute/contrib/test_rescue.py @@ -17,7 +17,6 @@ import webob from nova import compute from nova import config from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py index c0d097c7af18..6fdeb0fec65f 100644 --- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py @@ -28,7 +28,6 @@ from nova import compute from nova import config import nova.db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import quota from nova import test 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 0c5f029ba13d..a10ec208ca05 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,8 +22,8 @@ import webob from nova.api.openstack.compute.contrib import simple_tenant_usage from nova.compute import api +from nova import config from nova import context -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import policy as common_policy from nova.openstack.common import timeutils diff --git a/nova/tests/api/openstack/compute/contrib/test_snapshots.py b/nova/tests/api/openstack/compute/contrib/test_snapshots.py index 7bc5d65f399a..319991bfac17 100644 --- a/nova/tests/api/openstack/compute/contrib/test_snapshots.py +++ b/nova/tests/api/openstack/compute/contrib/test_snapshots.py @@ -17,9 +17,9 @@ from lxml import etree import webob from nova.api.openstack.compute.contrib import volumes +from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py index d2c0d98da3a4..4272b3011cea 100644 --- a/nova/tests/api/openstack/compute/contrib/test_volumes.py +++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py @@ -24,7 +24,6 @@ from nova.compute import instance_types from nova import config from nova import context from nova import db -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import timeutils from nova import test diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py index 15920d2fbb81..6b8d290c4291 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/api/openstack/compute/test_consoles.py @@ -24,10 +24,10 @@ import webob from nova.api.openstack.compute import consoles from nova.compute import vm_states +from nova import config from nova import console from nova import db from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index 8282c4c193af..fe7f03cd6d47 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -26,7 +26,6 @@ from nova.api.openstack import extensions as base_extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import config -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py index 0fc748fde101..16bb74801bd0 100644 --- a/nova/tests/api/openstack/compute/test_flavors.py +++ b/nova/tests/api/openstack/compute/test_flavors.py @@ -23,10 +23,10 @@ import urlparse from nova.api.openstack.compute import flavors from nova.api.openstack import xmlutil import nova.compute.instance_types +from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova import test from nova.tests.api.openstack import fakes from nova.tests import matchers diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py index c2f12b4a5f0d..a5ac184ca7e4 100644 --- a/nova/tests/api/openstack/compute/test_image_metadata.py +++ b/nova/tests/api/openstack/compute/test_image_metadata.py @@ -19,7 +19,6 @@ import webob from nova.api.openstack.compute import image_metadata from nova import config -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index fe49e6c04e3b..1ce2c960efdc 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -28,8 +28,8 @@ import webob 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 config from nova import exception -from nova import flags from nova import test from nova.tests.api.openstack import fakes from nova.tests import matchers diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py index 415313d9aa45..002f510103a3 100644 --- a/nova/tests/api/openstack/compute/test_server_actions.py +++ b/nova/tests/api/openstack/compute/test_server_actions.py @@ -26,7 +26,6 @@ from nova.compute import vm_states from nova import config from nova import db from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import importutils from nova import test diff --git a/nova/tests/api/openstack/compute/test_server_metadata.py b/nova/tests/api/openstack/compute/test_server_metadata.py index 82b7df74c32f..5f595e3a5dc3 100644 --- a/nova/tests/api/openstack/compute/test_server_metadata.py +++ b/nova/tests/api/openstack/compute/test_server_metadata.py @@ -24,7 +24,6 @@ from nova.compute import rpcapi as compute_rpcapi from nova import config import nova.db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests.api.openstack import fakes diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 06f6e9ba7da8..1e514c13e9d7 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -40,7 +40,6 @@ from nova import context from nova import db from nova.db.sqlalchemy import models from nova import exception -from nova import flags from nova.network import manager from nova.network.quantumv2 import api as quantum_api from nova.openstack.common import jsonutils diff --git a/nova/tests/api/test_sizelimit.py b/nova/tests/api/test_sizelimit.py index 8f9358b41f10..0eb46616f03f 100644 --- a/nova/tests/api/test_sizelimit.py +++ b/nova/tests/api/test_sizelimit.py @@ -16,7 +16,6 @@ import webob import nova.api.sizelimit from nova import config -from nova import flags from nova import test CONF = config.CONF diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index 2355c604c5a2..8d6a3c2611af 100644 --- a/nova/tests/baremetal/test_proxy_bare_metal.py +++ b/nova/tests/baremetal/test_proxy_bare_metal.py @@ -20,8 +20,8 @@ import mox import StringIO from nova.compute import power_state +from nova import config from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova import test from nova.tests import fake_utils diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py index 36e0d81dc951..854c49c9f529 100644 --- a/nova/tests/cert/test_rpcapi.py +++ b/nova/tests/cert/test_rpcapi.py @@ -21,7 +21,6 @@ Unit Tests for nova.cert.rpcapi from nova.cert import rpcapi as cert_rpcapi from nova import config from nova import context -from nova import flags from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 451fc3d87930..9d23021e3757 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -41,7 +41,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.network import api as network_api from nova.network import model as network_model from nova.openstack.common import importutils diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py index 3ef9ac459344..53a5b20ae132 100644 --- a/nova/tests/compute/test_compute_utils.py +++ b/nova/tests/compute/test_compute_utils.py @@ -25,7 +25,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.network import api as network_api from nova.openstack.common import importutils from nova.openstack.common import log as logging diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 82537560bdb4..fac95cc62514 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -22,7 +22,6 @@ from nova.compute import rpcapi as compute_rpcapi from nova import config from nova import context from nova import db -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py index 7e4e83d7de3c..372fbd1dfd9e 100644 --- a/nova/tests/console/test_console.py +++ b/nova/tests/console/test_console.py @@ -24,7 +24,6 @@ from nova.console import rpcapi as console_rpcapi from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import importutils from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py index ce8bb8a51abe..0df7491c561d 100644 --- a/nova/tests/console/test_rpcapi.py +++ b/nova/tests/console/test_rpcapi.py @@ -21,7 +21,6 @@ Unit Tests for nova.console.rpcapi from nova import config from nova.console import rpcapi as console_rpcapi from nova import context -from nova import flags from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py index a8d6ea3d3292..5ff15b23b2d3 100644 --- a/nova/tests/consoleauth/test_consoleauth.py +++ b/nova/tests/consoleauth/test_consoleauth.py @@ -22,9 +22,9 @@ Tests for Consoleauth Code. import time +from nova import config from nova.consoleauth import manager from nova import context -from nova import flags from nova.openstack.common import log as logging from nova import test diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py index 8e91538933f4..428a79e3adbe 100644 --- a/nova/tests/consoleauth/test_rpcapi.py +++ b/nova/tests/consoleauth/test_rpcapi.py @@ -21,7 +21,6 @@ Unit Tests for nova.consoleauth.rpcapi from nova import config from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova import flags from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index 6ded0c5be7fd..65191641de8f 100644 --- a/nova/tests/fake_flags.py +++ b/nova/tests/fake_flags.py @@ -17,7 +17,6 @@ # under the License. from nova import config -from nova import flags CONF = config.CONF diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 4cbde5d398e5..50c6a55a8a50 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -21,7 +21,6 @@ from nova import config import nova.context from nova import db from nova import exception -from nova import flags from nova.network import api as network_api from nova.network import manager as network_manager from nova.network import model as network_model diff --git a/nova/tests/image/fake.py b/nova/tests/image/fake.py index b2953526f1f0..58c03b1674df 100644 --- a/nova/tests/image/fake.py +++ b/nova/tests/image/fake.py @@ -24,7 +24,6 @@ import uuid from nova import config from nova import exception -from nova import flags import nova.image.glance from nova.openstack.common import log as logging diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 62d49ad0a5b4..9337644276cb 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -27,7 +27,6 @@ from nova.compute import api from nova import config from nova import context from nova import db -from nova import flags from nova.network.manager import NetworkManager from nova.openstack.common import importutils from nova.openstack.common import jsonutils diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index 96c7d47c716a..c5897da125c9 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -16,7 +16,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index fd17d52daf3c..fbbf92eecea7 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -21,7 +21,7 @@ import signal import time import traceback -from nova import flags +from nova import config from nova.openstack.common.log import logging from nova import service from nova.tests.integrated import integrated_helpers diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index c4b99e3e5796..666ce6dab677 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -22,7 +22,6 @@ import mox from nova import config from nova import context from nova import db -from nova import flags from nova.network import linux_net from nova.openstack.common import fileutils from nova.openstack.common import importutils diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py index 3d8e4235c9dc..500cc95838f6 100644 --- a/nova/tests/network/test_rpcapi.py +++ b/nova/tests/network/test_rpcapi.py @@ -20,7 +20,6 @@ Unit Tests for nova.network.rpcapi from nova import config from nova import context -from nova import flags from nova.network import rpcapi as network_rpcapi from nova.openstack.common import rpc from nova import test diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py index 8b160f288a9c..84667eb9ec51 100644 --- a/nova/tests/scheduler/test_host_filters.py +++ b/nova/tests/scheduler/test_host_filters.py @@ -22,7 +22,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.scheduler import filters from nova.scheduler.filters import extra_specs_ops diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py index 605b0995ec9f..05a792a5363e 100644 --- a/nova/tests/scheduler/test_rpcapi.py +++ b/nova/tests/scheduler/test_rpcapi.py @@ -20,7 +20,6 @@ Unit Tests for nova.scheduler.rpcapi from nova import config from nova import context -from nova import flags from nova.openstack.common import rpc from nova.scheduler import rpcapi as scheduler_rpcapi from nova import test diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py index 5fa3fbacdfd5..76d438f2eea6 100644 --- a/nova/tests/scheduler/test_scheduler.py +++ b/nova/tests/scheduler/test_scheduler.py @@ -26,10 +26,10 @@ from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi from nova.compute import utils as compute_utils from nova.compute import vm_states +from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import rpc from nova.openstack.common import timeutils diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py index afb366624ba9..63630325bcae 100644 --- a/nova/tests/test_api.py +++ b/nova/tests/test_api.py @@ -36,9 +36,9 @@ from nova.api import ec2 from nova.api.ec2 import apirequest from nova.api.ec2 import ec2utils from nova import block_device +from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova import test from nova.tests import matchers diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py index c2602b1bd535..4973b3712f3d 100644 --- a/nova/tests/test_configdrive2.py +++ b/nova/tests/test_configdrive2.py @@ -22,7 +22,7 @@ import tempfile from nova import test -from nova import flags +from nova import config from nova.openstack.common import log from nova import utils from nova.virt import configdrive diff --git a/nova/tests/test_crypto.py b/nova/tests/test_crypto.py index d11b49b3fb60..78fa420aa688 100644 --- a/nova/tests/test_crypto.py +++ b/nova/tests/test_crypto.py @@ -20,10 +20,10 @@ import os import mox +from nova import config from nova import crypto from nova import db from nova import exception -from nova import flags from nova import test from nova import utils diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 92eae023aa9b..0bbb410c0a8c 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -26,7 +26,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova import test from nova.tests import matchers diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py index a266c7097aa1..b832c95a482f 100644 --- a/nova/tests/test_flags.py +++ b/nova/tests/test_flags.py @@ -18,7 +18,6 @@ # under the License. from nova import config -from nova import flags from nova.openstack.common import cfg from nova import test diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index a310cbb97637..dab5d027d64b 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -29,7 +29,6 @@ from nova.compute import power_state from nova import config from nova import context from nova import db -from nova import flags from nova.image import glance from nova.tests import fake_network from nova.tests.hyperv import basetestcase diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py index 324b90981ab7..224127f54bcd 100644 --- a/nova/tests/test_imagebackend.py +++ b/nova/tests/test_imagebackend.py @@ -18,7 +18,6 @@ import os from nova import config -from nova import flags from nova.openstack.common import fileutils from nova import test from nova.tests import fake_libvirt_utils diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index ee30386c469e..3a1b40c4f88d 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -29,7 +29,6 @@ from nova.compute import manager as compute_manager from nova.compute import vm_states from nova import config from nova import db -from nova import flags from nova.openstack.common import importutils from nova.openstack.common import log from nova import utils diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py index a528635206c3..deb1656827e1 100644 --- a/nova/tests/test_instance_types.py +++ b/nova/tests/test_instance_types.py @@ -18,12 +18,12 @@ Unit Tests for instance types code import time from nova.compute import instance_types +from nova import config 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.openstack.common import log as logging from nova import test diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index f52b7cbe1740..1700c32740e4 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -37,7 +37,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import fileutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils diff --git a/nova/tests/test_libvirt_vif.py b/nova/tests/test_libvirt_vif.py index d67f47f5995a..af1c657a701c 100644 --- a/nova/tests/test_libvirt_vif.py +++ b/nova/tests/test_libvirt_vif.py @@ -17,7 +17,6 @@ from lxml import etree from nova import config -from nova import flags from nova import test from nova import utils from nova.virt.libvirt import config as vconfig diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 4f2e70abfa4a..a68ac40fd3e2 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -32,7 +32,6 @@ from nova import config from nova import db from nova.db.sqlalchemy import api from nova import exception -from nova import flags from nova.network import api as network_api from nova import test from nova.tests import fake_network diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index d272a8bbd53c..21f869d5e618 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -22,9 +22,9 @@ import copy from nova.compute import instance_types from nova.compute import task_states from nova.compute import vm_states +from nova import config from nova import context from nova import db -from nova import flags from nova.network import api as network_api from nova import notifications from nova.openstack.common import log as logging diff --git a/nova/tests/test_objectstore.py b/nova/tests/test_objectstore.py index d077b605fed3..3b148b509bf7 100644 --- a/nova/tests/test_objectstore.py +++ b/nova/tests/test_objectstore.py @@ -29,7 +29,6 @@ from boto import exception as boto_exception from boto.s3 import connection as s3 from nova import config -from nova import flags from nova.objectstore import s3server from nova import test from nova import wsgi diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py index 3baa91e6f580..62c97db2fe03 100644 --- a/nova/tests/test_pipelib.py +++ b/nova/tests/test_pipelib.py @@ -17,7 +17,6 @@ from nova.cloudpipe import pipelib from nova import config from nova import context from nova import crypto -from nova import flags from nova import test from nova import utils diff --git a/nova/tests/test_policy.py b/nova/tests/test_policy.py index 7bd6e9434bf0..531dd97f341c 100644 --- a/nova/tests/test_policy.py +++ b/nova/tests/test_policy.py @@ -21,9 +21,9 @@ import os.path import StringIO import urllib2 +from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import policy as common_policy from nova import policy from nova import test diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py index 50de428b8e61..e640d7f01998 100644 --- a/nova/tests/test_powervm.py +++ b/nova/tests/test_powervm.py @@ -18,9 +18,9 @@ Test suite for PowerVMDriver. """ +from nova import config from nova import context from nova import db -from nova import flags from nova import test from nova.compute import power_state diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index cf491c57cea4..bfcc03b0fa20 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -26,7 +26,6 @@ from nova import db from nova.db.sqlalchemy import api as sqa_api from nova.db.sqlalchemy import models as sqa_models from nova import exception -from nova import flags from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import quota diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index ec7d0333bc65..a1a28d05a4d1 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -27,7 +27,6 @@ from nova import config 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 service diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index 68e6a6a76ca9..ed38de8c782a 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -29,7 +29,6 @@ import mox import nova from nova import config from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova import test from nova import utils diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py index e402972049e5..67c52ed3d0f1 100644 --- a/nova/tests/test_virt.py +++ b/nova/tests/test_virt.py @@ -17,8 +17,8 @@ import os +from nova import config from nova import exception -from nova import flags from nova import test from nova import tests from nova import utils diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py index 81689a1e591e..d6bce87f35ea 100644 --- a/nova/tests/test_vmwareapi.py +++ b/nova/tests/test_vmwareapi.py @@ -20,10 +20,10 @@ Test suite for VMWareAPI. """ from nova.compute import power_state +from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova import test import nova.tests.image.fake from nova.tests.vmwareapi import db_fakes diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 50ed9cd2a29e..b188b47b42b3 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -33,7 +33,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import importutils from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/tests/utils.py b/nova/tests/utils.py index 98342ae3dd80..d780edc6f442 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -19,7 +19,6 @@ import platform import nova.config import nova.context import nova.db -import nova.flags from nova.image import glance CONF = nova.config.CONF diff --git a/nova/utils.py b/nova/utils.py index 7ee58bdd8651..38fdc6f0f9a4 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -48,7 +48,6 @@ import netaddr from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils diff --git a/nova/virt/baremetal/db/sqlalchemy/migration.py b/nova/virt/baremetal/db/sqlalchemy/migration.py index 929793e70d68..d91024a5e81a 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migration.py +++ b/nova/virt/baremetal/db/sqlalchemy/migration.py @@ -22,6 +22,7 @@ from migrate.versioning import util as migrate_util import os import sqlalchemy +from nova import config from nova import exception from nova.openstack.common import log as logging from nova.virt.baremetal.db import migration diff --git a/nova/virt/baremetal/dom.py b/nova/virt/baremetal/dom.py index aef648eb0833..48a1eaeeb66d 100644 --- a/nova/virt/baremetal/dom.py +++ b/nova/virt/baremetal/dom.py @@ -15,8 +15,8 @@ # under the License. from nova.compute import power_state +from nova import config from nova import exception -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt.baremetal import nodes diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py index 4e63d35ede42..4d9874e7e9cc 100644 --- a/nova/virt/baremetal/driver.py +++ b/nova/virt/baremetal/driver.py @@ -39,7 +39,6 @@ from nova.compute import vm_states from nova import config from nova import context as nova_context from nova import exception -from nova import flags from nova import notifications from nova.openstack.common import cfg from nova.openstack.common import fileutils diff --git a/nova/virt/baremetal/nodes.py b/nova/virt/baremetal/nodes.py index d4bd90100f93..aa817fdf974c 100644 --- a/nova/virt/baremetal/nodes.py +++ b/nova/virt/baremetal/nodes.py @@ -17,7 +17,6 @@ from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.virt.baremetal import fake from nova.virt.baremetal import tilera diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py index c0343bac4e98..e79bc6fb2145 100644 --- a/nova/virt/baremetal/tilera.py +++ b/nova/virt/baremetal/tilera.py @@ -28,7 +28,6 @@ import time from nova.compute import power_state from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index 8d7046e18502..fda9f201fcc8 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -23,7 +23,6 @@ import tempfile from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import log as logging diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 1c8f15628aba..e34ca58b574c 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -34,7 +34,6 @@ if os.name != 'nt': from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/virt/disk/mount/nbd.py b/nova/virt/disk/mount/nbd.py index b374ccacc387..a6eb77199cac 100644 --- a/nova/virt/disk/mount/nbd.py +++ b/nova/virt/disk/mount/nbd.py @@ -19,7 +19,6 @@ import os import time from nova import config -from nova import flags from nova.openstack.common import cfg from nova import utils from nova.virt.disk.mount import api diff --git a/nova/virt/driver.py b/nova/virt/driver.py index d5edcffed37b..12f19bf3beac 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -22,7 +22,7 @@ Driver base-classes: types that support that contract """ -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 808c3302bf8b..7c6e95bebcce 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -19,7 +19,6 @@ from nova import config from nova import context -from nova import flags from nova import network from nova.network import linux_net from nova.openstack.common import cfg diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py index 1bd6ab05f417..1fb0d14bba7a 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -23,7 +23,6 @@ import sys from nova import config from nova import exception -from nova import flags from nova.openstack.common import excutils from nova.openstack.common import log as logging from nova.virt.hyperv import baseops diff --git a/nova/virt/hyperv/snapshotops.py b/nova/virt/hyperv/snapshotops.py index 65b123932aae..39ba25b304a2 100644 --- a/nova/virt/hyperv/snapshotops.py +++ b/nova/virt/hyperv/snapshotops.py @@ -24,7 +24,6 @@ import sys from nova import config from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import log as logging from nova.virt.hyperv import baseops diff --git a/nova/virt/hyperv/volumeops.py b/nova/virt/hyperv/volumeops.py index d2726f871347..39bdc5497de3 100644 --- a/nova/virt/hyperv/volumeops.py +++ b/nova/virt/hyperv/volumeops.py @@ -22,7 +22,6 @@ import time from nova import block_device from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.virt import driver diff --git a/nova/virt/hyperv/volumeutils.py b/nova/virt/hyperv/volumeutils.py index b4ec7dc7dd94..7146666204db 100644 --- a/nova/virt/hyperv/volumeutils.py +++ b/nova/virt/hyperv/volumeutils.py @@ -26,7 +26,6 @@ import time from nova import block_device from nova import config -from nova import flags from nova.openstack.common import log as logging from nova.virt import driver from nova.virt.hyperv import vmutils diff --git a/nova/virt/images.py b/nova/virt/images.py index f0ed3ba68486..bc6b21a7b5e2 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -26,7 +26,6 @@ import re from nova import config from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c6c4ddee6c3c..88452f2309b4 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -62,7 +62,6 @@ from nova.compute import vm_mode from nova import config from nova import context as nova_context from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import cfg from nova.openstack.common import excutils diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py index 825a033c7a3b..2e73661f6ccf 100644 --- a/nova/virt/libvirt/firewall.py +++ b/nova/virt/libvirt/firewall.py @@ -21,7 +21,6 @@ from eventlet import tpool from nova import config -from nova import flags from nova.openstack.common import log as logging import nova.virt.firewall as base_firewall diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 7152e3e2d00d..18a8aa910d43 100644 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -20,7 +20,6 @@ import contextlib import os from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import fileutils diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index 9613099299db..7930444778a0 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -30,7 +30,6 @@ import time from nova.compute import task_states from nova.compute import vm_states from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index 3a307c8e4fd1..9bda95b4477b 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -28,7 +28,6 @@ from lxml import etree from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import fileutils from nova.openstack.common import jsonutils diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index f0228de92231..feb6e456ae3d 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -21,7 +21,6 @@ from nova import config from nova import exception -from nova import flags from nova.network import linux_net from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 66ffc2efa946..b9b88ce2195d 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -22,7 +22,6 @@ import time from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import lockutils from nova.openstack.common import log as logging diff --git a/nova/virt/libvirt/volume_nfs.py b/nova/virt/libvirt/volume_nfs.py index 5dec74e3d462..b952baffa246 100644 --- a/nova/virt/libvirt/volume_nfs.py +++ b/nova/virt/libvirt/volume_nfs.py @@ -22,7 +22,6 @@ import os from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index 484cb3db368a..8caacbc7db1c 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -24,7 +24,6 @@ import netaddr from nova import config -from nova import flags CONF = config.CONF CONF.import_opt('injected_network_template', 'nova.virt.disk.api') diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index eea6e482dd29..8bed966d60b4 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -19,7 +19,6 @@ from nova.compute import vm_states from nova import config from nova import context as nova_context -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/powervm/operator.py b/nova/virt/powervm/operator.py index 6ed7535a7242..59b83af04583 100644 --- a/nova/virt/powervm/operator.py +++ b/nova/virt/powervm/operator.py @@ -22,7 +22,6 @@ import time from nova import config from nova import exception as nova_exception -from nova import flags from nova import utils from nova.compute import power_state diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 9a8d350d900d..f0673cba2013 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -38,7 +38,6 @@ from eventlet import event from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py index d8840938d5db..a20863d8c762 100644 --- a/nova/virt/vmwareapi/read_write_util.py +++ b/nova/virt/vmwareapi/read_write_util.py @@ -27,7 +27,7 @@ import urllib import urllib2 import urlparse -from nova import flags +from nova import config from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py index c98bde68cfd0..ad7c5d536cc8 100644 --- a/nova/virt/vmwareapi/vif.py +++ b/nova/virt/vmwareapi/vif.py @@ -19,7 +19,6 @@ from nova import config from nova import exception -from nova import flags from nova.openstack.common import log as logging from nova.virt import vif from nova.virt.vmwareapi import network_utils diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py index a03df88e48a0..2894074d6f40 100644 --- a/nova/virt/vmwareapi/vim.py +++ b/nova/virt/vmwareapi/vim.py @@ -27,7 +27,6 @@ except ImportError: suds = None from nova import config -from nova import flags from nova.openstack.common import cfg from nova.virt.vmwareapi import error_util diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py index ab1eda134176..4cb5b9af68ca 100644 --- a/nova/virt/vmwareapi/vmops.py +++ b/nova/virt/vmwareapi/vmops.py @@ -29,7 +29,6 @@ import uuid from nova.compute import power_state from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index dac6061a918f..bf1ea958d4aa 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -22,7 +22,6 @@ import time import uuid from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index ae6c7deb47c9..edff6934c0d7 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -49,7 +49,6 @@ from eventlet import timeout from nova import config from nova import context from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.virt import driver diff --git a/nova/virt/xenapi/firewall.py b/nova/virt/xenapi/firewall.py index 2ecadda4e130..48f340e99363 100644 --- a/nova/virt/xenapi/firewall.py +++ b/nova/virt/xenapi/firewall.py @@ -17,8 +17,8 @@ # License for the specific language governing permissions and limitations # under the License. +from nova import config from nova import context -from nova import flags from nova.openstack.common import jsonutils from nova.openstack.common import log as logging from nova.virt import firewall diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index e236528fe1bd..fe91a762ade8 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -24,7 +24,6 @@ import urlparse from nova.compute import rpcapi as compute_rpcapi from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py index 13dc74ba96ad..e0b7f8e07b74 100644 --- a/nova/virt/xenapi/vif.py +++ b/nova/virt/xenapi/vif.py @@ -20,7 +20,6 @@ """VIF drivers for XenAPI.""" from nova import config -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.virt import vif diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 61d59d83b579..5bf4e1148cb4 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -39,7 +39,6 @@ from nova.compute import instance_types from nova.compute import power_state from nova import config from nova import exception -from nova import flags from nova.image import glance from nova.openstack.common import cfg from nova.openstack.common import excutils diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index cdfa3685fd61..cbbd15e1a424 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -33,7 +33,6 @@ from nova.compute import vm_states from nova import config from nova import context as nova_context from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index 99976e0e619d..1ca3ea21f7d0 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -23,7 +23,6 @@ import re import string from nova import config -from nova import flags from nova.openstack.common import log as logging diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index 29ef4f2483f2..ffc93abcdb87 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -19,7 +19,6 @@ """Module for VNC Proxying.""" from nova import config -from nova import flags from nova.openstack.common import cfg diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index e3a1595d185c..947b91d11c30 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -29,7 +29,6 @@ import eventlet.wsgi from nova import config from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import version diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index 1eedd199d3fb..cc7dcf4d9d82 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -19,7 +19,6 @@ # Importing full names to not pollute the namespace and cause possible # collisions with use of 'from nova.volume import ' elsewhere. import nova.config -import nova.flags import nova.openstack.common.importutils diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index 45a2b1693efb..67e303e01991 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -27,7 +27,6 @@ from cinderclient.v1 import client as cinder_client from nova import config from nova.db import base from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/wsgi.py b/nova/wsgi.py index b8880dfde37f..18c28b87b2b2 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -32,7 +32,6 @@ import webob.exc from nova import config from nova import exception -from nova import flags from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/tools/xenserver/destroy_cached_images.py b/tools/xenserver/destroy_cached_images.py index 01d68b4f658c..88f24f4eff96 100644 --- a/tools/xenserver/destroy_cached_images.py +++ b/tools/xenserver/destroy_cached_images.py @@ -26,7 +26,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')): sys.path.insert(0, POSSIBLE_TOPDIR) from nova import config -from nova import flags +from nova import config from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova import utils diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index 10f9c1ffecf6..89fc454b1921 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -31,7 +31,6 @@ from nova import config from nova import context from nova import db from nova import exception -from nova import flags from nova.openstack.common import timeutils from nova.virt.xenapi import driver as xenapi_driver