Use oslo.log instead of oslo-incubator

log module was removed from oslo-incubator after oslo.log released.

Change-Id: I205d0625c502cb462919edc76d12091edcc21b1b
Implements: blueprint port-oslo-incubator-to-oslo-log
Partial-Bug: #1381563

cinder/api/__init__.py

@@ -16,10 +16,10 @@
 
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import paste.urlmap
 
 from cinder.i18n import _LW
-from cinder.openstack.common import log as logging
 
 
 CONF = cfg.CONF

cinder/api/common.py

@@ -19,13 +19,13 @@ import re
 import urllib
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import six.moves.urllib.parse as urlparse
 import webob
 
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 

cinder/api/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 cinder.api import extensions
-from cinder.openstack.common import log as logging
 
 
 CONF = cfg.CONF

cinder/api/contrib/admin_actions.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_utils import strutils
 import webob
 from webob import exc
@@ -22,7 +23,6 @@ from cinder import backup
 from cinder import db
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import volume
 

cinder/api/contrib/backups.py

@@ -17,7 +17,7 @@
 
 """The backups api."""
 
-
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -29,7 +29,6 @@ from cinder.api import xmlutil
 from cinder import backup as backupAPI
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/cgsnapshots.py

@@ -15,7 +15,7 @@
 
 """The cgsnapshots api."""
 
-
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -27,7 +27,6 @@ from cinder.api import xmlutil
 from cinder import consistencygroup as consistencygroupAPI
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/consistencygroups.py

@@ -15,7 +15,7 @@
 
 """The consistencygroups api."""
 
-
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -27,7 +27,6 @@ from cinder.api import xmlutil
 from cinder import consistencygroup as consistencygroupAPI
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/extended_snapshot_attributes.py

@@ -14,11 +14,11 @@
 
 """The Extended Snapshot Attributes API extension."""
 
+from oslo_log import log as logging
 
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/hosts.py

@@ -18,6 +18,7 @@
 from xml.parsers import expat
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import webob.exc
 
@@ -27,7 +28,6 @@ from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import api as volume_api
 

cinder/api/contrib/qos_specs_manage.py

@@ -15,6 +15,7 @@
 
 """The QoS specs extension"""
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import six
 import webob
@@ -25,7 +26,6 @@ from cinder.api.views import qos_specs as view_qos_specs
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils
 from cinder.volume import qos_specs

cinder/api/contrib/scheduler_hints.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob.exc
 
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.v2 import volumes
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/api/contrib/scheduler_stats.py

@@ -14,10 +14,11 @@
 
 """The Scheduler Stats extension"""
 
+from oslo_log import log as logging
+
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api.views import scheduler_stats as scheduler_stats_view
-from cinder.openstack.common import log as logging
 from cinder.scheduler import rpcapi
 
 

cinder/api/contrib/services.py

@@ -15,6 +15,7 @@
 
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import webob.exc
 
@@ -24,7 +25,7 @@ from cinder.api import xmlutil
 from cinder import db
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
+from cinder.openstack.common import versionutils
 from cinder import utils
 
 
@@ -89,8 +90,9 @@ class ServiceController(wsgi.Controller):
         service = ''
         if 'service' in req.GET:
             service = req.GET['service']
-            LOG.deprecated(_("Query by service parameter is deprecated. "
-                             "Please use binary parameter instead."))
+            versionutils.report_deprecated_feature(LOG, _(
+                "Query by service parameter is deprecated. "
+                "Please use binary parameter instead."))
         binary = ''
         if 'binary' in req.GET:
             binary = req.GET['binary']

cinder/api/contrib/snapshot_actions.py

@@ -12,13 +12,13 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from oslo_log import log as logging
 import webob
 
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import db
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/api/contrib/volume_actions.py

@@ -13,6 +13,7 @@
 #   under the License.
 
 
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import strutils
 import webob
@@ -22,7 +23,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume
 

cinder/api/contrib/volume_host_attribute.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 cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/contrib/volume_manage.py

@@ -13,6 +13,7 @@
 #   under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import uuidutils
 from webob import exc
 
@@ -22,7 +23,6 @@ from cinder.api.v2.views import volumes as volume_views
 from cinder.api.v2 import volumes
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import volume_types

cinder/api/contrib/volume_replication.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 webob import exc
 
@@ -20,7 +21,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import replication as replicationAPI
 from cinder import volume
 

