Remove unnecessary LOG initialisation
Remove a lot of getLogger lines and imports of logging in modules which never use that functionality. Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a
This commit is contained in:
parent
a993b2b969
commit
17ba935d9d
|
@ -23,10 +23,8 @@ import webob.exc
|
|||
|
||||
from nova.api.openstack import wsgi
|
||||
from nova import context
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import wsgi as base_wsgi
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('use_forwarded_for', 'nova.api.auth')
|
||||
|
||||
|
|
|
@ -33,9 +33,6 @@ from nova.api.openstack.compute import limits
|
|||
from nova.api.openstack.compute import server_metadata
|
||||
from nova.api.openstack.compute import servers
|
||||
from nova.api.openstack.compute import versions
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
allow_instance_snapshots_opt = cfg.BoolOpt('allow_instance_snapshots',
|
||||
default=True,
|
||||
|
|
|
@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'agents')
|
||||
|
||||
|
||||
|
|
|
@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import availability_zones
|
||||
from nova import db
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import servicegroup
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
authorize_list = extensions.extension_authorizer('compute',
|
||||
|
|
|
@ -21,10 +21,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt.baremetal import db
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'baremetal_nodes')
|
||||
|
||||
node_fields = ['id', 'cpus', 'local_gb', 'memory_mb', 'pm_address',
|
||||
|
|
|
@ -21,9 +21,7 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
import nova.cert.rpcapi
|
||||
from nova import network
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'certificates')
|
||||
|
||||
|
||||
|
|
|
@ -27,12 +27,10 @@ from nova import db
|
|||
from nova import exception
|
||||
from nova import network
|
||||
from nova.openstack.common import fileutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import utils
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'cloudpipe')
|
||||
|
||||
|
||||
|
|
|
@ -20,9 +20,7 @@ import webob.exc
|
|||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
from nova import db
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'cloudpipe_update')
|
||||
|
||||
|
||||
|
|
|
@ -23,10 +23,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'console_output')
|
||||
|
||||
|
||||
|
|
|
@ -20,10 +20,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'consoles')
|
||||
|
||||
|
||||
|
|
|
@ -22,10 +22,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'deferred_delete')
|
||||
|
||||
|
||||
|
|
|
@ -21,10 +21,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova import availability_zones
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import memorycache
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
# NOTE(vish): azs don't change that often, so cache them for an hour to
|
||||
# avoid hitting the db multiple times on every request.
|
||||
AZ_CACHE_SECONDS = 60 * 60
|
||||
|
|
|
@ -22,9 +22,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.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.soft_extension_authorizer('compute', 'extended_ips')
|
||||
|
||||
|
||||
|
|
|
@ -17,9 +17,7 @@
|
|||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.soft_extension_authorizer('compute',
|
||||
'extended_server_attributes')
|
||||
|
||||
|
|
|
@ -18,9 +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.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.soft_extension_authorizer('compute', 'extended_status')
|
||||
|
||||
|
||||
|
|
|
@ -19,9 +19,7 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova import network
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.soft_extension_authorizer('compute', 'extended_vif_net')
|
||||
|
||||
|
||||
|
|
|
@ -19,9 +19,7 @@ import webob.exc
|
|||
from nova.api.openstack import extensions
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'fixed_ips')
|
||||
|
||||
|
||||
|
|
|
@ -20,10 +20,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova.compute import instance_types
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'flavormanage')
|
||||
|
||||
|
||||
|
|
|
@ -23,11 +23,9 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import exception
|
||||
from nova import network
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import utils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'floating_ip_dns')
|
||||
|
||||
|
||||
|
|
|
@ -18,10 +18,8 @@ from nova.api.openstack import extensions
|
|||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova import network
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'floating_ip_pools')
|
||||
|
||||
|
||||
|
|
|
@ -26,10 +26,8 @@ from nova.api.openstack import common
|
|||
from nova.api.openstack import extensions
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import utils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'fping')
|
||||
authorize_all_tenants = extensions.extension_authorizer(
|
||||
'compute', 'fping:all_tenants')
|
||||
|
|
|
@ -20,7 +20,6 @@ from oslo.config import cfg
|
|||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.compute import vm_states
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
opts = [
|
||||
cfg.ListOpt('osapi_hide_server_address_states',
|
||||
|
@ -31,7 +30,6 @@ opts = [
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(opts)
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
authorize = extensions.soft_extension_authorizer('compute',
|
||||
'hide_server_addresses')
|
||||
|
|
|
@ -22,10 +22,8 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'hypervisors')
|
||||
|
||||
|
||||
|
|
|
@ -23,12 +23,10 @@ from nova.api.openstack import extensions as exts
|
|||
from nova.api.openstack import wsgi
|
||||
from nova import compute
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import utils
|
||||
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = exts.extension_authorizer('compute', 'rescue')
|
||||
|
||||
|
||||
|
|
|
@ -18,9 +18,6 @@ import webob.exc
|
|||
|
||||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
import nova.openstack.common.log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class SchedulerHintsController(wsgi.Controller):
|
||||
|
|
|
@ -30,11 +30,9 @@ from nova.compute import api as compute_api
|
|||
from nova import exception
|
||||
from nova.network.security_group import openstack_driver
|
||||
from nova.network.security_group import quantum_driver
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt import netutils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'security_groups')
|
||||
softauth = extensions.soft_extension_authorizer('compute', 'security_groups')
|
||||
|
||||
|
|
|
@ -23,11 +23,9 @@ from nova.api.openstack import xmlutil
|
|||
from nova import compute
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import utils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'services')
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('service_down_time', 'nova.service')
|
||||
|
|
|
@ -17,11 +17,9 @@
|
|||
from nova.api.openstack import extensions
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.api.openstack import xmlutil
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import quota
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
QUOTAS = quota.QUOTAS
|
||||
|
||||
|
||||
|
|
|
@ -21,10 +21,8 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import compute
|
||||
from nova import network
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
authorize = extensions.extension_authorizer('compute', 'virtual_interfaces')
|
||||
|
||||
|
||||
|
|
|
@ -21,12 +21,9 @@ from nova.api.openstack import wsgi
|
|||
from nova.api.openstack import xmlutil
|
||||
from nova import exception
|
||||
import nova.image.glance
|
||||
from nova.openstack.common import log as logging
|
||||
import nova.utils
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
SUPPORTED_FILTERS = {
|
||||
'name': 'name',
|
||||
'status': 'status',
|
||||
|
|
|
@ -22,9 +22,6 @@ 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.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def make_network(elem):
|
||||
|
|
|
@ -18,9 +18,6 @@
|
|||
import itertools
|
||||
|
||||
from nova.api.openstack import common
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ViewBuilder(common.ViewBuilder):
|
||||
|
|
|
@ -20,7 +20,6 @@ import re
|
|||
import urllib2
|
||||
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
_quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'
|
||||
|
@ -28,8 +27,6 @@ _option_header_piece_re = re.compile(r';\s*([^\s;=]+|%s)\s*'
|
|||
r'(?:=\s*([^;]+|%s))?\s*' %
|
||||
(_quoted_string_re, _quoted_string_re))
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def unquote_header_value(value):
|
||||
"""Unquotes a header value.
|
||||
|
|
|
@ -22,7 +22,6 @@ from oslo.config import cfg
|
|||
import webob.dec
|
||||
import webob.exc
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import wsgi
|
||||
|
||||
|
||||
|
@ -34,7 +33,6 @@ max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size',
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opt(max_request_body_size_opt)
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class LimitingReader(object):
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
from oslo.config import cfg
|
||||
|
||||
from nova import db
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
availability_zone_opts = [
|
||||
cfg.StrOpt('internal_service_availability_zone',
|
||||
|
@ -32,8 +31,6 @@ availability_zone_opts = [
|
|||
CONF = cfg.CONF
|
||||
CONF.register_opts(availability_zone_opts)
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def set_availability_zones(context, services):
|
||||
# Makes sure services isn't a sqlalchemy object
|
||||
|
|
|
@ -28,7 +28,6 @@ from nova import context
|
|||
from nova import exception
|
||||
from nova import manager
|
||||
from nova.openstack.common import importutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
|
||||
cell_manager_opts = [
|
||||
|
@ -45,8 +44,6 @@ cell_manager_opts = [
|
|||
]
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(cell_manager_opts, group='cells')
|
||||
|
||||
|
|
|
@ -26,10 +26,8 @@ from oslo.config import cfg
|
|||
|
||||
from nova import exception
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common.rpc import proxy as rpc_proxy
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('enable', 'nova.cells.opts', group='cells')
|
||||
|
|
|
@ -28,9 +28,6 @@ import base64
|
|||
|
||||
from nova import crypto
|
||||
from nova import manager
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class CertManager(manager.Manager):
|
||||
|
|
|
@ -25,9 +25,6 @@ from nova.compute import rpcapi as compute_rpcapi
|
|||
from nova.compute import vm_states
|
||||
from nova import exception
|
||||
from nova.openstack.common import excutils
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
check_instance_state = compute_api.check_instance_state
|
||||
|
|
|
@ -17,10 +17,6 @@
|
|||
from sqlalchemy import Boolean, Column, DateTime, BigInteger
|
||||
from sqlalchemy import MetaData, Integer, String, Table
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -14,11 +14,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from sqlalchemy import Column, String, MetaData, Table
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -14,10 +14,6 @@
|
|||
|
||||
from sqlalchemy import String, Column, MetaData, Table, delete, select
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -14,10 +14,6 @@
|
|||
|
||||
from sqlalchemy import String, Column, MetaData, Table, select
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
""" Remove availability_zone column from services model and replace with
|
||||
aggregate based zone."""
|
||||
|
|
|
@ -25,10 +25,6 @@ from sqlalchemy import String
|
|||
from sqlalchemy import Table
|
||||
from sqlalchemy import Text
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -17,9 +17,7 @@ from migrate.changeset import UniqueConstraint
|
|||
from sqlalchemy import Index, MetaData, Table
|
||||
|
||||
from nova.db.sqlalchemy import utils
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
OLD_IDX_NAME = 'key_pair_user_id_name_idx'
|
||||
UC_NAME = 'key_pairs_uniq_name_and_user_id'
|
||||
|
|
|
@ -16,10 +16,6 @@
|
|||
|
||||
from sqlalchemy import MetaData, Integer, String, Table, Column
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -22,7 +22,6 @@ import os
|
|||
from nova.db import migration
|
||||
from nova import exception
|
||||
from nova.openstack.common.db.sqlalchemy import session as db_session
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
import migrate
|
||||
|
@ -30,9 +29,6 @@ from migrate.versioning import util as migrate_util
|
|||
import sqlalchemy
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@migrate_util.decorator
|
||||
def patched_with_engine(f, *a, **kw):
|
||||
url = a[0]
|
||||
|
|
|
@ -17,10 +17,6 @@
|
|||
|
||||
from nova import db
|
||||
from nova import ipv6
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def get_ipam_lib(net_man):
|
||||
|
|
|
@ -27,11 +27,6 @@ will provide enhanced functionality and will be loadable via the
|
|||
security_group_handler flag.
|
||||
'''
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class SecurityGroupHandlerBase(object):
|
||||
|
||||
|
|
|
@ -18,9 +18,6 @@ Scheduler host filters
|
|||
"""
|
||||
|
||||
from nova import filters
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class BaseHostFilter(filters.BaseFilter):
|
||||
|
|
|
@ -19,10 +19,8 @@ Scheduler host weights
|
|||
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import weights
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
|
|
|
@ -64,7 +64,6 @@ CONF.import_opt('sqlite_db', 'nova.openstack.common.db.sqlalchemy.session')
|
|||
CONF.set_override('use_stderr', False)
|
||||
|
||||
logging.setup('nova')
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
_DB_CACHE = None
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ from nova.compute import utils as compute_utils
|
|||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import rpc
|
||||
from nova import test
|
||||
from nova.tests import fake_network
|
||||
|
@ -43,7 +42,6 @@ CONF = cfg.CONF
|
|||
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||
CONF.import_opt('default_instance_type', 'nova.compute.instance_types')
|
||||
CONF.import_opt('use_ipv6', 'nova.netconf')
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def get_fake_cache():
|
||||
|
|
|
@ -26,7 +26,6 @@ from nova.compute import utils as compute_utils
|
|||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import rpc
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import test
|
||||
|
@ -35,7 +34,6 @@ from nova.tests.image import fake
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class EC2ValidateTestCase(test.TestCase):
|
||||
|
|
|
@ -21,12 +21,10 @@ Tests For Compute admin api w/ Cells
|
|||
from nova.api.openstack.compute.contrib import admin_actions
|
||||
from nova.compute import cells_api as compute_cells_api
|
||||
from nova.compute import vm_states
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import uuidutils
|
||||
from nova import test
|
||||
from nova.tests.api.openstack import fakes
|
||||
|
||||
LOG = logging.getLogger('nova.tests.test_compute_cells')
|
||||
|
||||
INSTANCE_IDS = {'inst_id': 1}
|
||||
|
||||
|
|
|
@ -20,11 +20,9 @@ from webob import exc
|
|||
from nova.api.openstack.compute.contrib import aggregates
|
||||
from nova import context
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
from nova.tests import matchers
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
AGGREGATE_LIST = [
|
||||
{"name": "aggregate1", "id": "1", "availability_zone": "nova1"},
|
||||
{"name": "aggregate2", "id": "2", "availability_zone": "nova1"},
|
||||
|
|
|
@ -23,13 +23,10 @@ from nova.compute import vm_states
|
|||
from nova import context as context_maker
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
from nova.tests import fake_hosts
|
||||
from nova.tests import utils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def stub_service_get_all(context, disabled=None):
|
||||
return fake_hosts.SERVICES_LIST
|
||||
|
|
|
@ -16,13 +16,10 @@
|
|||
import webob
|
||||
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
from nova.tests.api.openstack import fakes
|
||||
import nova.tests.image.fake
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class UrlmapTest(test.TestCase):
|
||||
def setUp(self):
|
||||
|
|
|
@ -20,11 +20,8 @@
|
|||
import uuid
|
||||
|
||||
from nova.compute import claims
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class DummyTracker(object):
|
||||
icalled = False
|
||||
|
|
|
@ -25,13 +25,10 @@ from nova.compute import cells_api as compute_cells_api
|
|||
from nova import db
|
||||
from nova import exception
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import quota
|
||||
from nova.tests.compute import test_compute
|
||||
|
||||
|
||||
LOG = logging.getLogger('nova.tests.test_compute_cells')
|
||||
|
||||
ORIG_COMPUTE_API = None
|
||||
cfg.CONF.import_opt('enable', 'nova.cells.opts', group='cells')
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ from nova import exception
|
|||
from nova.image import glance
|
||||
from nova.network import api as network_api
|
||||
from nova.openstack.common import importutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common.notifier import api as notifier_api
|
||||
from nova.openstack.common.notifier import test_notifier
|
||||
from nova import test
|
||||
|
@ -37,7 +36,6 @@ from nova.tests import fake_instance_actions
|
|||
from nova.tests import fake_network
|
||||
import nova.tests.image.fake
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('compute_manager', 'nova.service')
|
||||
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||
|
|
|
@ -27,13 +27,10 @@ from nova.compute import task_states
|
|||
from nova.compute import vm_states
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import test
|
||||
from nova.virt import driver
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
FAKE_VIRT_MEMORY_MB = 5
|
||||
FAKE_VIRT_LOCAL_GB = 6
|
||||
|
|
|
@ -22,12 +22,9 @@ Tests for Consoleauth Code.
|
|||
|
||||
from nova.consoleauth import manager
|
||||
from nova import context
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
from nova import test
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ConsoleauthTestCase(test.TestCase):
|
||||
"""Test Case for consoleauth."""
|
||||
|
|
|
@ -17,12 +17,9 @@
|
|||
|
||||
from nova import exception
|
||||
from nova.network import model
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
from nova.tests import fake_network_cache_model
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class RouteTests(test.TestCase):
|
||||
def test_create_route_with_attrs(self):
|
||||
|
|
|
@ -22,12 +22,9 @@ import tempfile
|
|||
|
||||
from nova import test
|
||||
|
||||
from nova.openstack.common import log
|
||||
from nova import utils
|
||||
from nova.virt import configdrive
|
||||
|
||||
LOG = log.getLogger(__name__)
|
||||
|
||||
|
||||
class ConfigDriveTestCase(test.TestCase):
|
||||
|
||||
|
|
|
@ -39,8 +39,6 @@ CONF = cfg.CONF
|
|||
CONF.import_opt('compute_manager', 'nova.service')
|
||||
CONF.import_opt('host', 'nova.netconf')
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ImageCacheManagerTestCase(test.TestCase):
|
||||
|
||||
|
|
|
@ -23,11 +23,8 @@ from nova import db
|
|||
from nova.db.sqlalchemy import models
|
||||
from nova import exception
|
||||
from nova.openstack.common.db.sqlalchemy import session as sql_session
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class InstanceTypeTestCase(test.TestCase):
|
||||
"""Test cases for instance type code."""
|
||||
|
|
|
@ -17,11 +17,8 @@
|
|||
"""Test suite for IPv6."""
|
||||
|
||||
from nova import ipv6
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import test
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class IPv6RFC2462TestCase(test.TestCase):
|
||||
"""Unit tests for IPv6 rfc2462 backend operations."""
|
||||
|
|
|
@ -42,7 +42,6 @@ from nova import exception
|
|||
from nova.openstack.common import fileutils
|
||||
from nova.openstack.common import importutils
|
||||
from nova.openstack.common import jsonutils
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import uuidutils
|
||||
from nova import test
|
||||
from nova.tests import fake_libvirt_utils
|
||||
|
@ -77,7 +76,6 @@ CONF.import_opt('compute_manager', 'nova.service')
|
|||
CONF.import_opt('host', 'nova.netconf')
|
||||
CONF.import_opt('my_ip', 'nova.netconf')
|
||||
CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
_fake_network_info = fake_network.fake_get_instance_nw_info
|
||||
_fake_stub_out_get_nw_info = fake_network.stub_out_nw_api_get_instance_nw_info
|
||||
|
|
|
@ -28,7 +28,6 @@ from nova import context
|
|||
from nova import db
|
||||
from nova.network import api as network_api
|
||||
from nova import notifications
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common.notifier import api as notifier_api
|
||||
from nova.openstack.common.notifier import test_notifier
|
||||
from nova import test
|
||||
|
@ -36,7 +35,6 @@ from nova.tests import fake_network
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('compute_driver', 'nova.virt.driver')
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class NotificationsTestCase(test.TestCase):
|
||||
|
|
|
@ -28,7 +28,6 @@ from nova.compute import instance_types
|
|||
from nova.compute import power_state
|
||||
from nova.compute import task_states
|
||||
from nova.network import model as network_model
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.tests import fake_network_cache_model
|
||||
from nova.tests.image import fake
|
||||
from nova.virt import images
|
||||
|
@ -39,8 +38,6 @@ from nova.virt.powervm import exception
|
|||
from nova.virt.powervm import lpar
|
||||
from nova.virt.powervm import operator
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def fake_lpar(instance_name):
|
||||
return lpar.LPAR(name=instance_name,
|
||||
|
|
|
@ -29,14 +29,11 @@ import nova.context
|
|||
from nova.db.sqlalchemy import api as sqlalchemy_api
|
||||
from nova import exception
|
||||
from nova.openstack.common.db import exception as db_exc
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.openstack.common import timeutils
|
||||
from nova.openstack.common import uuidutils
|
||||
from nova.virt.baremetal.db.sqlalchemy import models
|
||||
from nova.virt.baremetal.db.sqlalchemy import session as db_session
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def model_query(context, *args, **kwargs):
|
||||
"""Query helper that accounts for context's `read_deleted` field.
|
||||
|
|
|
@ -18,10 +18,6 @@
|
|||
from sqlalchemy import Boolean, Column, DateTime
|
||||
from sqlalchemy import Index, Integer, MetaData, String, Table
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def upgrade(migrate_engine):
|
||||
meta = MetaData()
|
||||
|
|
|
@ -23,12 +23,9 @@ import os
|
|||
import sqlalchemy
|
||||
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt.baremetal.db import migration
|
||||
from nova.virt.baremetal.db.sqlalchemy import session
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@migrate_util.decorator
|
||||
def patched_with_engine(f, *a, **kw):
|
||||
|
|
|
@ -18,11 +18,6 @@
|
|||
#
|
||||
# Virtual power driver commands
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class vbox(object):
|
||||
"""set commands for basic Virtual Box control."""
|
||||
|
|
|
@ -22,10 +22,6 @@ import sys
|
|||
if sys.platform == 'win32':
|
||||
import wmi
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class HostUtils(object):
|
||||
def __init__(self):
|
||||
|
|
|
@ -26,12 +26,10 @@ import time
|
|||
from eventlet.green import subprocess
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
|
|
|
@ -28,11 +28,9 @@ if sys.platform == 'win32':
|
|||
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
|
|
|
@ -70,13 +70,10 @@ from oslo.config import cfg
|
|||
from nova import block_device
|
||||
from nova.compute import instance_types
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt import configdrive
|
||||
from nova.virt import driver
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
|
|
|
@ -20,12 +20,9 @@
|
|||
from oslo.config import cfg
|
||||
|
||||
from nova import exception
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt.vmwareapi import network_util
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
vmwareapi_vif_opts = [
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
from nova.virt.xenapi import network_utils
|
||||
from nova.virt.xenapi import vm_utils
|
||||
|
||||
|
@ -32,7 +31,6 @@ xenapi_ovs_integration_bridge_opt = cfg.StrOpt('xenapi_ovs_integration_bridge',
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opt(xenapi_ovs_integration_bridge_opt)
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class XenVIFDriver(object):
|
||||
|
|
Loading…
Reference in New Issue