From: Xi Yang <yang.xi@99cloud.net>
Date: Sat, 9 Jan 2016 15:24:25 +0000 (+0800)
Subject: Replace logging with oslo_log
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d0676023e8d352e08e77fca11b2ebe910a3ebb2b;p=openstack-build%2Fcinder-build.git

Replace logging with oslo_log

Some modules are still using logging, this
patch is going to replace it.

Change-Id: Id79913376b946f4aff1be6a24b7c95dc21fc28cf
---

diff --git a/cinder/api/contrib/volume_image_metadata.py b/cinder/api/contrib/volume_image_metadata.py
index a5f0468cd..a542cc00e 100644
--- a/cinder/api/contrib/volume_image_metadata.py
+++ b/cinder/api/contrib/volume_image_metadata.py
@@ -13,11 +13,11 @@
 #   under the License.
 
 """The Volume Image Metadata API extension."""
-import logging
-
 import six
 import webob
 
+from oslo_log import log as logging
+
 from cinder.api import common
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
diff --git a/cinder/scheduler/base_filter.py b/cinder/scheduler/base_filter.py
index 2ce8681f9..c0351daa5 100644
--- a/cinder/scheduler/base_filter.py
+++ b/cinder/scheduler/base_filter.py
@@ -16,7 +16,7 @@
 """
 Filter support
 """
-import logging
+from oslo_log import log as logging
 
 from cinder.openstack.common._i18n import _LI
 from cinder.scheduler import base_handler
diff --git a/cinder/scheduler/filters/capabilities_filter.py b/cinder/scheduler/filters/capabilities_filter.py
index 1646ad85d..be35173f2 100644
--- a/cinder/scheduler/filters/capabilities_filter.py
+++ b/cinder/scheduler/filters/capabilities_filter.py
@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
+from oslo_log import log as logging
 import six
 
 from cinder.scheduler import filters
diff --git a/cinder/scheduler/filters/ignore_attempted_hosts_filter.py b/cinder/scheduler/filters/ignore_attempted_hosts_filter.py
index db1071d82..beffe16a4 100644
--- a/cinder/scheduler/filters/ignore_attempted_hosts_filter.py
+++ b/cinder/scheduler/filters/ignore_attempted_hosts_filter.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
+from oslo_log import log as logging
 
 from cinder.scheduler import filters
 
diff --git a/cinder/zonemanager/utils.py b/cinder/zonemanager/utils.py
index 9a3c055d6..7ba578f2d 100644
--- a/cinder/zonemanager/utils.py
+++ b/cinder/zonemanager/utils.py
@@ -17,8 +17,6 @@
 Utility functions related to the Zone Manager.
 
 """
-import logging
-
 from oslo_log import log
 
 from cinder.i18n import _LI, _LW
@@ -28,7 +26,6 @@ from cinder.zonemanager import fc_san_lookup_service
 from cinder.zonemanager import fc_zone_manager
 
 LOG = log.getLogger(__name__)
-LOG.logger.setLevel(logging.DEBUG)
 
 
 def create_zone_manager():