Merge "Switch TestcaseBase to TestCase"

8 files changed, 38 insertions, 38 deletions

diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 46d6a570..a45bc014 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -26,7 +26,7 @@ import functest.utils.openstack_utils as os_utils
 logger = ft_logger.Logger('Rally').getLogger()
 
 
-class RallyBase(testcase_base.TestcaseBase):
+class RallyBase(testcase_base.TestCase):
     TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
              'neutron', 'nova', 'quotas', 'requests', 'vm', 'all']
     GLANCE_IMAGE_NAME = CONST.openstack_image_name
@@ -526,10 +526,10 @@ class RallyBase(testcase_base.TestcaseBase):
             self._run_tests()
             self._generate_report()
             self._clean_up()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s' % e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         return res
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 4312b7f9..420c4ff9 100755
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -23,7 +23,7 @@ import functest.utils.functest_utils as ft_utils
 logger = ft_logger.Logger("refstack_defcore").getLogger()
 
 
-class RefstackClient(testcase_base.TestcaseBase):
+class RefstackClient(testcase_base.TestCase):
 
     def __init__(self):
         super(RefstackClient, self).__init__()
@@ -150,10 +150,10 @@ class RefstackClient(testcase_base.TestcaseBase):
             conf_utils.configure_tempest_defcore(
                 self.DEPLOYMENT_DIR, img_flavor_dict)
             self.source_venv()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except KeyError as e:
             logger.error("defcore prepare env error with: %s", e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         return res
 
@@ -167,10 +167,10 @@ class RefstackClient(testcase_base.TestcaseBase):
             self.defcore_env_prepare()
             self.run_defcore_default()
             self.parse_refstack_result()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s', e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         return res
@@ -187,15 +187,15 @@ class RefstackClient(testcase_base.TestcaseBase):
             openstack_utils.source_credentials(CONST.openstack_creds)
             self.defcore_env_prepare()
             self.run_defcore(tempestconf, testlist)
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s', e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         return res
 
 
-class RefstackClientParser(testcase_base.TestcaseBase):
+class RefstackClientParser(testcase_base.TestCase):
 
     def __init__(self):
         super(RefstackClientParser, self).__init__()
@@ -228,7 +228,7 @@ if __name__ == '__main__':
     args = parser.parse_args(sys.argv[1:])
     try:
         result = refstackclient.main(**args)
-        if result != testcase_base.TestcaseBase.EX_OK:
+        if result != testcase_base.TestCase.EX_OK:
             sys.exit(result)
     except Exception:
-        sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR)
+        sys.exit(testcase_base.TestCase.EX_RUN_ERROR)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 54556a32..d0119c9a 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -26,7 +26,7 @@ import functest.utils.functest_utils as ft_utils
 logger = ft_logger.Logger("Tempest").getLogger()
 
 
-class TempestCommon(testcase_base.TestcaseBase):
+class TempestCommon(testcase_base.TestCase):
 
     def __init__(self):
         super(TempestCommon, self).__init__()
@@ -223,10 +223,10 @@ class TempestCommon(testcase_base.TestcaseBase):
             self.apply_tempest_blacklist()
             self.run_verifier_tests()
             self.parse_verifier_result()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s' % e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         return res
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 9d57cfae..9074c5fa 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -17,7 +17,7 @@ import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
 
 
-class VPingBase(testcase_base.TestcaseBase):
+class VPingBase(testcase_base.TestCase):
     def __init__(self):
         super(VPingBase, self).__init__()
         self.logger = None
@@ -52,23 +52,23 @@ class VPingBase(testcase_base.TestcaseBase):
 
     def run(self, **kwargs):
         if not self.check_repo_exist():
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         image_id = self.create_image()
         if not image_id:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         flavor = self.get_flavor()
         if not flavor:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         network_id = self.create_network_full()
         if not network_id:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         sg_id = self.create_security_group()
         if not sg_id:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         self.delete_exist_vms()
 
@@ -84,7 +84,7 @@ class VPingBase(testcase_base.TestcaseBase):
                            None,
                            sg_id)
         if not vm1:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         test_ip = self.get_test_ip(vm1)
         vm2 = self.boot_vm(self.vm2_name,
@@ -94,17 +94,17 @@ class VPingBase(testcase_base.TestcaseBase):
                            test_ip,
                            sg_id)
         if not vm2:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
 
         EXIT_CODE = self.do_vping(vm2, test_ip)
