diff --git a/manila/api/urlmap.py b/manila/api/urlmap.py index bccaa67c3d..5957047dbe 100644 --- a/manila/api/urlmap.py +++ b/manila/api/urlmap.py @@ -19,7 +19,6 @@ try: except ImportError: from urllib2 import parse_http_list # noqa -from oslo_log import log import paste.urlmap from manila.api.openstack import wsgi @@ -31,8 +30,6 @@ _option_header_piece_re = re.compile( r'(?:=\s*([^;]+|%s))?\s*' % (_quoted_string_re, _quoted_string_re)) -LOG = log.getLogger(__name__) - def unquote_header_value(value): """Unquotes a header value. diff --git a/manila/api/v1/router.py b/manila/api/v1/router.py index bcf75ce294..57ee03efa0 100644 --- a/manila/api/v1/router.py +++ b/manila/api/v1/router.py @@ -19,8 +19,6 @@ WSGI middleware for OpenStack Share API v1. """ -from oslo_log import log - from manila.api import extensions import manila.api.openstack from manila.api.v1 import limits @@ -41,8 +39,6 @@ from manila.api.v2 import services from manila.api.v2 import share_types from manila.api import versions -LOG = log.getLogger(__name__) - class APIRouter(manila.api.openstack.APIRouter): """Route API requests. diff --git a/manila/api/v1/scheduler_stats.py b/manila/api/v1/scheduler_stats.py index 13c71c54ef..2ca2980bac 100644 --- a/manila/api/v1/scheduler_stats.py +++ b/manila/api/v1/scheduler_stats.py @@ -12,14 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log - from manila.api.openstack import wsgi from manila.api.views import scheduler_stats as scheduler_stats_views from manila.scheduler import rpcapi -LOG = log.getLogger(__name__) - class SchedulerStatsController(wsgi.Controller): """The Scheduler Stats API controller for the OpenStack API.""" diff --git a/manila/api/v2/router.py b/manila/api/v2/router.py index 14998bdb80..7ad60f78e9 100644 --- a/manila/api/v2/router.py +++ b/manila/api/v2/router.py @@ -20,8 +20,6 @@ WSGI middleware for OpenStack Share API v2. """ -from oslo_log import log - from manila.api import extensions import manila.api.openstack from manila.api.v1 import limits @@ -45,8 +43,6 @@ from manila.api.v2 import share_types from manila.api.v2 import shares from manila.api import versions -LOG = log.getLogger(__name__) - class APIRouter(manila.api.openstack.APIRouter): """Route API requests. diff --git a/manila/api/v2/services.py b/manila/api/v2/services.py index f9dd73a2ab..8412292a1e 100644 --- a/manila/api/v2/services.py +++ b/manila/api/v2/services.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log import webob.exc from manila.api.openstack import wsgi @@ -22,8 +21,6 @@ from manila.api.views import services as services_views from manila import db from manila import utils -LOG = log.getLogger(__name__) - class ServiceMixin(object): """The Services API controller common logic. diff --git a/manila/api/views/cgsnapshots.py b/manila/api/views/cgsnapshots.py index a76029efc3..6be34fa847 100644 --- a/manila/api/views/cgsnapshots.py +++ b/manila/api/views/cgsnapshots.py @@ -15,14 +15,9 @@ """The consistency groups snapshot API.""" -from oslo_log import log - from manila.api import common -LOG = log.getLogger(__name__) - - class CGSnapshotViewBuilder(common.ViewBuilder): """Model a cgsnapshot API response as a python dictionary.""" diff --git a/manila/api/views/consistency_groups.py b/manila/api/views/consistency_groups.py index 81386ab1bd..9bad8fc597 100644 --- a/manila/api/views/consistency_groups.py +++ b/manila/api/views/consistency_groups.py @@ -15,14 +15,9 @@ """The consistency groups API.""" -from oslo_log import log - from manila.api import common -LOG = log.getLogger(__name__) - - class CGViewBuilder(common.ViewBuilder): """Model a consistency group API response as a python dictionary.""" diff --git a/manila/network/neutron/neutron_network_plugin.py b/manila/network/neutron/neutron_network_plugin.py index 44aa72b206..c936f7dbfc 100644 --- a/manila/network/neutron/neutron_network_plugin.py +++ b/manila/network/neutron/neutron_network_plugin.py @@ -15,7 +15,6 @@ # under the License. from oslo_config import cfg -from oslo_log import log from manila.common import constants from manila import exception @@ -41,7 +40,6 @@ neutron_single_network_plugin_opts = [ ] CONF = cfg.CONF -LOG = log.getLogger(__name__) class NeutronNetworkPlugin(network.NetworkBaseAPI): diff --git a/manila/share/configuration.py b/manila/share/configuration.py index a8d1810566..ceb6db0f17 100644 --- a/manila/share/configuration.py +++ b/manila/share/configuration.py @@ -43,10 +43,8 @@ and registered in the group in which they are used. """ from oslo_config import cfg -from oslo_log import log CONF = cfg.CONF -LOG = log.getLogger(__name__) class Configuration(object): diff --git a/manila/share/drivers/emc/plugins/isilon/isilon_api.py b/manila/share/drivers/emc/plugins/isilon/isilon_api.py index 6c742814f3..bfdaaa25a3 100644 --- a/manila/share/drivers/emc/plugins/isilon/isilon_api.py +++ b/manila/share/drivers/emc/plugins/isilon/isilon_api.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log from oslo_serialization import jsonutils import requests import six @@ -21,8 +20,6 @@ import six from manila import exception from manila.i18n import _ -LOG = log.getLogger(__name__) - class IsilonApi(object): diff --git a/manila/test.py b/manila/test.py index 216dba1b88..5b39c9f65a 100644 --- a/manila/test.py +++ b/manila/test.py @@ -31,7 +31,6 @@ from oslo_concurrency import lockutils from oslo_config import cfg from oslo_config import fixture as config_fixture import oslo_i18n -from oslo_log import log from oslo_messaging import conffixture as messaging_conffixture import oslotest.base as base_test import six @@ -53,8 +52,6 @@ test_opts = [ CONF = cfg.CONF CONF.register_opts(test_opts) -LOG = log.getLogger(__name__) - _DB_CACHE = None diff --git a/manila/tests/fake_compute.py b/manila/tests/fake_compute.py index cac70bd118..18d78ed57b 100644 --- a/manila/tests/fake_compute.py +++ b/manila/tests/fake_compute.py @@ -15,10 +15,8 @@ from oslo_config import cfg -from oslo_log import log CONF = cfg.CONF -LOG = log.getLogger(__name__) class FakeServer(object): diff --git a/manila/tests/fake_network.py b/manila/tests/fake_network.py index 3c744cacdc..31c66bb78d 100644 --- a/manila/tests/fake_network.py +++ b/manila/tests/fake_network.py @@ -16,10 +16,8 @@ import uuid from oslo_config import cfg -from oslo_log import log CONF = cfg.CONF -LOG = log.getLogger(__name__) class FakeNetwork(object): diff --git a/manila/tests/fake_service_instance.py b/manila/tests/fake_service_instance.py index 9ef8747535..e3475258cd 100644 --- a/manila/tests/fake_service_instance.py +++ b/manila/tests/fake_service_instance.py @@ -13,12 +13,9 @@ # under the License. import mock -from oslo_log import log from manila.tests import fake_compute -LOG = log.getLogger(__name__) - class FakeServiceInstanceManager(object): diff --git a/manila/tests/fake_volume.py b/manila/tests/fake_volume.py index 81262fde63..c4f87b3458 100644 --- a/manila/tests/fake_volume.py +++ b/manila/tests/fake_volume.py @@ -15,10 +15,8 @@ from oslo_config import cfg -from oslo_log import log CONF = cfg.CONF -LOG = log.getLogger(__name__) class FakeVolume(object): diff --git a/manila/tests/share/drivers/emc/test_driver.py b/manila/tests/share/drivers/emc/test_driver.py index e0ddb8c2b2..3625b51707 100644 --- a/manila/tests/share/drivers/emc/test_driver.py +++ b/manila/tests/share/drivers/emc/test_driver.py @@ -14,7 +14,6 @@ # under the License. import mock -from oslo_log import log from stevedore import extension from manila import network @@ -23,8 +22,6 @@ from manila.share.drivers.emc import driver as emcdriver from manila.share.drivers.emc.plugins import base from manila import test -LOG = log.getLogger(__name__) - class FakeConnection(base.StorageConnection): def __init__(self, logger):