diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py index 89b7453e8..e0c04323c 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py @@ -26,7 +26,6 @@ from neutron.db import servicetype_db as st_db from neutron import manager from neutron.plugins.common import constants from oslo_db import exception -from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import uuidutils import sqlalchemy as sa @@ -38,8 +37,6 @@ from neutron_lbaas._i18n import _LE from neutron_lbaas.extensions import loadbalancer from neutron_lbaas.services.loadbalancer import constants as lb_const -LOG = logging.getLogger(__name__) - class SessionPersistence(model_base.BASEV2): diff --git a/neutron_lbaas/drivers/common/agent_driver_base.py b/neutron_lbaas/drivers/common/agent_driver_base.py index fec9e58d8..49492acc8 100644 --- a/neutron_lbaas/drivers/common/agent_driver_base.py +++ b/neutron_lbaas/drivers/common/agent_driver_base.py @@ -17,7 +17,6 @@ from neutron.common import rpc as n_rpc from neutron.db import agents_db from neutron.services import provider_configuration as provconf from oslo_config import cfg -from oslo_log import log as logging import oslo_messaging as messaging from oslo_utils import importutils @@ -27,7 +26,6 @@ from neutron_lbaas.extensions import lbaas_agentschedulerv2 from neutron_lbaas.services.loadbalancer import constants as lb_const from neutron_lbaas.services.loadbalancer import data_models -LOG = logging.getLogger(__name__) LB_SCHEDULERS = 'loadbalancer_schedulers' diff --git a/neutron_lbaas/tests/tempest/lib/clients.py b/neutron_lbaas/tests/tempest/lib/clients.py index 6ae4e8d88..fb1bbbf44 100644 --- a/neutron_lbaas/tests/tempest/lib/clients.py +++ b/neutron_lbaas/tests/tempest/lib/clients.py @@ -15,7 +15,6 @@ import copy -from oslo_log import log as logging from tempest_lib.services.identity.v2.token_client import TokenClientJSON from tempest_lib.services.identity.v3.token_client import V3TokenClientJSON @@ -137,7 +136,6 @@ from neutron_lbaas.tests.tempest.lib.services.volume.v2.json.snapshots_client im from neutron_lbaas.tests.tempest.lib.services.volume.v2.json.volumes_client import VolumesV2ClientJSON CONF = config.CONF -LOG = logging.getLogger(__name__) class Manager(manager.Manager): diff --git a/neutron_lbaas/tests/tempest/lib/common/cred_provider.py b/neutron_lbaas/tests/tempest/lib/common/cred_provider.py index ecfad83a5..d2cf6c70b 100644 --- a/neutron_lbaas/tests/tempest/lib/common/cred_provider.py +++ b/neutron_lbaas/tests/tempest/lib/common/cred_provider.py @@ -14,7 +14,6 @@ import abc -from oslo_log import log as logging import six from tempest_lib import auth @@ -22,7 +21,6 @@ from neutron_lbaas.tests.tempest.lib import config from neutron_lbaas.tests.tempest.lib import exceptions CONF = config.CONF -LOG = logging.getLogger(__name__) # Type of credentials available from configuration CREDENTIAL_TYPES = { diff --git a/neutron_lbaas/tests/tempest/lib/common/generator/base_generator.py b/neutron_lbaas/tests/tempest/lib/common/generator/base_generator.py index f81f4055d..425f687cb 100644 --- a/neutron_lbaas/tests/tempest/lib/common/generator/base_generator.py +++ b/neutron_lbaas/tests/tempest/lib/common/generator/base_generator.py @@ -18,10 +18,6 @@ import functools import jsonschema -from oslo_log import log as logging - -LOG = logging.getLogger(__name__) - def _check_for_expected_result(name, schema): expected_result = None diff --git a/neutron_lbaas/tests/tempest/lib/common/generator/negative_generator.py b/neutron_lbaas/tests/tempest/lib/common/generator/negative_generator.py index 3b7786929..fe3bb2de2 100644 --- a/neutron_lbaas/tests/tempest/lib/common/generator/negative_generator.py +++ b/neutron_lbaas/tests/tempest/lib/common/generator/negative_generator.py @@ -15,13 +15,9 @@ import copy -from oslo_log import log as logging - import neutron_lbaas.tests.tempest.lib.common.generator.base_generator as base import neutron_lbaas.tests.tempest.lib.common.generator.valid_generator as valid -LOG = logging.getLogger(__name__) - class NegativeTestGenerator(base.BasicGeneratorSet): @base.generator_type("string") diff --git a/neutron_lbaas/tests/tempest/lib/common/generator/valid_generator.py b/neutron_lbaas/tests/tempest/lib/common/generator/valid_generator.py index 9a1d35aad..0629e3e72 100644 --- a/neutron_lbaas/tests/tempest/lib/common/generator/valid_generator.py +++ b/neutron_lbaas/tests/tempest/lib/common/generator/valid_generator.py @@ -13,14 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - import neutron_lbaas.tests.tempest.lib.common.generator.base_generator as base -LOG = logging.getLogger(__name__) - - class ValidTestGenerator(base.BasicGeneratorSet): @base.generator_type("string") @base.simple_generator diff --git a/neutron_lbaas/tests/tempest/v1/api/base.py b/neutron_lbaas/tests/tempest/v1/api/base.py index d5cd8395b..9282f97bb 100644 --- a/neutron_lbaas/tests/tempest/v1/api/base.py +++ b/neutron_lbaas/tests/tempest/v1/api/base.py @@ -14,7 +14,6 @@ # under the License. import netaddr -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc @@ -25,8 +24,6 @@ import neutron_lbaas.tests.tempest.lib.test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseNetworkTest(neutron_lbaas.tests.tempest.lib.test.BaseTestCase): diff --git a/neutron_lbaas/tests/tempest/v1/api/clients.py b/neutron_lbaas/tests/tempest/v1/api/clients.py index 962efa6e6..1724ffabe 100644 --- a/neutron_lbaas/tests/tempest/v1/api/clients.py +++ b/neutron_lbaas/tests/tempest/v1/api/clients.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from neutron_lbaas.tests.tempest.lib.common import cred_provider from neutron_lbaas.tests.tempest.lib import config from neutron_lbaas.tests.tempest.lib import manager @@ -41,7 +39,6 @@ from neutron_lbaas.tests.tempest.lib.services.network.json.network_client import CONF = config.CONF -LOG = logging.getLogger(__name__) class Manager(manager.Manager): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_health_monitor_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_health_monitor_admin.py index 9ecf19d70..bca110d34 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_health_monitor_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_health_monitor_admin.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from oslo_utils import uuidutils from tempest_lib import exceptions as ex @@ -23,8 +22,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestHealthMonitors(base.BaseAdminTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_listeners_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_listeners_admin.py index b247954bc..e6cf25d70 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_listeners_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_listeners_admin.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as ex @@ -23,8 +22,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class ListenersTestJSON(base.BaseAdminTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py index 7f0652bdf..65a335d2e 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_listeners_non_admin.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions @@ -23,8 +22,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class ListenersTestJSON(base.BaseTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py index ee6fc0b05..507302f93 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_admin.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as ex @@ -22,8 +21,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class LoadBalancersTestJSON(base.BaseAdminTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py index 4648d4527..81dde96b4 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py @@ -15,7 +15,6 @@ from netaddr import IPAddress -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions @@ -25,8 +24,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class LoadBalancersTestJSON(base.BaseTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/api/test_members_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_members_admin.py index 0897629b2..4468daa4a 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_members_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_members_admin.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as ex @@ -22,8 +21,6 @@ from neutron_lbaas.tests.tempest.lib import test from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class MemberTestJSON(base.BaseAdminTestCase): """ diff --git a/neutron_lbaas/tests/tempest/v2/api/test_members_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_members_non_admin.py index 10ca8cec5..634feeacd 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_members_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_members_non_admin.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as ex @@ -23,8 +22,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) - class MemberTestJSON(base.BaseTestCase): diff --git a/neutron_lbaas/tests/tempest/v2/ddt/base_ddt.py b/neutron_lbaas/tests/tempest/v2/ddt/base_ddt.py index 3fc80ea0e..d045dbd5a 100644 --- a/neutron_lbaas/tests/tempest/v2/ddt/base_ddt.py +++ b/neutron_lbaas/tests/tempest/v2/ddt/base_ddt.py @@ -14,7 +14,6 @@ import os -from oslo_log import log as logging from tempest_lib.common.utils import data_utils import testscenarios @@ -25,7 +24,6 @@ from neutron_lbaas.tests.tempest.v2.api import base CONF = config.CONF -LOG = logging.getLogger(__name__) # Use local tempest conf if one is available. # This usually means we're running tests outside of devstack diff --git a/neutron_lbaas/tests/tempest/v2/ddt/test_health_monitor_admin_state_up.py b/neutron_lbaas/tests/tempest/v2/ddt/test_health_monitor_admin_state_up.py index 2c8aae9e2..7af3dfdef 100644 --- a/neutron_lbaas/tests/tempest/v2/ddt/test_health_monitor_admin_state_up.py +++ b/neutron_lbaas/tests/tempest/v2/ddt/test_health_monitor_admin_state_up.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib import decorators import testscenarios @@ -21,8 +20,6 @@ from neutron_lbaas.tests.tempest.v2.ddt import base_ddt CONF = config.CONF -LOG = logging.getLogger(__name__) - scenario_lb_T = ('lb_T', {'lb_flag': True}) scenario_lb_F = ('lb_F', {'lb_flag': False}) diff --git a/neutron_lbaas/tests/tempest/v2/ddt/test_listeners_admin_state.py b/neutron_lbaas/tests/tempest/v2/ddt/test_listeners_admin_state.py index e5c311c24..e1674c257 100644 --- a/neutron_lbaas/tests/tempest/v2/ddt/test_listeners_admin_state.py +++ b/neutron_lbaas/tests/tempest/v2/ddt/test_listeners_admin_state.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging import testscenarios from neutron_lbaas.tests.tempest.lib import config @@ -20,7 +19,6 @@ from neutron_lbaas.tests.tempest.v2.ddt import base_ddt CONF = config.CONF -LOG = logging.getLogger(__name__) """ Tests the following operations in the Neutron-LBaaS API using the diff --git a/neutron_lbaas/tests/tempest/v2/ddt/test_members_admin_state_up.py b/neutron_lbaas/tests/tempest/v2/ddt/test_members_admin_state_up.py index 452c1d59b..20d625480 100644 --- a/neutron_lbaas/tests/tempest/v2/ddt/test_members_admin_state_up.py +++ b/neutron_lbaas/tests/tempest/v2/ddt/test_members_admin_state_up.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging import testscenarios from neutron_lbaas.tests.tempest.lib import config @@ -20,7 +19,6 @@ from neutron_lbaas.tests.tempest.v2.ddt import base_ddt CONF = config.CONF -LOG = logging.getLogger(__name__) """ Tests the following operations in the Neutron-LBaaS API using the