Merge "refactor vping using new constants provider"

[functest.git] / functest / opnfv_tests / openstack / vping / vping_base.py

diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
old mode 100644 (file)
new mode 100755 (executable)
index 00177a2..a5309bd
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -12,66 +12,61 @@ import pprint
 import time
 from datetime import datetime
 
-import functest.utils.functest_utils as ft_utils
-import functest.utils.functest_constants as ft_constants
+import functest.core.testcase_base as testcase_base
 import functest.utils.openstack_utils as os_utils
-from functest.core import TestCasesBase
+from functest.utils.constants import CONST
 
 
-class VPingBase(TestCasesBase.TestCasesBase):
+class VPingBase(testcase_base.TestcaseBase):
     def __init__(self):
-        def get_conf(parameter):
-            return ft_utils.get_functest_config(parameter)
-
         super(VPingBase, self).__init__()
         self.logger = None
-        self.functest_repo = ft_constants.FUNCTEST_REPO_DIR
-        self.repo = get_conf('general.directories.dir_vping')
-        self.vm1_name = get_conf('vping.vm_name_1')
-        self.vm2_name = get_conf('vping.vm_name_2')
+        self.functest_repo = CONST.dir_repo_functest
+        self.repo = CONST.dir_vping
+        self.vm1_name = CONST.vping_vm_name_1
+        self.vm2_name = CONST.vping_vm_name_2
         self.vm_boot_timeout = 180
         self.vm_delete_timeout = 100
-        self.ping_timeout = get_conf('vping.ping_timeout')
+        self.ping_timeout = CONST.vping_ping_timeout
 
-        self.image_name = get_conf('vping.image_name')
-        self.image_filename = get_conf('general.openstack.image_file_name')
-        self.image_format = get_conf('general.openstack.image_disk_format')
-        self.image_path = \
-            "%s/%s" % (get_conf('general.directories.dir_functest_data'),
-                       self.image_filename)
+        self.image_name = CONST.vping_image_name
+        self.image_filename = CONST.openstack_image_file_name
+        self.image_format = CONST.openstack_image_disk_format
+        self.image_path = os.path.join(CONST.dir_functest_data,
+                                       self.image_filename)
 
-        self.flavor_name = get_conf('vping.vm_flavor')
+        self.flavor_name = CONST.vping_vm_flavor
 
         # NEUTRON Private Network parameters
-        self.private_net_name = get_conf('vping.vping_private_net_name')
-        self.private_subnet_name = get_conf('vping.vping_private_subnet_name')
-        self.private_subnet_cidr = get_conf('vping.vping_private_subnet_cidr')
-        self.router_name = get_conf('vping.vping_router_name')
-        self.sg_name = get_conf('vping.vping_sg_name')
-        self.sg_desc = get_conf('vping.vping_sg_descr')
+        self.private_net_name = CONST.vping_private_net_name
+        self.private_subnet_name = CONST.vping_private_subnet_name
+        self.private_subnet_cidr = CONST.vping_private_subnet_cidr
+        self.router_name = CONST.vping_router_name
+        self.sg_name = CONST.vping_sg_name
+        self.sg_desc = CONST.vping_sg_desc
         self.neutron_client = os_utils.get_neutron_client()
         self.glance_client = os_utils.get_glance_client()
         self.nova_client = os_utils.get_nova_client()
 
     def run(self, **kwargs):
         if not self.check_repo_exist():
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         image_id = self.create_image()
         if not image_id:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         flavor = self.get_flavor()
         if not flavor:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         network_id = self.create_network_full()
         if not network_id:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         sg_id = self.create_security_group()
         if not sg_id:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         self.delete_exist_vms()
 
@@ -87,7 +82,7 @@ class VPingBase(TestCasesBase.TestCasesBase):
                            None,
                            sg_id)
         if not vm1:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         test_ip = self.get_test_ip(vm1)
         vm2 = self.boot_vm(self.vm2_name,
@@ -97,17 +92,17 @@ class VPingBase(TestCasesBase.TestCasesBase):
                            test_ip,
                            sg_id)
         if not vm2:
-            return TestCasesBase.TestCasesBase.EX_RUN_ERROR
+            return testcase_base.TestcaseBase.EX_RUN_ERROR
 
         EXIT_CODE = self.do_vping(vm2, test_ip)
-        if EXIT_CODE == TestCasesBase.TestCasesBase.EX_RUN_ERROR:
+        if EXIT_CODE == testcase_base.TestcaseBase.EX_RUN_ERROR:
             return EXIT_CODE
 
         self.stop_time = time.time()
         self.parse_result(EXIT_CODE,
                           self.start_time,
                           self.stop_time)
-        return TestCasesBase.TestCasesBase.EX_OK
+        return testcase_base.TestcaseBase.EX_OK
 
     def boot_vm_preparation(self, config, vmname, test_ip):
         pass