diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-15 19:41:58 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-17 16:30:03 +0000 |
| commit | 6e92a67fc3e6dcd587e3fd225b7142bc74116e52 (patch) | |
| tree | 0c25405e1b7bd383c3801244645be8b76b408e40 | |
| parent | 0e932e6b2390ee8731134cfdb1dcdea3adfc8062 (diff) | |
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
206 files changed, 54 insertions, 230 deletions
diff --git a/nova/api/auth.py b/nova/api/auth.py index 1562aeede..167c897cf 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 1bf1f9f70..a4a52a22a 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 6cd7c4431..c3b2065b4 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 9d73673a4..a061931b0 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 997197d38..238bbecb9 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 331603a3a..fd2e46fcd 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 dc081d9a6..d74e0ad24 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 6fd8b1374..937938b40 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 14ec696cd..434d8deba 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 78064012b..4d680fa94 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 50ac76179..38247a55b 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 e6704951f..dc18a01a5 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 e6a1e9c4d..fc2943380 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 1bac0851d..3614d7ba1 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 c05a208a3..c53fdabd5 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 77d88144a..302ff7cf3 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 ac294f660..b972cf9b9 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 15f6456ea..06847c727 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 f7ccdcbff..55ff930f2 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 237872405..32582548c 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 7c98cb8d6..31a66b8fe 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 4537e1ec7..e7b7ac8a6 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 054eaf870..b76b54e8b 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 b86397694..ac5206a63 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 f6e9a63f6..c51faef1b 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 39792771c..c58a70d3c 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 c46a6b034..4805ba4e6 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 3bc817076..375bbc4d5 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 0c280618e..bdd0e0916 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 ec9759759..a01066d0e 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 d8d2f1c28..2c22ccc48 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 ec5fda64a..c5ccb02fd 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 d1d7d008f..228af7c8d 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 826c8b4a5..594369490 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 298e98603..b44ebefbb 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 1d22e74fc..95fa381ff 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 fa59fe325..bf923ecc0 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 d23a15450..0d0e795c7 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 f6ba11579..7665f544c 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 414954670..5a74f1f8b 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 5fb506fe0..0ddea69d8 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 a2f48494b..b4732844a 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 06e282dce..b401c4c4e 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 ae66d5f05..a10bf9951 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 c40067daa..3990b48b9 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 12a7f3fd3..6bcd85345 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 11253ea91..dbff115ff 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 c772101eb..9a3f03e5a 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 51d28cb04..822f401bc 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 ef7b40419..52c892378 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 51d6dc6ab..26463cd01 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 e1393e2ef..650edd42f 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 89c4cfcda..1ede7b05e 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 99254d35e..ce795b071 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 31c40234a..5f17f96f4 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 d002a941d..e4980e57b 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 9f9ccf797..f16b9d161 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 c092d966a..000000000 --- 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 0cbc91531..6e0a57773 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 d252baba0..e6ab8bb15 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 96e30e966..23a6a365f 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 100e0757c..8beae2732 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 221130a91..79955e1eb 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 <foo>' 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 526b969f6..049b8c7c0 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 6c16dbeb6..e937245e7 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 661c3ad56..15b6ca235 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 6b06a8f89..c57e9a730 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 456ab2fb1..66d26f960 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 35e77f63a..37b85fb66 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 b296715c2..4e6f5dbed 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 a5fac840c..3377a32ab 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 8c2438669..38692351e 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 e8a02f6f5..c0742b1ca 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 7153933ee..d43aef3c7 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 5b4ee916c..0975ca76f 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 9506635e9..dc4bc7031 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 4fda1cc39..730c466d9 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 358583b8a..77ee75c99 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 1b40bae62..3f04815a0 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 d1d16b80b..213953b18 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 17c7ebc22..b34e71526 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 85370dc2c..832a7c41a 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 4fd0488d9..1e0470b61 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 0c3ad3f08..109fbc06c 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 666f94f10..25572600f 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 9adb9f701..f0c117b32 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 a9f4f742f..cbdfc3aee 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 017466ff0..bdf2cbe7c 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 7c16713a4..0f15c66b8 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 fbc10d86d..25cba1c4d 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 f6337f035..9ede7dd17 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 0be17e47a..348816833 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 a08a63efc..07f7f6eec 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 78ffb62e6..c79fda910 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 7154d06bb..e9c0c0bc8 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 bff7773b1..457b8bd32 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 a90fa19c7..b2400bc51 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 3965fbbd7..a6624e88d 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 b9f57f8ce..e8c66962a 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 944594788..f5bce3184 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 1ee77c547..2540904ee 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 5baff7717..2a7e973ff 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 c0d097c7a..6fdeb0fec 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 0c5f029ba..a10ec208c 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 7bc5d65f3..319991bfa 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 d2c0d98da..4272b3011 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 15920d2fb..6b8d290c4 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 8282c4c19..fe7f03cd6 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 0fc748fde..16bb74801 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 c2f12b4a5..a5ac184ca 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 fe49e6c04..1ce2c960e 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 415313d9a..002f51010 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 82b7df74c..5f595e3a5 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 06f6e9ba7..1e514c13e 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 8f9358b41..0eb46616f 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 2355c604c..8d6a3c261 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 36e0d81dc..854c49c9f 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 451fc3d87..9d23021e3 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 3ef9ac459..53a5b20ae 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 82537560b..fac95cc62 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 7e4e83d7d..372fbd1df 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 ce8bb8a51..0df7491c5 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 a8d6ea3d3..5ff15b23b 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 8e9153893..428a79e3a 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 6ded0c5be..65191641d 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 4cbde5d39..50c6a55a8 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 b2953526f..58c03b167 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 62d49ad0a..933764427 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 96c7d47c7..c5897da12 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 fd17d52da..fbbf92eec 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 c4b99e3e5..666ce6dab 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 3d8e4235c..500cc9583 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 8b160f288..84667eb9e 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 605b0995e..05a792a53 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 5fa3fbacd..76d438f2e 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 afb366624..63630325b 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 c2602b1bd..4973b3712 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 d11b49b3f..78fa420aa 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 92eae023a..0bbb410c0 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 a266c7097..b832c95a4 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 a310cbb97..dab5d027d 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 324b90981..224127f54 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 ee30386c4..3a1b40c4f 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 a52863520..deb165682 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 f52b7cbe1..1700c3274 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 d67f47f59..af1c657a7 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 4f2e70abf..a68ac40fd 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 d272a8bbd..21f869d5e 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 d077b605f..3b148b509 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 3baa91e6f..62c97db2f 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 7bd6e9434..531dd97f3 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 50de428b8..e640d7f01 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 cf491c57c..bfcc03b0f 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 ec7d0333b..a1a28d05a 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 68e6a6a76..ed38de8c7 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 e40297204..67c52ed3d 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 81689a1e5..d6bce87f3 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 50ed9cd2a..b188b47b4 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 98342ae3d..d780edc6f 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 7ee58bdd8..38fdc6f0f 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 929793e70..d91024a5e 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 aef648eb0..48a1eaeeb 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 4e63d35ed..4d9874e7e 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 d4bd90100..aa817fdf9 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 c0343bac4..e79bc6fb2 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 8d7046e18..fda9f201f 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 1c8f15628..e34ca58b5 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 b374ccacc..a6eb77199 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 d5edcffed..12f19bf3b 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 808c3302b..7c6e95beb 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 1bd6ab05f..1fb0d14bb 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 65b123932..39ba25b30 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 d2726f871..39bdc5497 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 b4ec7dc7d..714666620 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 f0ed3ba68..bc6b21a7b 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 c6c4ddee6..88452f230 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 825a033c7..2e73661f6 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 7152e3e2d..18a8aa910 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 961309929..793044477 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 3a307c8e4..9bda95b44 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 f0228de92..feb6e456a 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 66ffc2efa..b9b88ce21 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 5dec74e3d..b952baffa 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 484cb3db3..8caacbc7d 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 eea6e482d..8bed966d6 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 6ed7535a7..59b83af04 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 9a8d350d9..f0673cba2 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 d8840938d..a20863d8c 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 c98bde68c..ad7c5d536 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 a03df88e4..2894074d6 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 ab1eda134..4cb5b9af6 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 dac6061a9..bf1ea958d 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 ae6c7deb4..edff6934c 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 2ecadda4e..48f340e99 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 e236528fe..fe91a762a 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 13dc74ba9..e0b7f8e07 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 61d59d83b..5bf4e1148 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 cdfa3685f..cbbd15e1a 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 99976e0e6..1ca3ea21f 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 29ef4f248..ffc93abcd 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 e3a1595d1..947b91d11 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 1eedd199d..cc7dcf4d9 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 <foo>' 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 45a2b1693..67e303e01 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 b8880dfde..18c28b87b 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 01d68b4f6..88f24f4ef 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 10f9c1ffe..89fc454b1 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 |