diff --git a/tempest/api/compute/images/test_list_image_filters.py b/tempest/api/compute/images/test_list_image_filters.py index 49d9bc89c7..af840cc6a5 100644 --- a/tempest/api/compute/images/test_list_image_filters.py +++ b/tempest/api/compute/images/test_list_image_filters.py @@ -15,7 +15,6 @@ import time -from oslo_log import log as logging import six import testtools @@ -27,8 +26,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class ListImageFiltersTestJSON(base.BaseV2ComputeTest): diff --git a/tempest/api/database/base.py b/tempest/api/database/base.py index f4c1881bbc..01e05dbd9f 100644 --- a/tempest/api/database/base.py +++ b/tempest/api/database/base.py @@ -13,13 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest import config import tempest.test CONF = config.CONF -LOG = logging.getLogger(__name__) class BaseDatabaseTest(tempest.test.BaseTestCase): diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index 18d04460ab..ade7b6768d 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.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 six import moves from tempest_lib import exceptions as lib_exc @@ -22,8 +21,6 @@ import tempest.test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseImageTest(tempest.test.BaseTestCase): """Base test class for Image API tests.""" diff --git a/tempest/api/messaging/base.py b/tempest/api/messaging/base.py index 528fbea1ea..a324c37702 100644 --- a/tempest/api/messaging/base.py +++ b/tempest/api/messaging/base.py @@ -13,16 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from oslo_log import log as logging - from tempest.common.utils import data_utils from tempest import config from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseMessagingTest(test.BaseTestCase): diff --git a/tempest/api/messaging/test_claims.py b/tempest/api/messaging/test_claims.py index 57b8c7f514..99edde179c 100644 --- a/tempest/api/messaging/test_claims.py +++ b/tempest/api/messaging/test_claims.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging - from six.moves.urllib import parse as urlparse from tempest_lib import decorators @@ -24,7 +22,6 @@ from tempest import config from tempest import test -LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/tempest/api/messaging/test_messages.py b/tempest/api/messaging/test_messages.py index efbbf56f7a..7f4182a997 100644 --- a/tempest/api/messaging/test_messages.py +++ b/tempest/api/messaging/test_messages.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from tempest.api.messaging import base from tempest.common.utils import data_utils @@ -21,7 +20,6 @@ from tempest import config from tempest import test -LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/tempest/api/messaging/test_queues.py b/tempest/api/messaging/test_queues.py index df496636c7..dcb54504f0 100644 --- a/tempest/api/messaging/test_queues.py +++ b/tempest/api/messaging/test_queues.py @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from six import moves from tempest_lib import exceptions as lib_exc @@ -24,9 +23,6 @@ from tempest.common.utils import data_utils from tempest import test -LOG = logging.getLogger(__name__) - - class TestQueues(base.BaseMessagingTest): @test.attr(type='smoke') diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py index 2a1776a2a2..81337f3db5 100644 --- a/tempest/api/network/base.py +++ b/tempest/api/network/base.py @@ -14,7 +14,6 @@ # under the License. import netaddr -from oslo_log import log as logging from tempest_lib import exceptions as lib_exc from tempest.common.utils import data_utils @@ -24,8 +23,6 @@ import tempest.test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseNetworkTest(tempest.test.BaseTestCase): """Base class for the Neutron tests diff --git a/tempest/api/network/test_metering_extensions.py b/tempest/api/network/test_metering_extensions.py index 007ba3b23d..299700fab3 100644 --- a/tempest/api/network/test_metering_extensions.py +++ b/tempest/api/network/test_metering_extensions.py @@ -12,16 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest.api.network import base from tempest.common.utils import data_utils from tempest import test -LOG = logging.getLogger(__name__) - - class MeteringTestJSON(base.BaseAdminNetworkTest): """Tests the following operations in the Neutron API: diff --git a/tempest/api/orchestration/base.py b/tempest/api/orchestration/base.py index 496883595c..c93b5eda7d 100644 --- a/tempest/api/orchestration/base.py +++ b/tempest/api/orchestration/base.py @@ -12,7 +12,6 @@ import os.path -from oslo_log import log as logging from tempest_lib import exceptions as lib_exc import yaml @@ -22,8 +21,6 @@ import tempest.test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseOrchestrationTest(tempest.test.BaseTestCase): """Base test case class for all Orchestration API tests.""" diff --git a/tempest/api/orchestration/stacks/test_environment.py b/tempest/api/orchestration/stacks/test_environment.py index 0416bc7c17..9d2b42570e 100644 --- a/tempest/api/orchestration/stacks/test_environment.py +++ b/tempest/api/orchestration/stacks/test_environment.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from tempest.api.orchestration import base from tempest.common.utils import data_utils from tempest import config @@ -19,7 +17,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) class StackEnvironmentTest(base.BaseOrchestrationTest): diff --git a/tempest/api/orchestration/stacks/test_limits.py b/tempest/api/orchestration/stacks/test_limits.py index bb5b89da93..2acf97b7ac 100644 --- a/tempest/api/orchestration/stacks/test_limits.py +++ b/tempest/api/orchestration/stacks/test_limits.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base @@ -21,8 +19,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestServerStackLimits(base.BaseOrchestrationTest): diff --git a/tempest/api/orchestration/stacks/test_non_empty_stack.py b/tempest/api/orchestration/stacks/test_non_empty_stack.py index 4bc2c1734b..3be5bb613e 100644 --- a/tempest/api/orchestration/stacks/test_non_empty_stack.py +++ b/tempest/api/orchestration/stacks/test_non_empty_stack.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from tempest.api.orchestration import base from tempest.common.utils import data_utils from tempest import config @@ -19,8 +17,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class StacksTestJSON(base.BaseOrchestrationTest): diff --git a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py index b4d7fa06ed..0400e769e3 100644 --- a/tempest/api/orchestration/stacks/test_nova_keypair_resources.py +++ b/tempest/api/orchestration/stacks/test_nova_keypair_resources.py @@ -10,17 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. - -import logging - from tempest.api.orchestration import base from tempest.common.utils import data_utils from tempest import test -LOG = logging.getLogger(__name__) - - class NovaKeyPairResourcesYAMLTest(base.BaseOrchestrationTest): _tpl_type = 'yaml' _resource = 'resources' diff --git a/tempest/api/orchestration/stacks/test_soft_conf.py b/tempest/api/orchestration/stacks/test_soft_conf.py index 34d93e4d80..ab45929ccc 100644 --- a/tempest/api/orchestration/stacks/test_soft_conf.py +++ b/tempest/api/orchestration/stacks/test_soft_conf.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base @@ -18,7 +17,6 @@ from tempest.common.utils import data_utils from tempest import config from tempest import test -LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/tempest/api/orchestration/stacks/test_stacks.py b/tempest/api/orchestration/stacks/test_stacks.py index f766b0048c..28463abb05 100644 --- a/tempest/api/orchestration/stacks/test_stacks.py +++ b/tempest/api/orchestration/stacks/test_stacks.py @@ -10,16 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest.api.orchestration import base from tempest.common.utils import data_utils from tempest import test -LOG = logging.getLogger(__name__) - - class StacksTestJSON(base.BaseOrchestrationTest): empty_template = "HeatTemplateFormatVersion: '2012-12-12'\n" diff --git a/tempest/api/orchestration/stacks/test_volumes.py b/tempest/api/orchestration/stacks/test_volumes.py index ae9a41104c..e51551ba43 100644 --- a/tempest/api/orchestration/stacks/test_volumes.py +++ b/tempest/api/orchestration/stacks/test_volumes.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from tempest_lib import exceptions as lib_exc from tempest.api.orchestration import base @@ -21,7 +19,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) class CinderResourcesTest(base.BaseOrchestrationTest): diff --git a/tempest/api/volume/admin/test_multi_backend.py b/tempest/api/volume/admin/test_multi_backend.py index 8e43b00a63..60e6e6cabc 100644 --- a/tempest/api/volume/admin/test_multi_backend.py +++ b/tempest/api/volume/admin/test_multi_backend.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging import six from tempest.api.volume import base from tempest.common.utils import data_utils @@ -19,8 +18,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class VolumeMultiBackendV2Test(base.BaseVolumeAdminTest): diff --git a/tempest/api/volume/admin/test_volumes_backup.py b/tempest/api/volume/admin/test_volumes_backup.py index ed34a9b41c..4b2d3f3ce2 100644 --- a/tempest/api/volume/admin/test_volumes_backup.py +++ b/tempest/api/volume/admin/test_volumes_backup.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 import decorators from tempest.api.volume import base @@ -22,7 +21,6 @@ from tempest import config from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) class VolumesBackupsV2Test(base.BaseVolumeAdminTest): diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index 84e250eb3c..cc906e5808 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.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 import exceptions as lib_exc from tempest.common import compute @@ -24,8 +23,6 @@ import tempest.test CONF = config.CONF -LOG = logging.getLogger(__name__) - class BaseVolumeTest(tempest.test.BaseTestCase): """Base test case class for all Cinder API tests.""" diff --git a/tempest/api/volume/test_volumes_list.py b/tempest/api/volume/test_volumes_list.py index b776494f86..38a5a80729 100644 --- a/tempest/api/volume/test_volumes_list.py +++ b/tempest/api/volume/test_volumes_list.py @@ -15,15 +15,12 @@ # under the License. import operator -from oslo_log import log as logging from testtools import matchers from tempest.api.volume import base from tempest.common.utils import data_utils from tempest import test -LOG = logging.getLogger(__name__) - class VolumesV2ListTestJSON(base.BaseVolumeTest): # NOTE: This test creates a number of 1G volumes. To run successfully, diff --git a/tempest/api/volume/test_volumes_snapshots.py b/tempest/api/volume/test_volumes_snapshots.py index 7e57003fae..c79235ad3f 100644 --- a/tempest/api/volume/test_volumes_snapshots.py +++ b/tempest/api/volume/test_volumes_snapshots.py @@ -10,14 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest.api.volume import base from tempest.common.utils import data_utils from tempest import config from tempest import test -LOG = logging.getLogger(__name__) CONF = config.CONF diff --git a/tempest/common/cred_provider.py b/tempest/common/cred_provider.py index aa237e0411..9dd89ea348 100644 --- a/tempest/common/cred_provider.py +++ b/tempest/common/cred_provider.py @@ -14,14 +14,11 @@ import abc -from oslo_log import log as logging import six from tempest_lib import auth from tempest import exceptions -LOG = logging.getLogger(__name__) - @six.add_metaclass(abc.ABCMeta) class CredentialProvider(object): diff --git a/tempest/common/credentials_factory.py b/tempest/common/credentials_factory.py index 5d290d44f7..24c1198a16 100644 --- a/tempest/common/credentials_factory.py +++ b/tempest/common/credentials_factory.py @@ -12,7 +12,6 @@ # limitations under the License. from oslo_concurrency import lockutils -from oslo_log import log as logging from tempest_lib import auth from tempest import clients @@ -23,7 +22,6 @@ from tempest import config from tempest import exceptions CONF = config.CONF -LOG = logging.getLogger(__name__) """This module provides factories of credential and credential providers diff --git a/tempest/common/generator/base_generator.py b/tempest/common/generator/base_generator.py index a66002f242..3a51f2e6ec 100644 --- a/tempest/common/generator/base_generator.py +++ b/tempest/common/generator/base_generator.py @@ -17,11 +17,8 @@ import copy import functools import jsonschema -from oslo_log import log as logging import six -LOG = logging.getLogger(__name__) - def _check_for_expected_result(name, schema): expected_result = None diff --git a/tempest/common/generator/negative_generator.py b/tempest/common/generator/negative_generator.py index 17997a520b..67ace5499d 100644 --- a/tempest/common/generator/negative_generator.py +++ b/tempest/common/generator/negative_generator.py @@ -15,13 +15,9 @@ import copy -from oslo_log import log as logging - import tempest.common.generator.base_generator as base import tempest.common.generator.valid_generator as valid -LOG = logging.getLogger(__name__) - class NegativeTestGenerator(base.BasicGeneratorSet): @base.generator_type("string") diff --git a/tempest/common/generator/valid_generator.py b/tempest/common/generator/valid_generator.py index 2213b4a3ce..3070489d60 100644 --- a/tempest/common/generator/valid_generator.py +++ b/tempest/common/generator/valid_generator.py @@ -13,15 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging import six import tempest.common.generator.base_generator as base -LOG = logging.getLogger(__name__) - - class ValidTestGenerator(base.BasicGeneratorSet): @base.generator_type("string") @base.simple_generator diff --git a/tempest/scenario/test_aggregates_basic_ops.py b/tempest/scenario/test_aggregates_basic_ops.py index 62c026243a..97a755d31a 100644 --- a/tempest/scenario/test_aggregates_basic_ops.py +++ b/tempest/scenario/test_aggregates_basic_ops.py @@ -13,17 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest.common import tempest_fixtures as fixtures from tempest.common.utils import data_utils from tempest.scenario import manager from tempest import test -LOG = logging.getLogger(__name__) - - class TestAggregatesBasicOps(manager.ScenarioTest): """Creates an aggregate within an availability zone diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py index b549ecbd14..402077f3a2 100644 --- a/tempest/scenario/test_large_ops.py +++ b/tempest/scenario/test_large_ops.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 import exceptions as lib_exc from tempest.common import fixed_network @@ -26,9 +25,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - - class TestLargeOpsScenario(manager.ScenarioTest): """Test large operations. diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py index 2ef3ceef83..ff9dabf991 100644 --- a/tempest/scenario/test_minimum_basic.py +++ b/tempest/scenario/test_minimum_basic.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 tempest.common import custom_matchers from tempest.common import waiters from tempest import config @@ -24,8 +22,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestMinimumBasicScenario(manager.ScenarioTest): diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index d6dd6f36d4..2cbe6dc274 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging import testtools from tempest.common.utils import data_utils @@ -23,7 +22,6 @@ from tempest.scenario import manager from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): diff --git a/tempest/scenario/test_network_v6.py b/tempest/scenario/test_network_v6.py index 40c76808bd..cc2887306a 100644 --- a/tempest/scenario/test_network_v6.py +++ b/tempest/scenario/test_network_v6.py @@ -14,7 +14,6 @@ # under the License. import functools -from oslo_log import log as logging import six from tempest import config @@ -23,7 +22,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) class TestGettingAddress(manager.NetworkScenarioTest): diff --git a/tempest/scenario/test_object_storage_basic_ops.py b/tempest/scenario/test_object_storage_basic_ops.py index 98dd705bb0..63ffa0b403 100644 --- a/tempest/scenario/test_object_storage_basic_ops.py +++ b/tempest/scenario/test_object_storage_basic_ops.py @@ -13,16 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging - from tempest import config from tempest.scenario import manager from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestObjectStorageBasicOps(manager.ObjectStorageScenarioTest): """Test swift basic ops. diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index 783b740b74..018589983c 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.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 tempest import clients from tempest.common.utils import data_utils from tempest import config @@ -23,8 +21,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): diff --git a/tempest/scenario/test_server_multinode.py b/tempest/scenario/test_server_multinode.py index f21ff4fdd4..0cf72c303f 100644 --- a/tempest/scenario/test_server_multinode.py +++ b/tempest/scenario/test_server_multinode.py @@ -14,8 +14,6 @@ # under the License. -from oslo_log import log as logging - from tempest import config from tempest import exceptions from tempest.scenario import manager @@ -23,8 +21,6 @@ from tempest import test CONF = config.CONF -LOG = logging.getLogger(__name__) - class TestServerMultinode(manager.ScenarioTest): """This is a set of tests specific to multinode testing."""