diff options
| author | Stanislaw Pitucha <stanislaw.pitucha@hp.com> | 2013-04-10 13:26:12 +0000 |
|---|---|---|
| committer | Stanislaw Pitucha <stanislaw.pitucha@hp.com> | 2013-04-10 13:26:12 +0000 |
| commit | 17ba935d9da2ff912196bb47f6856fb64db13247 (patch) | |
| tree | f55579924661c2413b374f4f0aaaddea8a9574e5 /nova/api | |
| parent | a993b2b969bad0785aad02dc2a6f04ac0c675f8d (diff) | |
| download | nova-17ba935d9da2ff912196bb47f6856fb64db13247.tar.gz nova-17ba935d9da2ff912196bb47f6856fb64db13247.tar.xz nova-17ba935d9da2ff912196bb47f6856fb64db13247.zip | |
Remove unnecessary LOG initialisation
Remove a lot of getLogger lines and imports of logging in modules
which never use that functionality.
Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a
Diffstat (limited to 'nova/api')
34 files changed, 0 insertions, 74 deletions
diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 67d77f5a6..1fab3e83d 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -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') diff --git a/nova/api/openstack/compute/__init__.py b/nova/api/openstack/compute/__init__.py index 6b05dcf5f..a46d51eaf 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -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, diff --git a/nova/api/openstack/compute/contrib/agents.py b/nova/api/openstack/compute/contrib/agents.py index 7756187f3..02e752dac 100644 --- a/nova/api/openstack/compute/contrib/agents.py +++ b/nova/api/openstack/compute/contrib/agents.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py index f5092010c..14602265b 100644 --- a/nova/api/openstack/compute/contrib/availability_zone.py +++ b/nova/api/openstack/compute/contrib/availability_zone.py @@ -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', diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py index 0f2d30935..b3f226039 100644 --- a/nova/api/openstack/compute/contrib/baremetal_nodes.py +++ b/nova/api/openstack/compute/contrib/baremetal_nodes.py @@ -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', diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index 2d8e8ad6d..64a6e26fe 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 01e6f8303..d1c906d64 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/cloudpipe_update.py b/nova/api/openstack/compute/contrib/cloudpipe_update.py index a096c7107..1e6cafe04 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe_update.py +++ b/nova/api/openstack/compute/contrib/cloudpipe_update.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index b3588d344..eb20b3275 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py index ade5261b2..bf1f41690 100644 --- a/nova/api/openstack/compute/contrib/consoles.py +++ b/nova/api/openstack/compute/contrib/consoles.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py index 30358b376..e4c2a29a4 100644 --- a/nova/api/openstack/compute/contrib/deferred_delete.py +++ b/nova/api/openstack/compute/contrib/deferred_delete.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/extended_availability_zone.py b/nova/api/openstack/compute/contrib/extended_availability_zone.py index a1ee85bcf..9eec055b1 100644 --- a/nova/api/openstack/compute/contrib/extended_availability_zone.py +++ b/nova/api/openstack/compute/contrib/extended_availability_zone.py @@ -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 diff --git a/nova/api/openstack/compute/contrib/extended_ips.py b/nova/api/openstack/compute/contrib/extended_ips.py index 0a3432a46..ac75293a6 100644 --- a/nova/api/openstack/compute/contrib/extended_ips.py +++ b/nova/api/openstack/compute/contrib/extended_ips.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py index 4f74f389d..a8b441f80 100644 --- a/nova/api/openstack/compute/contrib/extended_server_attributes.py +++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py index 930893b27..75086309a 100644 --- a/nova/api/openstack/compute/contrib/extended_status.py +++ b/nova/api/openstack/compute/contrib/extended_status.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py index d087472bb..8779d6879 100644 --- a/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py +++ b/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/fixed_ips.py b/nova/api/openstack/compute/contrib/fixed_ips.py index e88038f3f..8c7e4f7d3 100644 --- a/nova/api/openstack/compute/contrib/fixed_ips.py +++ b/nova/api/openstack/compute/contrib/fixed_ips.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 7cff7f4b8..ddf8aa5af 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py index 62eb0d08f..ecaa8e7b9 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_dns.py +++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py index 3361230dd..e792ce433 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_pools.py +++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py index e1a8dfb8c..0e6bb5ae5 100644 --- a/nova/api/openstack/compute/contrib/fping.py +++ b/nova/api/openstack/compute/contrib/fping.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/hide_server_addresses.py b/nova/api/openstack/compute/contrib/hide_server_addresses.py index 08e33ce53..cdd793218 100644 --- a/nova/api/openstack/compute/contrib/hide_server_addresses.py +++ b/nova/api/openstack/compute/contrib/hide_server_addresses.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py index 28cb0f291..26ef2c81b 100644 --- a/nova/api/openstack/compute/contrib/hypervisors.py +++ b/nova/api/openstack/compute/contrib/hypervisors.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 87d838bdf..c5fcd1442 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py index 637698b31..0775307f4 100644 --- a/nova/api/openstack/compute/contrib/scheduler_hints.py +++ b/nova/api/openstack/compute/contrib/scheduler_hints.py @@ -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): diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 700d9b71e..de5a9bd8e 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 5b382f892..d948c8bc5 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -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') diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py index df40fe91a..e00f0a9eb 100644 --- a/nova/api/openstack/compute/contrib/used_limits.py +++ b/nova/api/openstack/compute/contrib/used_limits.py @@ -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 diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py index 50c26d754..9b6ca3d60 100644 --- a/nova/api/openstack/compute/contrib/virtual_interfaces.py +++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py @@ -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') diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 3d54da0b5..4dba0a6c2 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -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', diff --git a/nova/api/openstack/compute/ips.py b/nova/api/openstack/compute/ips.py index ee917e65e..df4b9dabf 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -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): diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index fd9c3d25e..d46b6c661 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -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): diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py index d67b66c4d..e1b983352 100644 --- a/nova/api/openstack/urlmap.py +++ b/nova/api/openstack/urlmap.py @@ -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. diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index f1bf3cf1b..d7647ccc3 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.py @@ -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): |
