From 80c3a7aba0ab561d79340cff9e91fccf808b0fe0 Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 5 Jul 2016 15:20:58 +0800 Subject: [PATCH] Remove unused LOG This is to remove unused LOG to keep code clean. Change-Id: I5623fb0b22464c39a28c6e8f28878e6db4504e24 --- neutron/agent/linux/bridge_lib.py | 4 ---- neutron/db/l3_dvr_ha_scheduler_db.py | 4 ---- neutron/extensions/tag.py | 3 --- neutron/objects/subnetpool.py | 3 --- neutron/pecan_wsgi/controllers/quota.py | 2 -- neutron/plugins/ml2/drivers/agent/_agent_manager_base.py | 3 --- neutron/services/externaldns/drivers/designate/driver.py | 2 -- neutron/services/segments/db.py | 4 ---- neutron/services/tag/tag_plugin.py | 4 ---- neutron/tests/functional/agent/linux/test_tc_lib.py | 4 ---- neutron/tests/tempest/scenario/base.py | 2 -- neutron/tests/tempest/scenario/test_basic.py | 2 -- 12 files changed, 37 deletions(-) diff --git a/neutron/agent/linux/bridge_lib.py b/neutron/agent/linux/bridge_lib.py index 731643ea8bf..b29256f6bd4 100644 --- a/neutron/agent/linux/bridge_lib.py +++ b/neutron/agent/linux/bridge_lib.py @@ -18,13 +18,9 @@ import os -from oslo_log import log as logging - from neutron.agent.linux import ip_lib from neutron.agent.linux import utils -LOG = logging.getLogger(__name__) - # NOTE(toabctl): Don't use /sys/devices/virtual/net here because not all tap # devices are listed here (i.e. when using Xen) BRIDGE_FS = "/sys/class/net/" diff --git a/neutron/db/l3_dvr_ha_scheduler_db.py b/neutron/db/l3_dvr_ha_scheduler_db.py index d85c804c841..dcdb7a09ff1 100644 --- a/neutron/db/l3_dvr_ha_scheduler_db.py +++ b/neutron/db/l3_dvr_ha_scheduler_db.py @@ -16,10 +16,6 @@ import neutron.db.l3_dvrscheduler_db as l3agent_dvr_sch_db import neutron.db.l3_hascheduler_db as l3_ha_sch_db -from oslo_log import log as logging - -LOG = logging.getLogger(__name__) - class L3_DVR_HA_scheduler_db_mixin(l3agent_dvr_sch_db.L3_DVRsch_db_mixin, l3_ha_sch_db.L3_HA_scheduler_db_mixin): diff --git a/neutron/extensions/tag.py b/neutron/extensions/tag.py index 7b526d8edd0..a09dfa97796 100644 --- a/neutron/extensions/tag.py +++ b/neutron/extensions/tag.py @@ -15,7 +15,6 @@ import abc from neutron_lib.api import validators from neutron_lib import exceptions -from oslo_log import log as logging import six import webob.exc @@ -28,8 +27,6 @@ from neutron import manager from neutron.services import service_base -LOG = logging.getLogger(__name__) - TAG = 'tag' TAGS = TAG + 's' MAX_TAG_LEN = 60 diff --git a/neutron/objects/subnetpool.py b/neutron/objects/subnetpool.py index 4fd0de019a5..ad69abf8413 100644 --- a/neutron/objects/subnetpool.py +++ b/neutron/objects/subnetpool.py @@ -14,7 +14,6 @@ # under the License. import netaddr -from oslo_log import log from oslo_versionedobjects import base as obj_base from oslo_versionedobjects import fields as obj_fields @@ -23,8 +22,6 @@ from neutron.db import models_v2 as models from neutron.objects import base from neutron.objects import common_types -LOG = log.getLogger(__name__) - @obj_base.VersionedObjectRegistry.register class SubnetPool(base.NeutronDbObject): diff --git a/neutron/pecan_wsgi/controllers/quota.py b/neutron/pecan_wsgi/controllers/quota.py index ea18fe85134..a48eec88964 100644 --- a/neutron/pecan_wsgi/controllers/quota.py +++ b/neutron/pecan_wsgi/controllers/quota.py @@ -16,7 +16,6 @@ from neutron_lib.api import converters from neutron_lib import exceptions as n_exc from oslo_config import cfg -from oslo_log import log from oslo_utils import importutils import pecan from pecan import request @@ -28,7 +27,6 @@ from neutron.common import constants from neutron.pecan_wsgi.controllers import utils from neutron.quota import resource_registry -LOG = log.getLogger(__name__) RESOURCE_NAME = "quota" TENANT_ID_ATTR = {'tenant_id': {'allow_post': False, diff --git a/neutron/plugins/ml2/drivers/agent/_agent_manager_base.py b/neutron/plugins/ml2/drivers/agent/_agent_manager_base.py index 612668f5ab2..b7baabf2ae7 100644 --- a/neutron/plugins/ml2/drivers/agent/_agent_manager_base.py +++ b/neutron/plugins/ml2/drivers/agent/_agent_manager_base.py @@ -16,11 +16,8 @@ import abc -from oslo_log import log as logging import six -LOG = logging.getLogger(__name__) - class NetworkSegment(object): """Represents a Neutron network segment""" diff --git a/neutron/services/externaldns/drivers/designate/driver.py b/neutron/services/externaldns/drivers/designate/driver.py index 48553b82973..cf15c48db79 100644 --- a/neutron/services/externaldns/drivers/designate/driver.py +++ b/neutron/services/externaldns/drivers/designate/driver.py @@ -22,7 +22,6 @@ from keystoneauth1 import session from keystoneauth1 import token_endpoint from neutron_lib import constants from oslo_config import cfg -from oslo_log import log from neutron._i18n import _ from neutron.extensions import dns @@ -33,7 +32,6 @@ IPV4_PTR_ZONE_PREFIX_MAX_SIZE = 24 IPV6_PTR_ZONE_PREFIX_MIN_SIZE = 4 IPV6_PTR_ZONE_PREFIX_MAX_SIZE = 124 -LOG = log.getLogger(__name__) _SESSION = None designate_opts = [ diff --git a/neutron/services/segments/db.py b/neutron/services/segments/db.py index da6dae35155..dbcb04fdf01 100644 --- a/neutron/services/segments/db.py +++ b/neutron/services/segments/db.py @@ -19,7 +19,6 @@ import functools from neutron_lib import constants from oslo_log import helpers as log_helpers -from oslo_log import log as logging from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm @@ -36,9 +35,6 @@ from neutron import manager from neutron.services.segments import exceptions -LOG = logging.getLogger(__name__) - - class SegmentHostMapping(model_base.BASEV2): segment_id = sa.Column(sa.String(36), diff --git a/neutron/services/tag/tag_plugin.py b/neutron/services/tag/tag_plugin.py index 8f11ca693ae..76f3fa1c205 100644 --- a/neutron/services/tag/tag_plugin.py +++ b/neutron/services/tag/tag_plugin.py @@ -17,7 +17,6 @@ import functools from oslo_db import api as oslo_db_api from oslo_db import exception as db_exc from oslo_log import helpers as log_helpers -from oslo_log import log as logging from sqlalchemy.orm import exc from neutron.api.v2 import attributes @@ -28,9 +27,6 @@ from neutron.db import tag_db as tag_model from neutron.extensions import tag as tag_ext -LOG = logging.getLogger(__name__) - - resource_model_map = { attributes.NETWORKS: models_v2.Network, # other resources can be added diff --git a/neutron/tests/functional/agent/linux/test_tc_lib.py b/neutron/tests/functional/agent/linux/test_tc_lib.py index fd9f525515a..ebba13d13b6 100644 --- a/neutron/tests/functional/agent/linux/test_tc_lib.py +++ b/neutron/tests/functional/agent/linux/test_tc_lib.py @@ -13,14 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from neutron.agent.linux import ip_lib from neutron.agent.linux import tc_lib from neutron.tests.functional import base as functional_base -LOG = logging.getLogger(__name__) - TEST_HZ_VALUE = 250 LATENCY = 50 BW_LIMIT = 1024 diff --git a/neutron/tests/tempest/scenario/base.py b/neutron/tests/tempest/scenario/base.py index 04b591a58d9..cf7686ff378 100644 --- a/neutron/tests/tempest/scenario/base.py +++ b/neutron/tests/tempest/scenario/base.py @@ -12,7 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest.common import waiters from tempest.lib.common import ssh @@ -23,7 +22,6 @@ from neutron.tests.tempest import config from neutron.tests.tempest.scenario import constants CONF = config.CONF -LOG = logging.getLogger(__name__) class BaseTempestTestCase(base_api.BaseNetworkTest): diff --git a/neutron/tests/tempest/scenario/test_basic.py b/neutron/tests/tempest/scenario/test_basic.py index fcd856bef55..a8465915db6 100644 --- a/neutron/tests/tempest/scenario/test_basic.py +++ b/neutron/tests/tempest/scenario/test_basic.py @@ -12,7 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest.common import waiters from tempest import test @@ -21,7 +20,6 @@ from neutron.tests.tempest.scenario import base from neutron.tests.tempest.scenario import constants CONF = config.CONF -LOG = logging.getLogger(__name__) class NetworkBasicTest(base.BaseTempestTestCase):