cinder/api/contrib/volume_transfer.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob
 from webob import exc
 
@@ -23,7 +24,6 @@ from cinder.api.views import transfers as transfer_view
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import transfer as transferAPI
 from cinder import utils
 

cinder/api/contrib/volume_unmanage.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 webob import exc
 
@@ -19,7 +20,6 @@ from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import volume
 
 LOG = logging.getLogger(__name__)

cinder/api/extensions.py

@@ -17,6 +17,7 @@
 import os
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import importutils
 import webob.dec
 import webob.exc
@@ -26,7 +27,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
-from cinder.openstack.common import log as logging
 import cinder.policy
 
 

cinder/api/middleware/auth.py

@@ -21,6 +21,7 @@ Common Auth Middleware.
 import os
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import webob.dec
 import webob.exc
@@ -28,7 +29,6 @@ import webob.exc
 from cinder.api.openstack import wsgi
 from cinder import context
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder.openstack.common.middleware import request_id
 from cinder import wsgi as base_wsgi
 

cinder/api/middleware/fault.py

@@ -14,13 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import webob.dec
 import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import exception
 from cinder.i18n import _, _LE, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import wsgi as base_wsgi
 

cinder/api/middleware/sizelimit.py

@@ -18,11 +18,11 @@ Request Body limiting middleware.
 
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import webob.dec
 import webob.exc
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import wsgi
 
 

cinder/api/openstack/__init__.py

@@ -18,11 +18,11 @@
 WSGI middleware for OpenStack API controllers.
 """
 
+from oslo_log import log as logging
 import routes
 
 from cinder.api.openstack import wsgi
 from cinder.i18n import _, _LW
-from cinder.openstack.common import log as logging
 from cinder import wsgi as base_wsgi
 
 

cinder/api/openstack/wsgi.py

@@ -21,6 +21,7 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from lxml import etree
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 import six
@@ -29,7 +30,6 @@ import webob
 from cinder import exception
 from cinder import i18n
 from cinder.i18n import _, _LE, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import wsgi
 

cinder/api/urlmap.py

@@ -16,10 +16,10 @@
 import re
 import urllib2
 
+from oslo_log import log as logging
 import paste.urlmap
 
 from cinder.api.openstack import wsgi
-from cinder.openstack.common import log as logging
 
 
 _quoted_string_re = r'"[^"\\]*(?:\\.[^"\\]*)*"'

cinder/api/v1/router.py

@@ -19,6 +19,8 @@
 WSGI middleware for OpenStack Volume API.
 """
 
+from oslo_log import log as logging
+
 from cinder.api import extensions
 import cinder.api.openstack
 from cinder.api.v1 import limits
@@ -28,7 +30,6 @@ from cinder.api.v1 import types
 from cinder.api.v1 import volume_metadata
 from cinder.api.v1 import volumes
 from cinder.api import versions
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/v1/snapshots.py

@@ -15,6 +15,7 @@
 
 """The volumes snapshots api."""
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import webob
 from webob import exc
@@ -24,7 +25,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume
 

cinder/api/v1/volumes.py

@@ -17,6 +17,7 @@
 
 import ast
 
+from oslo_log import log as logging
 from oslo_utils import uuidutils
 import webob
 from webob import exc
@@ -26,7 +27,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import utils as volume_utils

cinder/api/v2/router.py

