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,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
 
 

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
 

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__)
 

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

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
 

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 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
 

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

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 @@ 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
 

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 = [

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',

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__)
 

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__)

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__)

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 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
 
 

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')

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__)

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
 
 

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
 
 

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__)

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__)

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 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
 

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',

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__)
 

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__)

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__)

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
 
 

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'

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
 
 

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__)

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__)
 

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

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
 
 

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

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
 
 

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__)

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__)

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
 

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__)
 

nova/block_device.py

@@ -16,11 +16,11 @@
 import re
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import strutils
 
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt import driver
 

nova/cells/filters/__init__.py

@@ -17,8 +17,9 @@
 Cell scheduler filters
 """
 
+from oslo_log import log as logging
+
 from nova import filters
-from nova.openstack.common import log as logging
 from nova import policy
 
 LOG = logging.getLogger(__name__)

nova/cells/filters/image_properties.py

@@ -27,8 +27,9 @@ cells.
 
 from distutils import versionpredicate
 
+from oslo_log import log as logging
+
 from nova.cells import filters
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/cells/filters/target_cell.py

@@ -21,9 +21,10 @@ specified to route a build to a particular cell.  No error handling is
 done as there's no way to know whether the full path is a valid.
 """
 
+from oslo_log import log as logging
+
 from nova.cells import filters
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/cells/manager.py

@@ -20,6 +20,7 @@ import datetime
 import time
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging
 from oslo_utils import importutils
 from oslo_utils import timeutils
@@ -34,7 +35,6 @@ from nova import manager
 from nova import objects
 from nova.objects import base as base_obj
 from nova.objects import instance as instance_obj
