Use oslo.log

Convert the use of the incubated version of the log module
to the new oslo.log library.

Sync oslo-incubator modules to update their imports as well.

Co-Authored-By: Doug Hellmann <doug@doughellmann.com>
Change-Id: Ic4932e3f58191869c30bd07a010a6e9fdcb2a12c

nova/api/auth.py

@@ -17,14 +17,14 @@
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_middleware import request_id
 from oslo_serialization import jsonutils
 import webob.dec
 import webob.exc
 
 from nova import context
 from nova.i18n import _
-from nova.openstack.common import log as logging
 from nova import wsgi
 
 

nova/api/ec2/__init__.py

@@ -22,6 +22,7 @@
 
 from oslo_config import cfg
 from oslo_context import context as common_context
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import netutils
@@ -42,7 +43,6 @@
 from nova.i18n import _LE
 from nova.i18n import _LI
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova import wsgi
 

nova/api/ec2/apirequest.py

@@ -23,12 +23,12 @@
 from xml.dom import minidom
 
 from lxml import etree
+from oslo_log import log as logging
 from oslo_utils import encodeutils
 import six
 
 from nova.api.ec2 import ec2utils
 from nova import exception
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/api/ec2/cloud.py

@@ -24,6 +24,7 @@
 import time
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from nova.api.ec2 import ec2utils
@@ -46,7 +47,6 @@
 from nova.network.security_group import neutron_driver
 from nova.network.security_group import openstack_driver
 from nova import objects
-from nova.openstack.common import log as logging
 from nova import quota
 from nova import servicegroup
 from nova import utils

nova/api/ec2/ec2utils.py

@@ -17,6 +17,7 @@
 import functools
 import re
 
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from nova import context
@@ -26,7 +27,6 @@
 from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova.openstack.common import uuidutils
 

nova/api/ec2/faults.py

@@ -11,12 +11,12 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import webob.dec
 import webob.exc
 
 import nova.api.ec2
 from nova import context
-from nova.openstack.common import log as logging
 from nova import utils
 
 CONF = cfg.CONF

nova/api/metadata/base.py

@@ -21,6 +21,7 @@
 import posixpath
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
@@ -34,7 +35,6 @@
 from nova import network
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt import netutils
 

nova/api/metadata/handler.py

@@ -20,6 +20,7 @@
 import os
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import six
 import webob.dec
 import webob.exc
@@ -30,7 +31,6 @@
 from nova.i18n import _
 from nova.i18n import _LE
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 from nova import utils
 from nova import wsgi

nova/api/metadata/vendordata_json.py

@@ -18,11 +18,11 @@
 import errno
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 
 from nova.api.metadata import base
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 
 file_opt = cfg.StrOpt('vendordata_jsonfile_path',
                       help='File to load JSON formatted vendor data from')

nova/api/openstack/__init__.py

@@ -19,6 +19,7 @@
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import routes
 import stevedore
 import webob.dec
@@ -34,7 +35,6 @@
 from nova.i18n import _LW
 from nova.i18n import translate
 from nova import notifications
-from nova.openstack.common import log as logging
 from nova import utils
 from nova import wsgi as base_wsgi
 

nova/api/openstack/common.py

@@ -20,6 +20,7 @@
 import re
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc
@@ -31,7 +32,6 @@
 from nova.i18n import _
 from nova.i18n import _LE
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova import quota
 
 osapi_opts = [

nova/api/openstack/compute/contrib/__init__.py

@@ -20,9 +20,9 @@
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.api.openstack import extensions
-from nova.openstack.common import log as logging
 
 ext_opts = [
     cfg.ListOpt('osapi_compute_ext_list',

nova/api/openstack/compute/contrib/admin_actions.py

@@ -15,6 +15,7 @@
 import os.path
 import traceback
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import six
 import webob
@@ -28,7 +29,6 @@
 from nova import exception
 from nova.i18n import _
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/api/openstack/compute/contrib/assisted_volume_snapshots.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 import webob
@@ -21,7 +22,6 @@
 from nova import compute
 from nova import exception
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/attach_interfaces.py

@@ -16,6 +16,7 @@
 """The instance interfaces extension."""
 
 import netaddr
+from oslo_log import log as logging
 import six
 import webob
 from webob import exc
@@ -27,7 +28,6 @@
 from nova.i18n import _
 from nova.i18n import _LI
 from nova import network
-from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/baremetal_nodes.py

@@ -16,13 +16,13 @@
 """The bare-metal admin extension with Ironic Proxy."""
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import importutils
 import webob
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.i18n import _
-from nova.openstack.common import log as logging
 
 ironic_client = importutils.try_import('ironicclient.client')
 

nova/api/openstack/compute/contrib/floating_ips.py

@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob
 
 from nova.api.openstack import common
@@ -26,7 +27,6 @@
 from nova.i18n import _
 from nova.i18n import _LW
 from nova import network
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 
 

nova/api/openstack/compute/contrib/hosts.py

@@ -15,6 +15,7 @@
 
 """The hosts admin extension."""
 
+from oslo_log import log as logging
 import webob.exc
 
 from nova.api.openstack import extensions
@@ -23,7 +24,6 @@
 from nova.i18n import _
 from nova.i18n import _LI
 from nova import objects
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'hosts')

nova/api/openstack/compute/contrib/multinic.py

@@ -15,6 +15,7 @@
 
 """The multinic extension."""
 
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -25,7 +26,6 @@
 from nova import exception
 from nova.i18n import _
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/os_tenant_networks.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 import netaddr
 import netaddr.core as netexc
 from oslo_config import cfg
+from oslo_log import log as logging
 import six
 import webob
 from webob import exc
@@ -27,7 +27,6 @@
 from nova.i18n import _
 from nova.i18n import _LE
 import nova.network
-from nova.openstack.common import log as logging
 from nova import quota
 
 

nova/api/openstack/compute/contrib/security_groups.py

@@ -19,6 +19,7 @@
 import contextlib
 from xml.dom import minidom
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 import webob
@@ -31,7 +32,6 @@
 from nova import exception
 from nova.i18n import _
 from nova.network.security_group import openstack_driver
-from nova.openstack.common import log as logging
 from nova.virt import netutils
 
 

nova/api/openstack/compute/contrib/server_external_events.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob
 
 from nova.api.openstack import extensions
@@ -22,7 +23,6 @@
 from nova.i18n import _LI
 from nova import objects
 from nova.objects import external_event as external_event_obj
-from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/server_groups.py

@@ -15,6 +15,7 @@
 
 """The Server Group API Extension."""
 
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -25,7 +26,6 @@
 from nova.i18n import _
 from nova.i18n import _LE
 from nova import objects
-from nova.openstack.common import log as logging
 from nova import utils
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/server_usage.py

@@ -12,10 +12,11 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from oslo_log import log as logging
+
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova import compute
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 authorize = extensions.soft_extension_authorizer('compute', 'server_usage')

nova/api/openstack/compute/contrib/volumes.py

@@ -15,6 +15,7 @@
 
 """The volumes extension."""
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import webob
 from webob import exc
@@ -27,7 +28,6 @@
 from nova.i18n import _
 from nova.i18n import _LI
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import volume
 

nova/api/openstack/compute/extensions.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.api.openstack import extensions as base_extensions
-from nova.openstack.common import log as logging
 
 ext_opts = [
     cfg.MultiStrOpt('osapi_compute_extension',