@@ -19,6 +19,8 @@
 WSGI middleware for OpenStack Volume API.
 """
 
+from oslo_log import log as logging
+
 from cinder.api import extensions
 import cinder.api.openstack
 from cinder.api.v2 import limits
@@ -28,7 +30,6 @@ from cinder.api.v2 import types
 from cinder.api.v2 import volume_metadata
 from cinder.api.v2 import volumes
 from cinder.api import versions
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/v2/snapshots.py

@@ -15,6 +15,7 @@
 
 """The volumes snapshots api."""
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import webob
 from webob import exc
@@ -24,7 +25,6 @@ from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume
 

cinder/api/v2/views/volumes.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/v2/volumes.py

@@ -18,6 +18,7 @@
 
 import ast
 
+from oslo_log import log as logging
 from oslo_utils import uuidutils
 import webob
 from webob import exc
@@ -30,7 +31,6 @@ from cinder import consistencygroup as consistencygroupAPI
 from cinder import exception
 from cinder.i18n import _, _LI
 from cinder.image import glance
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import volume as cinder_volume
 from cinder.volume import utils as volume_utils

cinder/api/views/backups.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/views/cgsnapshots.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/views/consistencygroups.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/views/qos_specs.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/api/views/transfers.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 cinder.api import common
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/backup/api.py

@@ -22,6 +22,7 @@ Handles all requests relating to the volume backups service.
 
 from eventlet import greenthread
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 
 from cinder.backup import rpcapi as backup_rpcapi
@@ -29,7 +30,6 @@ from cinder import context
 from cinder.db import base
 from cinder import exception
 from cinder.i18n import _, _LI, _LW
-from cinder.openstack.common import log as logging
 import cinder.policy
 from cinder import quota
 from cinder import utils

cinder/backup/chunkeddriver.py

@@ -28,6 +28,7 @@ import os
 
 import eventlet
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import units
 import six
@@ -35,7 +36,6 @@ import six
 from cinder.backup import driver
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.volume import utils as volume_utils
 

cinder/backup/driver.py

@@ -18,6 +18,7 @@
 import abc
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import six
 
@@ -25,7 +26,6 @@ from cinder.db import base
 from cinder import exception
 from cinder.i18n import _, _LI, _LE, _LW
 from cinder import keymgr
-from cinder.openstack.common import log as logging
 
 service_opts = [
     cfg.IntOpt('backup_metadata_version', default=2,

cinder/backup/drivers/ceph.py

@@ -50,6 +50,7 @@ import time
 
 import eventlet
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import encodeutils
 from oslo_utils import excutils
 from oslo_utils import units
@@ -57,7 +58,6 @@ from oslo_utils import units
 from cinder.backup import driver
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
-from cinder.openstack.common import log as logging
 from cinder import utils
 import cinder.volume.drivers.rbd as rbd_driver
 

cinder/backup/drivers/nfs.py

@@ -19,12 +19,12 @@ import os
 import os.path
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder.backup import chunkeddriver
 from cinder.brick.remotefs import remotefs as remotefs_brick
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 LOG = logging.getLogger(__name__)

cinder/backup/drivers/swift.py

@@ -39,6 +39,7 @@ import hashlib
 import socket
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 from swiftclient import client as swift
@@ -47,7 +48,6 @@ from cinder.backup import chunkeddriver
 from cinder import exception
 from cinder.i18n import _
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/backup/drivers/tsm.py

@@ -31,11 +31,11 @@ import stat
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder.backup import driver
 from cinder import exception
 from cinder.i18n import _LE, _
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 LOG = logging.getLogger(__name__)

cinder/backup/manager.py

@@ -34,6 +34,7 @@ Volume backups can be created, restored, deleted and listed.
 """
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import excutils
 from oslo_utils import importutils
@@ -44,7 +45,6 @@ from cinder import context
 from cinder import exception
 from cinder.i18n import _, _LE, _LI, _LW
 from cinder import manager
-from cinder.openstack.common import log as logging
 from cinder import quota
 from cinder import rpc
 from cinder import utils

cinder/backup/rpcapi.py

@@ -19,9 +19,9 @@ Client side of the volume backup RPC API.
 
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 
-from cinder.openstack.common import log as logging
 from cinder import rpc
 
 

cinder/brick/exception.py

@@ -14,8 +14,9 @@
 
 """Exceptions for the Brick library."""
 
+from oslo_log import log as logging
+
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/brick/initiator/connector.py

@@ -21,6 +21,7 @@ import time
 
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
 import six
 
 from cinder.brick import exception
@@ -30,7 +31,6 @@ from cinder.brick.initiator import linuxfc
 from cinder.brick.initiator import linuxscsi
 from cinder.brick.remotefs import remotefs
 from cinder.i18n import _, _LE, _LW
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 
 S390X = "s390x"

cinder/brick/initiator/linuxfc.py

@@ -17,10 +17,10 @@
 import errno
 
 from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
 
 from cinder.brick.initiator import linuxscsi
 from cinder.i18n import _LW
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/brick/initiator/linuxscsi.py

@@ -20,10 +20,10 @@ import os
 import re
 
 from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
 
 from cinder.brick import executor
 from cinder.i18n import _, _LW
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/brick/local_dev/lvm.py

