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

42 files changed, 43 insertions, 44 deletions

diff --git a/nova/api/auth.py b/nova/api/auth.py
index ae90a54465..33613e107b 100644
--- a/nova/api/auth.py
+++ b/nova/api/auth.py
@@ -17,6 +17,7 @@ Common Auth Middleware.
 """
 
 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
@@ -24,7 +25,6 @@ import webob.exc
 
 from nova import context
 from nova.i18n import _
-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 94a669f9bd..4e9b1a1b8d 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -22,6 +22,7 @@ import hashlib
 
 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 _
 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
 
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index c65dfcd994..3251a590f9 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -23,12 +23,12 @@ import datetime
 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__)
 
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 0c2899ca4b..037317ed1b 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -24,6 +24,7 @@ import base64
 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 import network
 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
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index a2c7a52c4e..03383f4eda 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/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.i18n import _LI
 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
 
diff --git a/nova/api/ec2/faults.py b/nova/api/ec2/faults.py
index 552e13f95b..c9ca2a4ecf 100644
--- a/nova/api/ec2/faults.py
+++ b/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
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 61160a74d4..86fed82ba8 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -21,6 +21,7 @@ import os
 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 context
 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
 
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 34ddfbdcb9..ff2e684bbc 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -20,6 +20,7 @@ import hmac
 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 import exception
 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
diff --git a/nova/api/metadata/vendordata_json.py b/nova/api/metadata/vendordata_json.py
index 765a23197d..f22496d2ac 100644
--- a/nova/api/metadata/vendordata_json.py
+++ b/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')
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 61267325c6..dd1f840220 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -19,6 +19,7 @@ WSGI middleware for OpenStack API controllers.
 """
 
 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 _LI
 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
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 3f58010504..9e77f6bca3 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -20,6 +20,7 @@ import os
 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 import exception
 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 = [
diff --git a/nova/api/openstack/compute/contrib/__init__.py b/nova/api/openstack/compute/contrib/__init__.py
index a604694055..d97057ef3c 100644
--- a/nova/api/openstack/compute/contrib/__init__.py
+++ b/nova/api/openstack/compute/contrib/__init__.py
@@ -20,9 +20,9 @@ It can't be called 'extensions' because that causes namespacing problems.
 """
 
 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',
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py
index 027bc54b8c..8a397d1b02 100644
--- a/nova/api/openstack/compute/contrib/admin_actions.py
+++ b/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.compute import vm_states
 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__)
 
diff --git a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py b/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py
index 2df4cd4e2a..73f965f13d 100644
--- a/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py
+++ b/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.api.openstack import wsgi
 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__)
diff --git a/nova/api/openstack/compute/contrib/attach_interfaces.py b/nova/api/openstack/compute/contrib/attach_interfaces.py
index b16d830b2a..4e9fb642e3 100644
--- a/nova/api/openstack/compute/contrib/attach_interfaces.py
+++ b/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 import exception
 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__)
diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py
index 1c1969b4ca..7377f6bc3a 100644
--- a/nova/api/openstack/compute/contrib/baremetal_nodes.py
+++ b/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')
 
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index 499cee42a8..a411b1a37d 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/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 import exception
 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
 
 
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 46a17728d5..47930eecc8 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/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 import exception
 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')
diff --git a/nova/api/openstack/compute/contrib/multinic.py b/nova/api/openstack/compute/contrib/multinic.py
index 0682e3d4ca..9e7af76800 100644
--- a/nova/api/openstack/compute/contrib/multinic.py
+++ b/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 compute
 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__)
diff --git a/nova/api/openstack/compute/contrib/os_tenant_networks.py b/nova/api/openstack/compute/contrib/os_tenant_networks.py
index 6d1e63a88d..ab1ef15324 100644
--- a/nova/api/openstack/compute/contrib/os_tenant_networks.py
+++ b/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 import exception
 from nova.i18n import _
 from nova.i18n import _LE
 import nova.network
-from nova.openstack.common import log as logging
 from nova import quota
 
 
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 04ed6f86fd..a00f63bdde 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/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 compute
 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
 
 
diff --git a/nova/api/openstack/compute/contrib/server_external_events.py b/nova/api/openstack/compute/contrib/server_external_events.py
index d6b4183942..e9f85b794b 100644
--- a/nova/api/openstack/compute/contrib/server_external_events.py
+++ b/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 _
 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__)
diff --git a/nova/api/openstack/compute/contrib/server_groups.py b/nova/api/openstack/compute/contrib/server_groups.py
index 04c5f66d3d..df82094cfa 100644
--- a/nova/api/openstack/compute/contrib/server_groups.py
+++ b/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 @@ import nova.exception
 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__)
diff --git a/nova/api/openstack/compute/contrib/server_usage.py b/nova/api/openstack/compute/contrib/server_usage.py
index 4f3e45acbc..5c1b47a00d 100644
--- a/nova/api/openstack/compute/contrib/server_usage.py
+++ b/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')
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py
index 5c7a734df0..6006842d33 100644
--- a/nova/api/openstack/compute/contrib/volumes.py
+++ b/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 import exception
 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
 
diff --git a/nova/api/openstack/compute/extensions.py b/nova/api/openstack/compute/extensions.py
index 2f48277f60..a924d1b1bf 100644
--- a/nova/api/openstack/compute/extensions.py
+++ b/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',
diff --git a/nova/api/openstack/compute/plugins/__init__.py b/nova/api/openstack/compute/plugins/__init__.py
index a8907da477..0a84c839c7 100644
--- a/nova/api/openstack/compute/plugins/__init__.py
+++ b/nova/api/openstack/compute/plugins/__init__.py
@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 
 from nova import exception
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py b/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py
index 3f8deff7ac..f643a73c66 100644
--- a/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py
+++ b/nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py
@@ -16,6 +16,7 @@
 
 """The Assisted volume snapshots extension."""
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 from webob import exc
@@ -27,7 +28,6 @@ from nova.api import validation
 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__)
diff --git a/nova/api/openstack/compute/plugins/v3/extension_info.py b/nova/api/openstack/compute/plugins/v3/extension_info.py
index 736a8e1c4d..3854bdb95d 100644
--- a/nova/api/openstack/compute/plugins/v3/extension_info.py
+++ b/nova/api/openstack/compute/plugins/v3/extension_info.py
@@ -14,11 +14,11 @@
 
 import copy
 
+from oslo_log import log as logging
 import webob.exc
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
-from nova.openstack.common import log as logging
 
 ALIAS = 'extensions'
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/compute/plugins/v3/floating_ips.py b/nova/api/openstack/compute/plugins/v3/floating_ips.py
index 8fb8bde3f5..be3e4a7716 100644
--- a/nova/api/openstack/compute/plugins/v3/floating_ips.py
+++ b/nova/api/openstack/compute/plugins/v3/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
@@ -28,7 +29,6 @@ from nova import exception
 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
 
 
diff --git a/nova/api/openstack/compute/plugins/v3/hosts.py b/nova/api/openstack/compute/plugins/v3/hosts.py
index e64335dcce..d6c2923de1 100644
--- a/nova/api/openstack/compute/plugins/v3/hosts.py
+++ b/nova/api/openstack/compute/plugins/v3/hosts.py
@@ -15,6 +15,7 @@
 
 """The hosts admin extension."""
 
+from oslo_log import log as logging
 import webob.exc
 
 from nova.api.openstack.compute.schemas.v3 import hosts
@@ -26,7 +27,6 @@ from nova import exception
 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__)
 ALIAS = 'os-hosts'
diff --git a/nova/api/openstack/compute/plugins/v3/security_groups.py b/nova/api/openstack/compute/plugins/v3/security_groups.py
index ef7e05634a..0f495d4eed 100644
--- a/nova/api/openstack/compute/plugins/v3/security_groups.py
+++ b/nova/api/openstack/compute/plugins/v3/security_groups.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 """The security groups extension."""
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from webob import exc
 
@@ -27,7 +28,6 @@ from nova import compute
 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
 
 
diff --git a/nova/api/openstack/compute/plugins/v3/server_external_events.py b/nova/api/openstack/compute/plugins/v3/server_external_events.py
index a3ebecdbff..438b185508 100644
--- a/nova/api/openstack/compute/plugins/v3/server_external_events.py
+++ b/nova/api/openstack/compute/plugins/v3/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.compute.schemas.v3 import server_external_events
@@ -23,7 +24,6 @@ from nova import exception
 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__)
diff --git a/nova/api/openstack/compute/plugins/v3/server_groups.py b/nova/api/openstack/compute/plugins/v3/server_groups.py
index 50b0c49cef..58c55df42b 100644
--- a/nova/api/openstack/compute/plugins/v3/server_groups.py
+++ b/nova/api/openstack/compute/plugins/v3/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
 
@@ -27,7 +28,6 @@ import nova.exception
 from nova.i18n import _
 from nova.i18n import _LE
 from nova import objects
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py
index dae7d3f361..4cdea9f305 100644
--- a/nova/api/openstack/compute/plugins/v3/servers.py
+++ b/nova/api/openstack/compute/plugins/v3/servers.py
@@ -18,6 +18,7 @@ import base64
 import re
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import strutils
 from oslo_utils import timeutils
@@ -39,7 +40,6 @@ from nova.i18n import _
 from nova.i18n import _LW
 from nova.image import glance
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import policy
 from nova import utils
diff --git a/nova/api/openstack/compute/plugins/v3/tenant_networks.py b/nova/api/openstack/compute/plugins/v3/tenant_networks.py
index ac519935f4..a9a422b2a9 100644
--- a/nova/api/openstack/compute/plugins/v3/tenant_networks.py
+++ b/nova/api/openstack/compute/plugins/v3/tenant_networks.py
@@ -17,6 +17,7 @@
 import netaddr
 import netaddr.core as netexc
 from oslo_config import cfg
+from oslo_log import log as logging
 import six
 from webob import exc
 
@@ -29,7 +30,6 @@ from nova import exception
 from nova.i18n import _
 from nova.i18n import _LE
 import nova.network
-from nova.openstack.common import log as logging
 from nova import quota
 
 
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 693eaf4c25..dd4ccbaebe 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -20,6 +20,7 @@ import re
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import netutils
 from oslo_utils import strutils
@@ -37,7 +38,6 @@ from nova.compute import flavors
 from nova import exception
 from nova.i18n import _
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import policy
 from nova import utils
diff --git a/nova/api/openstack/compute/views/servers.py b/nova/api/openstack/compute/views/servers.py
index d0518f8531..d409c12f6b 100644
--- a/nova/api/openstack/compute/views/servers.py
+++ b/nova/api/openstack/compute/views/servers.py
@@ -16,6 +16,7 @@
 
 import hashlib
 
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from nova.api.openstack import common
@@ -24,7 +25,6 @@ from nova.api.openstack.compute.views import flavors as views_flavors
 from nova.api.openstack.compute.views import images as views_images
 from nova.i18n import _LW
 from nova.objects import base as obj_base
-from nova.openstack.common import log as logging
 from nova import utils
 
 
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index bf6165b4ab..9ce6351233 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -18,6 +18,7 @@ import abc
 import functools
 import os
 
+from oslo_log import log as logging
 from oslo_utils import importutils
 import six
 import webob.dec
@@ -29,7 +30,6 @@ from nova import exception
 from nova.i18n import _
 from nova.i18n import _LE
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 import nova.policy
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/urlmap.py b/nova/api/openstack/urlmap.py
index 1b80e85afe..4d3e33d07a 100644
--- a/nova/api/openstack/urlmap.py
+++ b/nova/api/openstack/urlmap.py
@@ -16,10 +16,10 @@
 import re
 import urllib2
 
+from oslo_log import log as logging
 import paste.urlmap
 
 from nova.api.openstack import wsgi
-from nova.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index c73e76ea60..f62b5ecf61 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -19,6 +19,7 @@ import inspect
 import math
 import time
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import six
@@ -31,7 +32,6 @@ from nova import i18n
 from nova.i18n import _
 from nova.i18n import _LE
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 from nova import utils
 from nova import wsgi
 
diff --git a/nova/api/validator.py b/nova/api/validator.py
index cce621849d..755de1912c 100644
--- a/nova/api/validator.py
+++ b/nova/api/validator.py
@@ -15,11 +15,10 @@
 
 import base64
 
+from oslo_log import log as logging
 import rfc3986
 import six
 
-from nova.openstack.common import log as logging
-
 
 LOG = logging.getLogger(__name__)