Rename testcase_base to testcase

It simply removes the useless suffix.

Change-Id: Ib9a682b57d8f33518359d817a593bb3786577390
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index 9074c5fa..584ded38 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -12,12 +12,12 @@ import pprint
 import time
 from datetime import datetime
 
-import functest.core.testcase_base as testcase_base
+import functest.core.testcase as testcase
 import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
 
 
-class VPingBase(testcase_base.TestCase):
+class VPingBase(testcase.TestCase):
     def __init__(self):
         super(VPingBase, self).__init__()
         self.logger = None
@@ -52,23 +52,23 @@ class VPingBase(testcase_base.TestCase):
 
     def run(self, **kwargs):
         if not self.check_repo_exist():
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         image_id = self.create_image()
         if not image_id:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         flavor = self.get_flavor()
         if not flavor:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         network_id = self.create_network_full()
         if not network_id:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         sg_id = self.create_security_group()
         if not sg_id:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         self.delete_exist_vms()
 
@@ -84,7 +84,7 @@ class VPingBase(testcase_base.TestCase):
                            None,
                            sg_id)
         if not vm1:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.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.TestCase):
                            test_ip,
                            sg_id)
         if not vm2:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
 
         EXIT_CODE = self.do_vping(vm2, test_ip)
-        if EXIT_CODE == testcase_base.TestCase.EX_RUN_ERROR:
+        if EXIT_CODE == testcase.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.TestCase.EX_OK
+        return testcase.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 b29f3269..fc2f01c6 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -19,7 +19,7 @@ from scp import SCPClient
 import functest.utils.functest_logger as ft_logger
 import functest.utils.openstack_utils as os_utils
 import vping_base
-import functest.core.testcase_base as testcase_base
+import functest.core.testcase as testcase
 
 
 class VPingSSH(vping_base.VPingBase):
@@ -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.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
         ssh = self.establish_ssh(vm, floatip)
         if not ssh:
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
         if not self.transfer_ping_script(ssh, floatip):
-            return testcase_base.TestCase.EX_RUN_ERROR
+            return testcase.TestCase.EX_RUN_ERROR
         return self.do_vping_ssh(ssh, test_ip)
 
     def add_float_ip(self, vm):