Use new-style classes which inherit from object

JIRA: FUNCTEST-707

Change-Id: Ieaa888375136eddbbe003a24b32bf09fd0f92923
Signed-off-by: Linda Wang <wangwulin@huawei.com>

diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 80bcfc7..7a34a0e 100755 (executable)
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -44,7 +44,7 @@ with open(CONFIG_PATCH_PATH) as f:
     functest_patch_yaml = yaml.safe_load(f)
 
 
-class PrepareEnvParser():
+class PrepareEnvParser(object):
 
     def __init__(self):
         self.parser = argparse.ArgumentParser()

diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index 93518de..f920e70 100755 (executable)
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -48,7 +48,7 @@ class BlockingTestFailed(Exception):
     pass
 
 
-class RunTestsParser():
+class RunTestsParser(object):
 
     def __init__(self):
         self.parser = argparse.ArgumentParser()

diff --git a/functest/ci/tier_builder.py b/functest/ci/tier_builder.py
index e1c3e49..dae7c73 100755 (executable)
--- a/functest/ci/tier_builder.py
+++ b/functest/ci/tier_builder.py
@@ -11,7 +11,7 @@ import tier_handler as th
 import yaml
 
 
-class TierBuilder:
+class TierBuilder(object):
 
     def __init__(self, ci_installer, ci_scenario, testcases_file):
         self.ci_installer = ci_installer

diff --git a/functest/ci/tier_handler.py b/functest/ci/tier_handler.py
index 1eadfba..127986b 100755 (executable)
--- a/functest/ci/tier_handler.py
+++ b/functest/ci/tier_handler.py
@@ -28,7 +28,7 @@ def split_text(text, max_len):
     return lines
 
 
-class Tier:
+class Tier(object):
 
     def __init__(self, name, order, ci_loop, description=""):
         self.tests_array = []
@@ -102,7 +102,7 @@ class Tier:
         return out
 
 
-class TestCase:
+class TestCase(object):
 
     def __init__(self, name, dependency, criteria, blocking, description=""):
         self.name = name
@@ -160,7 +160,7 @@ class TestCase:
         return out
 
 
-class Dependency:
+class Dependency(object):
 
     def __init__(self, installer, scenario):
         self.installer = installer

diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index 9423631..14ad01b 100644 (file)
--- a/functest/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
@@ -16,7 +16,7 @@ from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
 
 
-class CliEnv:
+class CliEnv(object):
 
     def __init__(self):
         pass

diff --git a/functest/cli/commands/cli_os.py b/functest/cli/commands/cli_os.py
index aeb3497..f85f404 100644 (file)
--- a/functest/cli/commands/cli_os.py
+++ b/functest/cli/commands/cli_os.py
@@ -18,7 +18,7 @@ import functest.utils.openstack_clean as os_clean
 import functest.utils.openstack_snapshot as os_snapshot
 
 
-class CliOpenStack:
+class CliOpenStack(object):
 
     def __init__(self):
         self.os_auth_url = CONST.OS_AUTH_URL

diff --git a/functest/cli/commands/cli_testcase.py b/functest/cli/commands/cli_testcase.py
index b656624..6644a0c 100644 (file)
--- a/functest/cli/commands/cli_testcase.py
+++ b/functest/cli/commands/cli_testcase.py
@@ -19,7 +19,7 @@ import functest.utils.functest_utils as ft_utils
 import functest.utils.functest_vacation as vacation
 
 
-class CliTestcase:
+class CliTestcase(object):
 
     def __init__(self):
         self.tiers = tb.TierBuilder(CONST.INSTALLER_TYPE,

diff --git a/functest/cli/commands/cli_tier.py b/functest/cli/commands/cli_tier.py
index b9d25b6..012b11d 100644 (file)
--- a/functest/cli/commands/cli_tier.py
+++ b/functest/cli/commands/cli_tier.py
@@ -18,7 +18,7 @@ from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
 
 
-class CliTier:
+class CliTier(object):
 
     def __init__(self):
         self.tiers = tb.TierBuilder(CONST.INSTALLER_TYPE,

diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 9bff324..69818f5 100755 (executable)
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -186,7 +186,7 @@ class ODLTests(testcase_base.TestcaseBase):
         return self.main(suites, **kwargs)
 
 
-class ODLParser():
+class ODLParser(object):
 
     def __init__(self):
         self.parser = argparse.ArgumentParser()

diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
index 090502b..3708742 100644 (file)
--- a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
+++ b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
@@ -16,7 +16,7 @@ ACCEPTED = 202
 NO_CONTENT = 204
 
 
-class SfcOnos:
+class SfcOnos(object):
     """Defines all the def function of SFC."""
 
     def __init__(self):

diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
index bf2c430..2bef5cc 100644 (file)
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/foundation.py
@@ -21,7 +21,7 @@ import functest.utils.functest_constants as ft_constants
 import functest.utils.functest_utils as ft_utils
 
 
-class Foundation:
+class Foundation(object):
 
     def __init__(self):
 

diff --git a/functest/opnfv_tests/vnf/ims/clearwater.py b/functest/opnfv_tests/vnf/ims/clearwater.py
index eb0abac..32c6dc5 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/clearwater.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater.py
@@ -12,7 +12,7 @@
 ########################################################################
 
 
-class Clearwater:
+class Clearwater(object):
 
     def __init__(self, inputs={}, orchestrator=None, logger=None):
         self.config = inputs

diff --git a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
index 775b71c..82a9dca 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
+++ b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
@@ -21,7 +21,7 @@ from git import Repo
 import functest.utils.functest_logger as ft_logger
 
 
-class Orchestrator:
+class Orchestrator(object):
 
     def __init__(self, testcase_dir, inputs={}):
         self.testcase_dir = testcase_dir

diff --git a/functest/utils/functest_logger.py b/functest/utils/functest_logger.py
index 6dc46ef..022211c 100755 (executable)
--- a/functest/utils/functest_logger.py
+++ b/functest/utils/functest_logger.py
@@ -29,7 +29,7 @@ import json
 from functest.utils.constants import CONST
 
 
-class Logger:
+class Logger(object):
 
     def __init__(self, logger_name):
         self.setup_logging()