From d335457f48d09c3d780c92413fe777030c1335e2 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Thu, 28 Jun 2012 15:59:23 -0500 Subject: Switch to common logging. I only just moved logging from nova to common, so behavior should remain the same. Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb --- nova/api/auth.py | 2 +- nova/api/ec2/__init__.py | 2 +- nova/api/ec2/apirequest.py | 2 +- nova/api/ec2/cloud.py | 2 +- nova/api/ec2/ec2utils.py | 2 +- nova/api/metadata/base.py | 2 +- nova/api/metadata/handler.py | 2 +- nova/api/openstack/__init__.py | 2 +- nova/api/openstack/auth.py | 2 +- nova/api/openstack/common.py | 2 +- nova/api/openstack/compute/__init__.py | 2 +- nova/api/openstack/compute/contrib/__init__.py | 2 +- nova/api/openstack/compute/contrib/accounts.py | 2 +- nova/api/openstack/compute/contrib/admin_actions.py | 2 +- nova/api/openstack/compute/contrib/aggregates.py | 2 +- nova/api/openstack/compute/contrib/certificates.py | 2 +- nova/api/openstack/compute/contrib/cloudpipe.py | 2 +- nova/api/openstack/compute/contrib/console_output.py | 2 +- nova/api/openstack/compute/contrib/consoles.py | 2 +- nova/api/openstack/compute/contrib/deferred_delete.py | 2 +- nova/api/openstack/compute/contrib/extended_server_attributes.py | 2 +- nova/api/openstack/compute/contrib/extended_status.py | 2 +- nova/api/openstack/compute/contrib/flavormanage.py | 2 +- nova/api/openstack/compute/contrib/floating_ip_dns.py | 2 +- nova/api/openstack/compute/contrib/floating_ip_pools.py | 2 +- nova/api/openstack/compute/contrib/floating_ips.py | 2 +- nova/api/openstack/compute/contrib/hosts.py | 2 +- nova/api/openstack/compute/contrib/hypervisors.py | 2 +- nova/api/openstack/compute/contrib/multinic.py | 2 +- nova/api/openstack/compute/contrib/networks.py | 2 +- nova/api/openstack/compute/contrib/rescue.py | 2 +- nova/api/openstack/compute/contrib/scheduler_hints.py | 2 +- nova/api/openstack/compute/contrib/security_groups.py | 2 +- nova/api/openstack/compute/contrib/server_start_stop.py | 2 +- nova/api/openstack/compute/contrib/users.py | 2 +- nova/api/openstack/compute/contrib/virtual_interfaces.py | 2 +- nova/api/openstack/compute/contrib/volumes.py | 2 +- nova/api/openstack/compute/extensions.py | 2 +- nova/api/openstack/compute/images.py | 2 +- nova/api/openstack/compute/ips.py | 2 +- nova/api/openstack/compute/servers.py | 2 +- nova/api/openstack/compute/views/addresses.py | 2 +- nova/api/openstack/compute/views/servers.py | 2 +- nova/api/openstack/extensions.py | 2 +- nova/api/openstack/urlmap.py | 2 +- nova/api/openstack/volume/__init__.py | 2 +- nova/api/openstack/volume/contrib/__init__.py | 2 +- nova/api/openstack/volume/extensions.py | 2 +- nova/api/openstack/volume/snapshots.py | 2 +- nova/api/openstack/volume/volumes.py | 2 +- nova/api/openstack/wsgi.py | 2 +- nova/api/sizelimit.py | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) (limited to 'nova/api') diff --git a/nova/api/auth.py b/nova/api/auth.py index 72eba1d9c..d8b5342c6 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -23,8 +23,8 @@ import webob.exc from nova import context from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 6bb19e7b3..11fa9d6d5 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -34,10 +34,10 @@ from nova.api import validator from nova import context from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import cfg 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 timeutils from nova import utils from nova import wsgi diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index c76549562..70b1e3b80 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -27,7 +27,7 @@ from xml.dom import minidom from nova.api.ec2 import ec2utils from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 126df0f0a..c632d7ac2 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -37,9 +37,9 @@ from nova import db from nova import exception from nova import flags from nova.image import s3 -from nova import log as logging from nova import network from nova.openstack.common import excutils +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import quota from nova import utils diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 608628209..e1ea9c6d8 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -22,8 +22,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.network import model as network_model +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 582bdec82..ee6e28208 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -28,8 +28,8 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging from nova import volume FLAGS = flags.FLAGS diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py index 59a7d030e..d022cbc82 100644 --- a/nova/api/metadata/handler.py +++ b/nova/api/metadata/handler.py @@ -25,7 +25,7 @@ import webob.exc from nova.api.metadata import base from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 82e958a59..afeed0399 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -25,7 +25,7 @@ import webob.dec import webob.exc from nova.api.openstack import wsgi -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi as base_wsgi diff --git a/nova/api/openstack/auth.py b/nova/api/openstack/auth.py index 9e9e4d978..078d58639 100644 --- a/nova/api/openstack/auth.py +++ b/nova/api/openstack/auth.py @@ -23,7 +23,7 @@ import webob.exc from nova.api.openstack import wsgi from nova import context from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import wsgi as base_wsgi LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index b8e013f98..88c81a578 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -30,7 +30,7 @@ from nova.compute import utils as compute_utils from nova.compute import vm_states from nova import exception from nova import flags -from nova import log as logging +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 f52234cf1..081290b10 100644 --- a/nova/api/openstack/compute/__init__.py +++ b/nova/api/openstack/compute/__init__.py @@ -32,8 +32,8 @@ 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 flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py index 4d02ecf7e..d44254eb6 100644 --- a/nova/api/openstack/compute/contrib/__init__.py +++ b/nova/api/openstack/compute/contrib/__init__.py @@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems. from nova.api.openstack import extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/accounts.py b/nova/api/openstack/compute/contrib/accounts.py index 1498ed1c5..e407015c2 100644 --- a/nova/api/openstack/compute/contrib/accounts.py +++ b/nova/api/openstack/compute/contrib/accounts.py @@ -21,7 +21,7 @@ from nova.api.openstack import xmlutil from nova.auth import manager from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 72815ed00..8432f02fc 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -25,7 +25,7 @@ from nova import compute from nova.compute import vm_states from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py index aa10fe532..834131f92 100644 --- a/nova/api/openstack/compute/contrib/aggregates.py +++ b/nova/api/openstack/compute/contrib/aggregates.py @@ -20,7 +20,7 @@ from webob import exc from nova.api.openstack import extensions from nova.compute import api as compute_api from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'aggregates') diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index 554ff10d8..ccc6b84a2 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -21,8 +21,8 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil import nova.cert.rpcapi from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index 321123d76..a2faf833b 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -27,8 +27,8 @@ from nova.compute import vm_states from nova import db from nova import exception from nova import flags -from nova import log as logging from nova import network +from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import utils diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index fd1e9418c..7a16daec3 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -23,7 +23,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py index 915ca5c87..ef61d3966 100644 --- a/nova/api/openstack/compute/contrib/consoles.py +++ b/nova/api/openstack/compute/contrib/consoles.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py index 8ba23a663..8eaea04bb 100644 --- a/nova/api/openstack/compute/contrib/deferred_delete.py +++ b/nova/api/openstack/compute/contrib/deferred_delete.py @@ -22,7 +22,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/extended_server_attributes.py b/nova/api/openstack/compute/contrib/extended_server_attributes.py index 46d4df2d1..f1ec9b956 100644 --- a/nova/api/openstack/compute/contrib/extended_server_attributes.py +++ b/nova/api/openstack/compute/contrib/extended_server_attributes.py @@ -20,7 +20,7 @@ from nova.api.openstack import xmlutil from nova import compute from nova import db from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/extended_status.py b/nova/api/openstack/compute/contrib/extended_status.py index d17319c67..d88f4e14b 100644 --- a/nova/api/openstack/compute/contrib/extended_status.py +++ b/nova/api/openstack/compute/contrib/extended_status.py @@ -19,7 +19,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index 547760e94..4dedcf981 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.compute import instance_types from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py index a8a7a2a23..788d83b2d 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_dns.py +++ b/nova/api/openstack/compute/contrib/floating_ip_dns.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 import exception -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py index 7265d8611..216bc9091 100644 --- a/nova/api/openstack/compute/contrib/floating_ip_pools.py +++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py @@ -17,8 +17,8 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil -from nova import log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 0b7fa881e..ed5f61d53 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -25,8 +25,8 @@ from nova.api.openstack import xmlutil from nova import compute from nova.compute import utils as compute_utils from nova import exception -from nova import log as logging from nova import network +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 e24ef3605..95a80f3f6 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -26,7 +26,7 @@ from nova.compute import api as compute_api from nova import db from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py index 6686de5a9..084d87575 100644 --- a/nova/api/openstack/compute/contrib/hypervisors.py +++ b/nova/api/openstack/compute/contrib/hypervisors.py @@ -22,7 +22,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import db from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/multinic.py b/nova/api/openstack/compute/contrib/multinic.py index 02e87edf2..29409c050 100644 --- a/nova/api/openstack/compute/contrib/multinic.py +++ b/nova/api/openstack/compute/contrib/multinic.py @@ -22,7 +22,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index 20e481bc7..ece331fbb 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -22,8 +22,8 @@ from webob import exc from nova.api.openstack import extensions from nova import exception from nova import flags -from nova import log as logging import nova.network.api +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 7bf815a37..918f17100 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova import compute from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py index 9e0b3ea3a..86b7564bd 100644 --- a/nova/api/openstack/compute/contrib/scheduler_hints.py +++ b/nova/api/openstack/compute/contrib/scheduler_hints.py @@ -18,7 +18,7 @@ import webob.exc from nova.api.openstack import extensions from nova.api.openstack import wsgi -import nova.log as logging +import nova.openstack.common.log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 840813d68..004df4e73 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -29,8 +29,8 @@ from nova import compute from nova import db from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import excutils +from nova.openstack.common import log as logging from nova import utils diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py index ca905d496..049fa393b 100644 --- a/nova/api/openstack/compute/contrib/server_start_stop.py +++ b/nova/api/openstack/compute/contrib/server_start_stop.py @@ -20,7 +20,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import compute from nova import exception -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/users.py b/nova/api/openstack/compute/contrib/users.py index 8eb9b9c5b..12013f014 100644 --- a/nova/api/openstack/compute/contrib/users.py +++ b/nova/api/openstack/compute/contrib/users.py @@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil from nova.auth import manager from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/contrib/virtual_interfaces.py b/nova/api/openstack/compute/contrib/virtual_interfaces.py index e7c0a8735..f4f14dc82 100644 --- a/nova/api/openstack/compute/contrib/virtual_interfaces.py +++ b/nova/api/openstack/compute/contrib/virtual_interfaces.py @@ -20,8 +20,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 log as logging from nova import network +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index a51ba9229..6b04e3240 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -26,7 +26,7 @@ from nova.api.openstack import xmlutil from nova import compute from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume from nova.volume import volume_types diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py index b52e89ab5..cb5e89deb 100644 --- a/nova/api/openstack/compute/extensions.py +++ b/nova/api/openstack/compute/extensions.py @@ -17,7 +17,7 @@ from nova.api.openstack import extensions as base_extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index 35d21da60..1b20531de 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -22,7 +22,7 @@ from nova.api.openstack import xmlutil from nova import exception from nova import flags import nova.image.glance -from nova import log as logging +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 3afb206fa..6ad888fd7 100644 --- a/nova/api/openstack/compute/ips.py +++ b/nova/api/openstack/compute/ips.py @@ -23,7 +23,7 @@ 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 log as logging +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 5a8e1f645..ca87f3d4a 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -31,7 +31,7 @@ from nova import compute from nova.compute import instance_types from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common.rpc import common as rpc_common from nova.openstack.common import timeutils from nova import utils diff --git a/nova/api/openstack/compute/views/addresses.py b/nova/api/openstack/compute/views/addresses.py index 794feb5ba..41d1d0730 100644 --- a/nova/api/openstack/compute/views/addresses.py +++ b/nova/api/openstack/compute/views/addresses.py @@ -19,7 +19,7 @@ import itertools from nova.api.openstack import common from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py index b0c2fb2b2..9aaf96fe3 100644 --- a/nova/api/openstack/compute/views/servers.py +++ b/nova/api/openstack/compute/views/servers.py @@ -22,7 +22,7 @@ from nova.api.openstack import common from nova.api.openstack.compute.views import addresses as views_addresses from nova.api.openstack.compute.views import flavors as views_flavors from nova.api.openstack.compute.views import images as views_images -from nova import log as logging +from nova.openstack.common import log as logging from nova.openstack.common import timeutils diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py index 93accab93..be7304e6e 100644 --- a/nova/api/openstack/extensions.py +++ b/nova/api/openstack/extensions.py @@ -26,8 +26,8 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging from nova.openstack.common import importutils +from nova.openstack.common import log as logging import nova.policy diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py index 6f3c484ec..aa49226b3 100644 --- a/nova/api/openstack/urlmap.py +++ b/nova/api/openstack/urlmap.py @@ -20,7 +20,7 @@ import re import urllib2 from nova.api.openstack import wsgi -from nova import log as logging +from nova.openstack.common import log as logging _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"' diff --git a/nova/api/openstack/volume/__init__.py b/nova/api/openstack/volume/__init__.py index 0f529980f..3e6f731e1 100644 --- a/nova/api/openstack/volume/__init__.py +++ b/nova/api/openstack/volume/__init__.py @@ -26,7 +26,7 @@ from nova.api.openstack.volume import snapshots from nova.api.openstack.volume import types from nova.api.openstack.volume import versions from nova.api.openstack.volume import volumes -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/volume/contrib/__init__.py b/nova/api/openstack/volume/contrib/__init__.py index 1eba0b4df..8e01d88d0 100644 --- a/nova/api/openstack/volume/contrib/__init__.py +++ b/nova/api/openstack/volume/contrib/__init__.py @@ -23,7 +23,7 @@ It can't be called 'extensions' because that causes namespacing problems. from nova.api.openstack import extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging FLAGS = flags.FLAGS diff --git a/nova/api/openstack/volume/extensions.py b/nova/api/openstack/volume/extensions.py index fa7fc1a77..cf400bd9a 100644 --- a/nova/api/openstack/volume/extensions.py +++ b/nova/api/openstack/volume/extensions.py @@ -17,7 +17,7 @@ from nova.api.openstack import extensions as base_extensions from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py index 11681f6e8..209f78d13 100644 --- a/nova/api/openstack/volume/snapshots.py +++ b/nova/api/openstack/volume/snapshots.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume diff --git a/nova/api/openstack/volume/volumes.py b/nova/api/openstack/volume/volumes.py index 4c50a6d2e..1b0c8dfca 100644 --- a/nova/api/openstack/volume/volumes.py +++ b/nova/api/openstack/volume/volumes.py @@ -23,7 +23,7 @@ from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import exception from nova import flags -from nova import log as logging +from nova.openstack.common import log as logging from nova import volume from nova.volume import volume_types diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index 4f78a4697..fb25c5caa 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -25,8 +25,8 @@ from lxml import etree import webob from nova import exception -from nova import log as logging from nova.openstack.common import jsonutils +from nova.openstack.common import log as logging from nova import wsgi diff --git a/nova/api/sizelimit.py b/nova/api/sizelimit.py index a948a1e8a..6c991408d 100644 --- a/nova/api/sizelimit.py +++ b/nova/api/sizelimit.py @@ -22,8 +22,8 @@ import webob.dec import webob.exc from nova import flags -from nova import log as logging from nova.openstack.common import cfg +from nova.openstack.common import log as logging from nova import wsgi -- cgit