@@ -23,12 +23,12 @@ import os
 import re
 
 from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
 from oslo_utils import excutils
 
 from cinder.brick import exception
 from cinder.brick import executor
 from cinder.i18n import _, _LE, _LI
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 

cinder/brick/remotefs/remotefs.py

@@ -20,11 +20,11 @@ import os
 import re
 
 from oslo_concurrency import processutils as putils
+from oslo_log import log as logging
 import six
 
 from cinder.brick import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/cmd/all.py

@@ -34,6 +34,7 @@ import warnings
 warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import i18n
 i18n.enable_lazy()
@@ -41,7 +42,6 @@ i18n.enable_lazy()
 # Need to register global_opts
 from cinder.common import config   # noqa
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils
 from cinder import version
@@ -53,7 +53,7 @@ CONF = cfg.CONF
 def main():
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     LOG = logging.getLogger('cinder.all')
 
     utils.monkey_patch()

cinder/cmd/api.py

@@ -28,13 +28,13 @@ from cinder import objects
 warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import i18n
 i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
-from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import service
 from cinder import utils
@@ -48,7 +48,7 @@ def main():
     objects.register_all()
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     utils.monkey_patch()
 
     rpc.init(CONF)

cinder/cmd/backup.py

@@ -24,6 +24,7 @@ warnings.simplefilter('once', DeprecationWarning)
 
 import eventlet
 from oslo_config import cfg
+from oslo_log import log as logging
 
 eventlet.monkey_patch()
 
@@ -32,7 +33,6 @@ i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
-from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils
 from cinder import version
@@ -44,7 +44,7 @@ CONF = cfg.CONF
 def main():
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     utils.monkey_patch()
     server = service.Service.create(binary='cinder-backup')
     service.serve(server)

cinder/cmd/manage.py

@@ -63,6 +63,7 @@ warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
 from oslo_db.sqlalchemy import migration
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import uuidutils
 
@@ -77,7 +78,6 @@ from cinder.db import migration as db_migration
 from cinder.db.sqlalchemy import api as db_api
 from cinder.i18n import _
 from cinder.objects import base as objects_base
-from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils
 from cinder import version
@@ -546,7 +546,7 @@ def main():
     try:
         CONF(sys.argv[1:], project='cinder',
              version=version.version_string())
-        logging.setup("cinder")
+        logging.setup(CONF, "cinder")
     except cfg.ConfigFilesNotFoundError:
         cfgfile = CONF.config_file[-1] if CONF.config_file else None
         if cfgfile and not os.access(cfgfile, os.R_OK):

cinder/cmd/scheduler.py

@@ -26,13 +26,13 @@ import warnings
 warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import i18n
 i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
-from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils
 from cinder import version
@@ -44,7 +44,7 @@ CONF = cfg.CONF
 def main():
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     utils.monkey_patch()
     server = service.Service.create(binary='cinder-scheduler')
     service.serve(server)

cinder/cmd/volume.py

@@ -36,13 +36,13 @@ import warnings
 warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import i18n
 i18n.enable_lazy()
 
 # Need to register global_opts
 from cinder.common import config  # noqa
-from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils
 from cinder import version
@@ -59,7 +59,7 @@ def main():
     objects.register_all()
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     utils.monkey_patch()
     launcher = service.get_launcher()
     if CONF.enabled_backends:

cinder/cmd/volume_usage_audit.py

@@ -42,13 +42,13 @@ import warnings
 warnings.simplefilter('once', DeprecationWarning)
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import i18n
 i18n.enable_lazy()
 from cinder import context
 from cinder import db
 from cinder.i18n import _, _LE
-from cinder.openstack.common import log as logging
 from cinder import rpc
 from cinder import utils
 from cinder import version
@@ -79,7 +79,7 @@ def main():
     admin_context = context.get_admin_context()
     CONF(sys.argv[1:], project='cinder',
          version=version.version_string())
-    logging.setup("cinder")
+    logging.setup(CONF, "cinder")
     LOG = logging.getLogger("cinder")
     rpc.init(CONF)
     begin, end = utils.last_completed_audit_period()

cinder/common/config.py

@@ -28,12 +28,14 @@ stepping stone.
 import socket
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import netutils
 
 from cinder.i18n import _
 
 
 CONF = cfg.CONF