-from nova.openstack.common import log as logging
 from nova.openstack.common import periodic_task
 
 cell_manager_opts = [

nova/cells/messaging.py

@@ -26,11 +26,13 @@ reached.
 
 The interface into this module is the MessageRunner class.
 """
+
 import sys
 import traceback
 
 from eventlet import queue
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
@@ -53,7 +55,6 @@ from nova.i18n import _, _LE, _LI, _LW
 from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import rpc
 from nova import utils

nova/cells/rpcapi.py

@@ -24,13 +24,13 @@ messaging module.
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from nova import exception
 from nova.i18n import _LE
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova import rpc
 
 LOG = logging.getLogger(__name__)

nova/cells/scheduler.py

@@ -20,6 +20,7 @@ import copy
 import time
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.cells import filters
 from nova.cells import weights
@@ -32,7 +33,6 @@ from nova import exception
 from nova.i18n import _LE, _LI
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import log as logging
 from nova.scheduler import utils as scheduler_utils
 from nova import utils
 

nova/cells/state.py

@@ -23,6 +23,7 @@ import time
 
 from oslo_config import cfg
 from oslo_db import exception as db_exc
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 from oslo_utils import units
@@ -34,7 +35,6 @@ from nova import exception
 from nova.i18n import _LE
 from nova import objects
 from nova.openstack.common import fileutils
-from nova.openstack.common import log as logging
 from nova import rpc
 from nova import utils
 

nova/cells/weights/mute_child.py

@@ -19,11 +19,11 @@ downgrade its likelihood of being chosen for scheduling requests.
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from nova.cells import weights
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/cloudpipe/pipelib.py

@@ -25,6 +25,7 @@ import string
 import zipfile
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import compute
 from nova.compute import flavors
@@ -33,7 +34,6 @@ from nova import db
 from nova import exception
 from nova.i18n import _
 from nova.openstack.common import fileutils
-from nova.openstack.common import log as logging
 from nova import paths
 from nova import utils
 

nova/cmd/all.py

@@ -27,12 +27,12 @@ continue attempting to launch the rest of the services.
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova.i18n import _LE
 from nova import objects
 from nova.objectstore import s3server
-from nova.openstack.common import log as logging
 from nova import service
 from nova import utils
 from nova.vnc import xvp_proxy
@@ -47,7 +47,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     LOG = logging.getLogger('nova.all')
     utils.monkey_patch()
     objects.register_all()

nova/cmd/api.py

@@ -23,10 +23,10 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -39,7 +39,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/api_ec2.py

@@ -19,10 +19,10 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -35,7 +35,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/api_metadata.py

@@ -19,12 +19,12 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -38,7 +38,7 @@ CONF.import_opt('use_local', 'nova.conductor.api', group='conductor')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/api_os_compute.py

@@ -19,10 +19,10 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -35,7 +35,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/baseproxy.py

@@ -21,10 +21,10 @@ import os
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova.console import websocketproxy
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import version
 

nova/cmd/cells.py

@@ -18,10 +18,10 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -34,7 +34,7 @@ CONF.import_opt('manager', 'nova.cells.opts', group='cells')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup('nova')
+    logging.setup(CONF, 'nova')
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/cert.py

@@ -17,9 +17,9 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -31,7 +31,7 @@ CONF.import_opt('cert_topic', 'nova.cert.rpcapi')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
 
     gmr.TextGuruMeditation.setup_autorun(version)

nova/cmd/compute.py

@@ -20,6 +20,7 @@ import sys
 import traceback
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config
@@ -28,7 +29,6 @@ from nova import exception
 from nova.i18n import _LE
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -56,7 +56,7 @@ def block_db_access():
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup('nova')
+    logging.setup(CONF, 'nova')
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/conductor.py

@@ -18,10 +18,10 @@ import sys
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -33,7 +33,7 @@ CONF.import_opt('topic', 'nova.conductor.api', group='conductor')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/console.py

@@ -18,9 +18,9 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import version
@@ -31,7 +31,7 @@ CONF.import_opt('console_topic', 'nova.console.rpcapi')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/consoleauth.py

@@ -18,10 +18,10 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import version
@@ -31,7 +31,7 @@ CONF = cfg.CONF
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)

nova/cmd/dhcpbridge.py

@@ -25,6 +25,7 @@ import sys
 import traceback
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 
@@ -37,7 +38,6 @@ from nova.i18n import _LE
 from nova.network import rpcapi as network_rpcapi
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova import rpc
 
 CONF = cfg.CONF
@@ -117,7 +117,7 @@ def main():
     config.parse_args(sys.argv,
         default_config_files=jsonutils.loads(os.environ['CONFIG_FILE']))
 
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     global LOG
     LOG = logging.getLogger('nova.dhcpbridge')
     objects.register_all()

nova/cmd/manage.py

@@ -61,6 +61,7 @@ import sys
 import decorator
 import netaddr
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import importutils
 import six
@@ -75,7 +76,6 @@ from nova import exception
 from nova.i18n import _
 from nova import objects
 from nova.openstack.common import cliutils
-from nova.openstack.common import log as logging
 from nova import quota
 from nova import rpc
 from nova import servicegroup
@@ -1307,7 +1307,7 @@ def main():
     CONF.register_cli_opt(category_opt)
     try:
         config.parse_args(sys.argv)
-        logging.setup("nova")
+        logging.setup(CONF, "nova")
     except cfg.ConfigFilesNotFoundError:
         cfgfile = CONF.config_file[-1] if CONF.config_file else None
         if cfgfile and not os.access(cfgfile, os.R_OK):

nova/cmd/network.py

@@ -20,6 +20,7 @@ import sys
 import traceback
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config
@@ -28,7 +29,6 @@ from nova import exception
 from nova.i18n import _LE
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -56,7 +56,7 @@ def block_db_access():
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/objectstore.py

@@ -19,9 +19,10 @@
 
 import sys
 
+from oslo_log import log as logging
+
 from nova import config
 from nova.objectstore import s3server
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -30,7 +31,7 @@ from nova import version
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(config.CONF, "nova")
     utils.monkey_patch()
 
     gmr.TextGuruMeditation.setup_autorun(version)

nova/cmd/scheduler.py

@@ -19,10 +19,10 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova import config
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import utils
@@ -34,7 +34,7 @@ CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi')
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(CONF, "nova")
     utils.monkey_patch()
     objects.register_all()
 

nova/cmd/xvpvncproxy.py

@@ -17,8 +17,9 @@
 
 import sys
 
+from oslo_log import log as logging
+
 from nova import config
-from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
 from nova import version
@@ -27,7 +28,7 @@ from nova.vnc import xvp_proxy
 
 def main():
     config.parse_args(sys.argv)
-    logging.setup("nova")
+    logging.setup(config.CONF, "nova")
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/compute/api.py

@@ -27,6 +27,7 @@ import string
 import uuid
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import strutils
@@ -67,7 +68,6 @@ from nova.objects import block_device as block_device_obj
 from nova.objects import keypair as keypair_obj
 from nova.objects import quotas as quotas_obj
 from nova.objects import security_group as security_group_obj
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova.pci import request as pci_request
 import nova.policy
@@ -4073,10 +4073,10 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
         for v in vals:
             rule = self.db.security_group_rule_create(context, v)
             rules.append(rule)
-            LOG.audit(msg, {'name': name,
-                            'protocol': rule.protocol,
-                            'from_port': rule.from_port,
-                            'to_port': rule.to_port})
+            LOG.info(msg, {'name': name,
+                           'protocol': rule.protocol,
+                           'from_port': rule.from_port,
+                           'to_port': rule.to_port})
 
         self.trigger_rules_refresh(context, id=id)
         return rules
@@ -4086,10 +4086,10 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
                 "(%(from_port)s:%(to_port)s)")
         for rule_id in rule_ids:
             rule = self.get_rule(context, rule_id)
-            LOG.audit(msg, {'name': security_group['name'],
-                            'protocol': rule.protocol,
-                            'from_port': rule.from_port,
-                            'to_port': rule.to_port})
+            LOG.info(msg, {'name': security_group['name'],
+                           'protocol': rule.protocol,
+                           'from_port': rule.from_port,
+                           'to_port': rule.to_port})
 
             self.db.security_group_rule_destroy(context, rule_id)
 

nova/compute/claims.py

@@ -17,6 +17,7 @@
 Claim objects for use with resource tracking.
 """
 
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 
 from nova import context
@@ -25,7 +26,6 @@ from nova.i18n import _
 from nova.i18n import _LI
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import log as logging
 from nova.virt import hardware
 
 
@@ -155,7 +155,7 @@ class Claim(NopClaim):
         msg = _("Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d "
                 "GB")
         params = {'memory_mb': self.memory_mb, 'disk_gb': self.disk_gb}
-        LOG.audit(msg % params, instance=self.instance)
+        LOG.info(msg % params, instance=self.instance)
 
         reasons = [self._test_memory(resources, memory_mb_limit),
                    self._test_disk(resources, disk_gb_limit),

nova/compute/flavors.py

@@ -22,6 +22,7 @@ import re
 import uuid
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import strutils
 import six
 
@@ -32,7 +33,6 @@ from nova import 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
 
 flavor_opts = [

nova/compute/manager.py

@@ -41,6 +41,7 @@ import eventlet.semaphore
 import eventlet.timeout
 from keystoneclient import exceptions as keystone_exception
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
@@ -76,7 +77,6 @@ from nova.network import model as network_model
 from nova.network.security_group import openstack_driver
 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 loopingcall
 from nova.openstack.common import periodic_task
 from nova import paths
@@ -4636,7 +4636,7 @@ class ComputeManager(manager.Manager):
         LOG.info(_LI('Attaching volume %(volume_id)s to %(mountpoint)s'),
                   {'volume_id': bdm.volume_id,
                   'mountpoint': bdm['mount_device']},
-                  context=context, instance=instance)
+                 context=context, instance=instance)
         try:
             bdm.attach(context, instance, self.volume_api, self.driver,
                        do_check_attach=False, do_driver_attach=True)

nova/compute/monitors/__init__.py

@@ -24,12 +24,12 @@ import functools
 import types
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 
 from nova.i18n import _, _LW
 from nova import loadables
-from nova.openstack.common import log as logging
 
 compute_monitors_opts = [
     cfg.MultiStrOpt('compute_available_monitors',

nova/compute/monitors/virt/cpu_monitor.py

@@ -18,13 +18,13 @@ CPU monitor based on compute driver to retrieve CPU information
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from nova.compute import monitors
 from nova.compute.monitors import cpu_monitor as monitor
 from nova import exception
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 CONF = cfg.CONF
 CONF.import_opt('compute_driver', 'nova.virt.driver')

nova/compute/resource_tracker.py

@@ -21,6 +21,7 @@ model.
 import copy
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import importutils
 
@@ -36,7 +37,6 @@ from nova.i18n import _, _LI, _LW
 from nova import objects
 from nova.objects import base as obj_base
 from nova.objects import instance as instance_obj
-from nova.openstack.common import log as logging
 from nova.pci import manager as pci_manager
 from nova.pci import whitelist as pci_whitelist
 from nova import rpc

nova/compute/resources/__init__.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import stevedore
 
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/compute/resources/vcpu.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from nova.compute.resources import base
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/compute/rpcapi.py

@@ -17,6 +17,7 @@ Client side of the compute RPC API.
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
@@ -24,7 +25,6 @@ from nova import exception
 from nova.i18n import _, _LW
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import log as logging
 from nova import rpc
 
 rpcapi_opts = [

nova/compute/utils.py

@@ -20,6 +20,7 @@ import traceback
 
 import netifaces
 from oslo_config import cfg
+from oslo_log import log
 from oslo_utils import encodeutils
 
 from nova import block_device
@@ -31,7 +32,6 @@ from nova.network import model as network_model
 from nova import notifications
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import log
 from nova import rpc
 from nova import utils
 from nova.virt import driver

nova/conductor/api.py

@@ -15,13 +15,13 @@
 """Handles all requests to the conductor service."""
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 
 from nova import baserpc
 from nova.conductor import manager
 from nova.conductor import rpcapi
 from nova.i18n import _LI, _LW
-from nova.openstack.common import log as logging
 from nova import utils
 
 conductor_opts = [

nova/conductor/manager.py

@@ -17,6 +17,7 @@
 import copy
 import itertools
 
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
@@ -42,7 +43,6 @@ from nova.network.security_group import openstack_driver
 from nova import notifications
 from nova import objects
 from nova.objects import base as nova_object
-from nova.openstack.common import log as logging
 from nova import quota
 from nova.scheduler import client as scheduler_client
 from nova.scheduler import utils as scheduler_utils

nova/conductor/tasks/live_migrate.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from nova.compute import power_state
 from nova.compute import rpcapi as compute_rpcapi
@@ -19,7 +20,6 @@ from nova import exception
 from nova.i18n import _
 from nova import image
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.scheduler import client as scheduler_client
 from nova.scheduler import utils as scheduler_utils
 from nova import servicegroup

nova/config.py

@@ -17,9 +17,9 @@
 
 from oslo_config import cfg
 from oslo_db import options
+from oslo_log import log
 
 from nova import debugger
-from nova.openstack.common import log
 from nova import paths
 from nova import rpc
 from nova import version
@@ -45,6 +45,7 @@ _DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d '
 
 def parse_args(argv, default_config_files=None):
     log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS)
+    log.register_options(CONF)
     options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION,
                          sqlite_db='nova.sqlite')
     rpc.set_defaults(control_exchange='nova')

nova/console/manager.py

@@ -18,13 +18,13 @@
 import socket
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import importutils
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
 from nova import manager
-from nova.openstack.common import log as logging
 from nova import utils
 
 

nova/console/serial.py

@@ -17,11 +17,11 @@
 import socket
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import six.moves
 
 from nova import exception
 from nova.i18n import _LW
-from nova.openstack.common import log as logging
 from nova import utils
 
 LOG = logging.getLogger(__name__)

nova/console/vmrc_manager.py

@@ -16,12 +16,12 @@
 """VMRC Console Manager."""
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import importutils
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
 from nova import manager
-from nova.openstack.common import log as logging
 from nova.virt.vmwareapi import driver as vmwareapi_conn
 
 

nova/console/websocketproxy.py

@@ -23,13 +23,13 @@ import socket
 import sys
 import urlparse
 
+from oslo_log import log as logging
 import websockify
 
 from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import context
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/console/xvp.py

@@ -21,12 +21,12 @@ import signal
 import jinja2
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 
 from nova import context
 from nova import db
 from nova.i18n import _, _LE
-from nova.openstack.common import log as logging
 from nova import paths
 from nova import utils
 

nova/consoleauth/manager.py

@@ -19,6 +19,7 @@
 import time
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
@@ -27,7 +28,6 @@ from nova.compute import rpcapi as compute_rpcapi
 from nova.i18n import _LI, _LW
 from nova import manager
 from nova import objects
-from nova.openstack.common import log as logging
 from nova.openstack.common import memorycache
 
 

nova/context.py

@@ -22,13 +22,13 @@ import copy
 from keystoneclient import auth
 from keystoneclient import service_catalog
 from oslo_context import context
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 
 from nova import exception
 from nova.i18n import _, _LW
 from nova.openstack.common import local
-from nova.openstack.common import log as logging
 from nova import policy
 
 

nova/crypto.py

@@ -30,6 +30,7 @@ import struct
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import timeutils
 from pyasn1.codec.der import encoder as der_encoder
@@ -40,7 +41,6 @@ from nova import db
 from nova import exception
 from nova.i18n import _, _LE
 from nova.openstack.common import fileutils
-from nova.openstack.common import log as logging
 from nova import paths
 from nova import utils
 

nova/db/api.py

@@ -29,10 +29,10 @@ these objects be simple dictionaries.
 
 from oslo_config import cfg
 from oslo_db import concurrency
+from oslo_log import log as logging
 
 from nova.cells import rpcapi as cells_rpcapi
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 
 db_opts = [

nova/db/sqlalchemy/api.py

@@ -30,6 +30,7 @@ from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import timeutils
 import retrying
@@ -60,7 +61,6 @@ import nova.context
 from nova.db.sqlalchemy import models
 from nova import exception
 from nova.i18n import _, _LI, _LE, _LW
-from nova.openstack.common import log as logging
 from nova.openstack.common import uuidutils
 from nova import quota
 

nova/db/sqlalchemy/migrate_repo/versions/216_havana.py

@@ -14,6 +14,7 @@
 
 from migrate.changeset import UniqueConstraint
 from migrate import ForeignKeyConstraint
+from oslo_log import log as logging
 from sqlalchemy import Boolean, BigInteger, Column, DateTime, Enum, Float
 from sqlalchemy import dialects
 from sqlalchemy import ForeignKey, Index, Integer, MetaData, String, Table
@@ -21,7 +22,6 @@ from sqlalchemy import Text
 from sqlalchemy.types import NullType
 
 from nova.i18n import _LE
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.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 sqlalchemy import Index, MetaData, Table
 
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.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 sqlalchemy import Index, MetaData, Table
 
 from nova.i18n import _LI
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py

@@ -14,12 +14,12 @@
 
 from migrate import UniqueConstraint
 from oslo_db.sqlalchemy import utils
+from oslo_log import log as logging
 from sqlalchemy import MetaData
 from sqlalchemy.sql import null
 
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)