-        if EXIT_CODE == testcase_base.TestcaseBase.EX_RUN_ERROR:
+        if EXIT_CODE == testcase_base.TestCase.EX_RUN_ERROR:
             return EXIT_CODE
 
         self.stop_time = time.time()
         self.parse_result(EXIT_CODE,
                           self.start_time,
                           self.stop_time)
-        return testcase_base.TestcaseBase.EX_OK
+        return testcase_base.TestCase.EX_OK
 
     def boot_vm_preparation(self, config, vmname, test_ip):
         pass
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index 7a58a41f..b29f3269 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -32,12 +32,12 @@ class VPingSSH(vping_base.VPingBase):
     def do_vping(self, vm, test_ip):
         floatip = self.add_float_ip(vm)
         if not floatip:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
         ssh = self.establish_ssh(vm, floatip)
         if not ssh:
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
         if not self.transfer_ping_script(ssh, floatip):
-            return testcase_base.TestcaseBase.EX_RUN_ERROR
+            return testcase_base.TestCase.EX_RUN_ERROR
         return self.do_vping_ssh(ssh, test_ip)
 
     def add_float_ip(self, vm):
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index c8e9c492..3d6be9a8 100755
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -46,7 +46,7 @@ class ODLResultVisitor(robot.api.ResultVisitor):
         return self._data
 
 
-class ODLTests(testcase_base.TestcaseBase):
+class ODLTests(testcase_base.TestCase):
 
     repos = "/home/opnfv/repos/"
     odl_test_repo = os.path.join(repos, "odl_test")
@@ -59,7 +59,7 @@ class ODLTests(testcase_base.TestcaseBase):
     logger = ft_logger.Logger("opendaylight").getLogger()
 
     def __init__(self):
-        testcase_base.TestcaseBase.__init__(self)
+        testcase_base.TestCase.__init__(self)
         self.case_name = "odl"
 
     @classmethod
@@ -236,9 +236,9 @@ if __name__ == '__main__':
     args = parser.parse_args(sys.argv[1:])
     try:
         result = odl.main(ODLTests.default_suites, **args)
-        if result != testcase_base.TestcaseBase.EX_OK:
+        if result != testcase_base.TestCase.EX_OK:
             sys.exit(result)
         if args['pushtodb']:
             sys.exit(odl.push_to_db())
     except Exception:
-        sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR)
+        sys.exit(testcase_base.TestCase.EX_RUN_ERROR)
diff --git a/functest/opnfv_tests/sdn/onos/onos.py b/functest/opnfv_tests/sdn/onos/onos.py
index 8bc73832..5764bdee 100644
--- a/functest/opnfv_tests/sdn/onos/onos.py
+++ b/functest/opnfv_tests/sdn/onos/onos.py
@@ -24,7 +24,7 @@ import functest.utils.openstack_utils as openstack_utils
 logger = ft_logger.Logger(__name__).getLogger()
 
 
-class OnosBase(testcase_base.TestcaseBase):
+class OnosBase(testcase_base.TestCase):
     onos_repo_path = CONST.dir_repo_onos
     onos_sfc_image_name = CONST.onos_sfc_image_name
     onos_sfc_image_path = os.path.join(CONST.dir_functest_data,
@@ -39,10 +39,10 @@ class OnosBase(testcase_base.TestcaseBase):
         self.start_time = time.time()
         try:
             self._run()
-            res = testcase_base.TestcaseBase.EX_OK
+            res = testcase_base.TestCase.EX_OK
         except Exception as e:
             logger.error('Error with run: %s', e)
-            res = testcase_base.TestcaseBase.EX_RUN_ERROR
+            res = testcase_base.TestCase.EX_RUN_ERROR
 
         self.stop_time = time.time()
         return res
diff --git a/functest/opnfv_tests/vnf/aaa/aaa.py b/functest/opnfv_tests/vnf/aaa/aaa.py
index f1c265f4..8737924f 100755
--- a/functest/opnfv_tests/vnf/aaa/aaa.py
+++ b/functest/opnfv_tests/vnf/aaa/aaa.py
@@ -62,9 +62,9 @@ if __name__ == '__main__':
     aaa_vnf = AaaVnf()
     try:
         result = aaa_vnf.main(**args)
-        if result != testcase_base.TestcaseBase.EX_OK:
+        if result != testcase_base.TestCase.EX_OK:
             sys.exit(result)
         if args['pushtodb']:
             sys.exit(aaa_vnf.push_to_db())
     except Exception:
-        sys.exit(testcase_base.TestcaseBase.EX_RUN_ERROR)
+        sys.exit(testcase_base.TestCase.EX_RUN_ERROR)