+logging.register_options(CONF)
 
 core_opts = [
     cfg.StrOpt('api_paste_config',

cinder/common/sqlalchemyutils.py

@@ -18,11 +18,11 @@
 
 """Implementation of paginate query."""
 
+from oslo_log import log as logging
 import sqlalchemy
 
 from cinder import exception
 from cinder.i18n import _, _LW
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/compute/nova.py

@@ -24,12 +24,12 @@ from novaclient.v1_1 import client as nova_client
 from novaclient.v1_1.contrib import assisted_volume_snapshots
 from novaclient.v1_1.contrib import list_extensions
 from oslo_config import cfg
+from oslo_log import log as logging
 from requests import exceptions as request_exceptions
 
 from cinder import context as ctx
 from cinder.db import base
 from cinder import exception
-from cinder.openstack.common import log as logging
 
 nova_opts = [
     cfg.StrOpt('nova_catalog_info',

cinder/consistencygroup/api.py

@@ -21,13 +21,13 @@ Handles all requests relating to consistency groups.
 import functools
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import timeutils
 
 from cinder.db import base
 from cinder import exception
 from cinder.i18n import _, _LE
-from cinder.openstack.common import log as logging
 import cinder.policy
 from cinder import quota
 from cinder.scheduler import rpcapi as scheduler_rpcapi

cinder/context.py

@@ -20,11 +20,11 @@
 import copy
 
 from oslo_context import context
+from oslo_log import log as logging
 from oslo_utils import timeutils
 
 from cinder.i18n import _
 from cinder.openstack.common import local
-from cinder.openstack.common import log as logging
 from cinder import policy
 
 

cinder/db/sqlalchemy/api.py

@@ -31,6 +31,7 @@ from oslo_config import cfg
 from oslo_db import exception as db_exc
 from oslo_db import options
 from oslo_db.sqlalchemy import session as db_session
+from oslo_log import log as logging
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import osprofiler.sqlalchemy
@@ -49,7 +50,6 @@ from cinder.common import sqlalchemyutils
 from cinder.db.sqlalchemy import models
 from cinder import exception
 from cinder.i18n import _, _LW, _LE, _LI
-from cinder.openstack.common import log as logging
 
 
 CONF = cfg.CONF

cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py

@@ -12,12 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 from migrate import ForeignKeyConstraint
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column, DateTime, Text, Boolean
 from sqlalchemy import MetaData, Integer, String, Table, ForeignKey
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/004_volume_type_to_uuid.py

@@ -13,10 +13,9 @@
 import uuid
 
 from migrate import ForeignKeyConstraint
+from oslo_log import log as logging
 from sqlalchemy import Integer, MetaData, String, Table
 
-from cinder.openstack.common import log as logging
-
 LOG = logging.getLogger(__name__)
 
 

cinder/db/sqlalchemy/migrate_repo/versions/005_add_source_volume_column.py

@@ -10,12 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from oslo_log import log as logging
 from sqlalchemy import Column
 from sqlalchemy import MetaData, String, Table
 
-from cinder.openstack.common import log as logging
-
 LOG = logging.getLogger(__name__)
 
 

cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, Integer, String, Table
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import MetaData, String, Table, ForeignKey
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey
 from sqlalchemy import Integer, MetaData, String, Table
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy import Boolean, DateTime, Integer, String
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py

@@ -14,12 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, MetaData, String, Table
 from migrate import ForeignKeyConstraint
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/021_add_default_quota_class.py

@@ -15,10 +15,10 @@
 import datetime
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from sqlalchemy import MetaData, Table
 
 from cinder.i18n import _LE, _LI
-from cinder.openstack.common import log as logging
 
 # Get default values via config.  The defaults will either
 # come from the default values set in the quota option

cinder/db/sqlalchemy/migrate_repo/versions/023_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 cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/024_add_replication_support.py

@@ -12,11 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column
 from sqlalchemy import MetaData, String, Table
 
-from cinder.openstack.common import log as logging
-
 LOG = logging.getLogger(__name__)
 
 

cinder/db/sqlalchemy/migrate_repo/versions/025_add_consistencygroup.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 from migrate import ForeignKeyConstraint
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, MetaData, String, Table
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/026_add_consistencygroup_quota_class.py

@@ -15,10 +15,10 @@
 import datetime
 
 from oslo_config import cfg
+from oslo_log import log as logging
 from sqlalchemy import MetaData, Table
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 # Get default values via config.  The defaults will either
 # come from the default values set in the quota option

cinder/db/sqlalchemy/migrate_repo/versions/032_add_volume_type_projects.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Boolean, Column, DateTime, UniqueConstraint
 from sqlalchemy import Integer, MetaData, String, Table, ForeignKey
 
 from cinder.i18n import _
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/037_add_cgsnapshot_id_column_to_consistencygroups.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column
 from sqlalchemy import MetaData, String, Table
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/038_add_driver_initiator_data_table.py

@@ -10,11 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table, UniqueConstraint
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/039_add_parent_id_to_backups.py

@@ -14,10 +14,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import Column, MetaData, String, Table
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/db/sqlalchemy/migrate_repo/versions/040_add_volume_attachment.py

@@ -16,12 +16,12 @@
 import datetime
 import uuid
 
+from oslo_log import log as logging
 import six
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, MetaData, String, Table
 
 from cinder.i18n import _LE
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/exception.py

@@ -25,11 +25,11 @@ SHOULD include dedicated exception logging.
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import six
 import webob.exc
 
 from cinder.i18n import _, _LE
-from cinder.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

cinder/flow_utils.py

@@ -12,13 +12,13 @@
 
 import os
 
+from oslo_log import log as logging
 # For more information please visit: https://wiki.openstack.org/wiki/TaskFlow
 from taskflow.listeners import base
 from taskflow.listeners import logging as logging_listener
 from taskflow import task
 
 from cinder import exception
-from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

cinder/image/glance.py

@@ -28,13 +28,13 @@ import time
 
 import glanceclient.exc
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.i18n import _, _LW
-from cinder.openstack.common import log as logging
 
 
 glance_opts = [

cinder/image/image_utils.py

@@ -31,6 +31,7 @@ import tempfile
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import timeutils
 from oslo_utils import units
 
@@ -38,7 +39,6 @@ from cinder import exception
 from cinder.i18n import _
 from cinder.openstack.common import fileutils
 from cinder.openstack.common import imageutils
-from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import throttling
 from cinder.volume import utils as volume_utils

cinder/keymgr/barbican.py

@@ -25,13 +25,13 @@ from barbicanclient import client as barbican_client
 from keystoneclient.auth import identity
 from keystoneclient import session
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_utils import excutils
 
 from cinder import exception
 from cinder.i18n import _, _LE
 from cinder.keymgr import key as keymgr_key
 from cinder.keymgr import key_mgr
-from cinder.openstack.common import log as logging
 
 CONF = cfg.CONF
 CONF.import_opt('encryption_auth_url', 'cinder.keymgr.key_mgr', group='keymgr')

cinder/keymgr/conf_key_mgr.py

@@ -34,12 +34,12 @@ encryption key so *any* volume can be decrypted once the fixed key is known.
 import array
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import exception
 from cinder.i18n import _, _LW
 from cinder.keymgr import key
 from cinder.keymgr import key_mgr
-from cinder.openstack.common import log as logging
 
 
 key_mgr_opts = [

cinder/manager.py

@@ -53,10 +53,10 @@ This module provides Manager, a base class for managers.
 
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import oslo_messaging as messaging
 
 from cinder.db import base
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import periodic_task
 from cinder.scheduler import rpcapi as scheduler_rpcapi
 from cinder import version

cinder/objects/base.py

@@ -23,6 +23,7 @@ import traceback
 
 import netaddr
 from oslo import messaging
+from oslo_log import log as logging
 from oslo_utils import timeutils
 import six
 
@@ -31,7 +32,6 @@ from cinder import exception
 from cinder.i18n import _, _LE
 from cinder import objects
 from cinder.objects import fields
-from cinder.openstack.common import log as logging
 from cinder.openstack.common import versionutils
 from cinder import utils
 

cinder/objects/snapshot.py

@@ -13,6 +13,7 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import db
 from cinder import exception
@@ -20,7 +21,6 @@ from cinder.i18n import _
 from cinder import objects
 from cinder.objects import base
 from cinder.objects import fields
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 CONF = cfg.CONF

cinder/objects/volume.py

@@ -13,6 +13,7 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from cinder import db
 from cinder import exception
@@ -20,7 +21,6 @@ from cinder.i18n import _
 from cinder import objects
 from cinder.objects import base
 from cinder.objects import fields
-from cinder.openstack.common import log as logging
 from cinder import utils
 
 CONF = cfg.CONF