make use of functest_utils.get_parameter_from_yaml

JIRA: FUNCTEST-463

Change-Id: I1d54a65c5bfa2542f2fd3a2e408967641e6e4ac9
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>

5 files changed, 122 insertions, 116 deletions

diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py
index 3d41e5dde..50cdf8a57 100755
--- a/testcases/OpenStack/examples/create_instance_and_ip.py
+++ b/testcases/OpenStack/examples/create_instance_and_ip.py
@@ -32,33 +32,30 @@ HOME = os.environ['HOME'] + "/"
 
 VM_BOOT_TIMEOUT = 180
 
-INSTANCE_NAME = ft_utils.get_parameter_from_yaml("example.example_vm_name")
-FLAVOR = ft_utils.get_parameter_from_yaml("example.example_flavor")
-IMAGE_NAME = ft_utils.get_parameter_from_yaml("example.example_image_name")
-IMAGE_FILENAME = ft_utils.get_parameter_from_yaml(
-    "general.openstack.image_file_name")
-IMAGE_FORMAT = ft_utils.get_parameter_from_yaml(
-    "general.openstack.image_disk_format")
-IMAGE_PATH = ft_utils.get_parameter_from_yaml(
-    "general.directories.dir_functest_data") + "/" + IMAGE_FILENAME
+INSTANCE_NAME = ft_utils.get_functest_config("example.example_vm_name")
+FLAVOR = ft_utils.get_functest_config("example.example_flavor")
+IMAGE_NAME = ft_utils.get_functest_config("example.example_image_name")
+IMAGE_FILENAME = \
+    ft_utils.get_functest_config("general.openstack.image_file_name")
+IMAGE_FORMAT = \
+    ft_utils.get_functest_config("general.openstack.image_disk_format")
+IMAGE_PATH = \
+    ft_utils.get_functest_config("general.directories.dir_functest_data") + \
+    "/" + IMAGE_FILENAME
 
 # NEUTRON Private Network parameters
 
-NET_NAME = ft_utils.get_parameter_from_yaml(
-    "example.example_private_net_name")
-SUBNET_NAME = ft_utils.get_parameter_from_yaml(
-    "example.example_private_subnet_name")
-SUBNET_CIDR = ft_utils.get_parameter_from_yaml(
-    "example.example_private_subnet_cidr")
-ROUTER_NAME = ft_utils.get_parameter_from_yaml(
-    "example.example_router_name")
-
-SECGROUP_NAME = ft_utils.get_parameter_from_yaml(
-    "example.example_sg_name")
-SECGROUP_DESCR = ft_utils.get_parameter_from_yaml(
-    "example.example_sg_descr")
-
-TEST_DB = ft_utils.get_parameter_from_yaml("results.test_db_url")
+NET_NAME = ft_utils.get_functest_config("example.example_private_net_name")
+SUBNET_NAME = \
+    ft_utils.get_functest_config("example.example_private_subnet_name")
+SUBNET_CIDR = \
+    ft_utils.get_functest_config("example.example_private_subnet_cidr")
+ROUTER_NAME = ft_utils.get_functest_config("example.example_router_name")
+
+SECGROUP_NAME = ft_utils.get_functest_config("example.example_sg_name")
+SECGROUP_DESCR = ft_utils.get_functest_config("example.example_sg_descr")
+
+TEST_DB = ft_utils.get_functest_config("results.test_db_url")
 
 
 def main():
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index 536b4a5c2..29fd0a334 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -26,7 +26,7 @@ import iniparse
 import yaml
 
 import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as functest_utils
+import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
 
 tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone',
@@ -72,11 +72,9 @@ else:
 logger = ft_logger.Logger("run_rally").getLogger()
 
 
-functest_yaml = functest_utils.get_functest_yaml()
-
 HOME = os.environ['HOME'] + "/"
-RALLY_DIR = functest_utils.FUNCTEST_REPO + '/' + \
-            functest_yaml.get("general").get("directories").get("dir_rally")
+RALLY_DIR = ft_utils.FUNCTEST_REPO + '/' + \
+            ft_utils.get_functest_config('general.directories.dir_rally')
 TEMPLATE_DIR = RALLY_DIR + "scenario/templates"
 SUPPORT_DIR = RALLY_DIR + "scenario/support"
 TEMP_DIR = RALLY_DIR + "var"
@@ -88,25 +86,27 @@ TENANTS_AMOUNT = 3
 ITERATIONS_AMOUNT = 10
 CONCURRENCY = 4
 
-RESULTS_DIR = functest_yaml.get("general").get("directories").get(
-    "dir_rally_res")
-TEMPEST_CONF_FILE = functest_yaml.get("general").get("directories").get(
-    "dir_results") + '/tempest/tempest.conf'
-TEST_DB = functest_yaml.get("results").get("test_db_url")
-
-PRIVATE_NET_NAME = functest_yaml.get("rally").get("network_name")
-PRIVATE_SUBNET_NAME = functest_yaml.get("rally").get("subnet_name")
-PRIVATE_SUBNET_CIDR = functest_yaml.get("rally").get("subnet_cidr")
-ROUTER_NAME = functest_yaml.get("rally").get("router_name")
-
-GLANCE_IMAGE_NAME = functest_yaml.get("general").get("openstack").get(
-    "image_name")
-GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get("openstack").get(
-    "image_file_name")
-GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get("openstack").get(
-    "image_disk_format")
-GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get(
-    "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME
+RESULTS_DIR = \
+    ft_utils.get_functest_config('general.directories.dir_rally_res')
+TEMPEST_CONF_FILE = \
+    ft_utils.get_functest_config('general.directories.dir_results') + \
+    '/tempest/tempest.conf'
+TEST_DB = ft_utils.get_functest_config('results.test_db_url')
+
+PRIVATE_NET_NAME = ft_utils.get_functest_config('rally.network_name')
+PRIVATE_SUBNET_NAME = ft_utils.get_functest_config('rally.subnet_name')
+PRIVATE_SUBNET_CIDR = ft_utils.get_functest_config('rally.subnet_cidr')
+ROUTER_NAME = ft_utils.get_functest_config('rally.router_name')
+
+GLANCE_IMAGE_NAME = \
+    ft_utils.get_functest_config('general.openstack.image_name')
+GLANCE_IMAGE_FILENAME = \
+    ft_utils.get_functest_config('general.openstack.image_file_name')
+GLANCE_IMAGE_FORMAT = \
+    ft_utils.get_functest_config('general.openstack.image_disk_format')
+GLANCE_IMAGE_PATH = \
+    ft_utils.get_functest_config('general.directories.dir_functest_data') + \
+    "/" + GLANCE_IMAGE_FILENAME
 
 CINDER_VOLUME_TYPE_NAME = "volume_test"
 
@@ -409,12 +409,12 @@ def run_task(test_name):
     if args.report:
         stop_time = time.time()
         logger.debug("Push Rally detailed results into DB")
-        functest_utils.push_results_to_db("functest",
-                                          "Rally_details",
-                                          start_time,
-                                          stop_time,
-                                          status,
-                                          json_data)
+        ft_utils.push_results_to_db("functest",
+                                    "Rally_details",
+                                    start_time,
+                                    stop_time,
+                                    status,
+                                    json_data)
 
 
 def main():
@@ -533,7 +533,7 @@ def main():
         case_name = "rally_full"
 
     # Evaluation of the success criteria
-    status = functest_utils.check_success_rate(case_name, success_rate)
+    status = ft_utils.check_success_rate(case_name, success_rate)
 
     exit_code = -1
     if status == "PASS":
@@ -541,12 +541,12 @@ def main():
 
     if args.report:
         logger.debug("Pushing Rally summary into DB...")
-        functest_utils.push_results_to_db("functest",
-                                          case_name,
-                                          start_time,
-                                          stop_time,
-                                          status,
-                                          payload)
+        ft_utils.push_results_to_db("functest",
+                                    case_name,
+                                    start_time,
+                                    stop_time,
+                                    status,
+                                    payload)
     if args.noclean:
         exit(exit_code)
 
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py
index 688a92402..ca671d00d 100755
--- a/testcases/OpenStack/tempest/gen_tempest_conf.py
+++ b/testcases/OpenStack/tempest/gen_tempest_conf.py
@@ -55,10 +55,10 @@ def configure_tempest_multisite(deployment_dir):
         kingbird_conf_path = "/etc/kingbird/kingbird.conf"
         installer_type = os.getenv('INSTALLER_TYPE', 'Unknown')
         installer_ip = os.getenv('INSTALLER_IP', 'Unknown')
-        installer_username = ft_utils.get_parameter_from_yaml(
+        installer_username = ft_utils.get_functest_config(
             "multisite." + installer_type +
             "_environment.installer_username")
-        installer_password = ft_utils.get_parameter_from_yaml(
+        installer_password = ft_utils.get_functest_config(
             "multisite." + installer_type +
             "_environment.installer_password")
 
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index c426eb63e..2f24e96de 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -58,39 +58,49 @@ args = parser.parse_args()
 """ logging configuration """
 logger = ft_logger.Logger("run_tempest").getLogger()
 
-functest_yaml = ft_utils.get_functest_yaml()
-TEST_DB = functest_yaml.get("results").get("test_db_url")
+TEST_DB = ft_utils.get_functest_config('results.test_db_url')
 
 MODE = "smoke"
-GLANCE_IMAGE_NAME = functest_yaml.get("general").get(
-    "openstack").get("image_name")
-GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get(
-    "openstack").get("image_file_name")
-GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get(
-    "openstack").get("image_disk_format")
-GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get(
-    "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME
-PRIVATE_NET_NAME = functest_yaml.get("tempest").get("private_net_name")
-PRIVATE_SUBNET_NAME = functest_yaml.get("tempest").get("private_subnet_name")
-PRIVATE_SUBNET_CIDR = functest_yaml.get("tempest").get("private_subnet_cidr")
-ROUTER_NAME = functest_yaml.get("tempest").get("router_name")
-TENANT_NAME = functest_yaml.get("tempest").get("identity").get("tenant_name")
-TENANT_DESCRIPTION = functest_yaml.get("tempest").get("identity").get(
-    "tenant_description")
-USER_NAME = functest_yaml.get("tempest").get("identity").get("user_name")
-USER_PASSWORD = functest_yaml.get("tempest").get("identity").get(
-    "user_password")
-SSH_TIMEOUT = functest_yaml.get("tempest").get("validation").get(
-    "ssh_timeout")
-DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name")
-RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get(
-    "dir_rally_inst")
-RESULTS_DIR = functest_yaml.get("general").get("directories").get(
-    "dir_results")
+GLANCE_IMAGE_NAME = \
+    ft_utils.get_functest_config('general.openstack.image_name')
+GLANCE_IMAGE_FILENAME = \
+    ft_utils.get_functest_config('general.openstack.image_file_name')
+GLANCE_IMAGE_FORMAT = \
+    ft_utils.get_functest_config('general.openstack.image_disk_format')
+GLANCE_IMAGE_PATH = \
+    ft_utils.get_functest_config('general.directories.dir_functest_data') + \
+    "/" + GLANCE_IMAGE_FILENAME
+
+PRIVATE_NET_NAME = \
+    ft_utils.get_functest_config('tempest.private_net_name')
+PRIVATE_SUBNET_NAME = \
+    ft_utils.get_functest_config('tempest.private_subnet_name')
+PRIVATE_SUBNET_CIDR = \
+    ft_utils.get_functest_config('tempest.private_subnet_cidr')
+ROUTER_NAME = \
+    ft_utils.get_functest_config('tempest.router_name')
+TENANT_NAME = \
+    ft_utils.get_functest_config('tempest.identity.tenant_name')
+TENANT_DESCRIPTION = \
+    ft_utils.get_functest_config('tempest.identity.tenant_description')
+USER_NAME = \
+    ft_utils.get_functest_config('tempest.identity.user_name')
+USER_PASSWORD = \
+    ft_utils.get_functest_config('tempest.identity.user_password')
+SSH_TIMEOUT = \
+    ft_utils.get_functest_config('tempest.validation.ssh_timeout')
+DEPLOYMENT_MAME = \
+    ft_utils.get_functest_config('rally.deployment_name')
+RALLY_INSTALLATION_DIR = \
+    ft_utils.get_functest_config('general.directories.dir_rally_inst')
+
+RESULTS_DIR = \
+    ft_utils.get_functest_config('general.directories.dir_results')
 TEMPEST_RESULTS_DIR = RESULTS_DIR + '/tempest'
-TEST_LIST_DIR = functest_yaml.get("general").get("directories").get(
-    "dir_tempest_cases")
+
 REPO_PATH = ft_utils.FUNCTEST_REPO + '/'
+TEST_LIST_DIR = \
+    ft_utils.get_functest_config('general.directories.dir_tempest_cases')
 TEMPEST_CUSTOM = REPO_PATH + TEST_LIST_DIR + 'test_list.txt'
 TEMPEST_BLACKLIST = REPO_PATH + TEST_LIST_DIR + 'blacklist.txt'
 TEMPEST_DEFCORE = REPO_PATH + TEST_LIST_DIR + 'defcore_req.txt'
diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py
index e85476e66..cf5a28dbd 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/testcases/OpenStack/vPing/vping_util.py
@@ -9,39 +9,38 @@ from scp import SCPClient
 
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
-
 FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
-functest_yaml = ft_utils.get_functest_yaml()
 
-NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1")
-NAME_VM_2 = functest_yaml.get("vping").get("vm_name_2")
+NAME_VM_1 = ft_utils.get_functest_config('vping.vm_name_1')
+NAME_VM_2 = ft_utils.get_functest_config('vping.vm_name_2')
 
 VM_BOOT_TIMEOUT = 180
 VM_DELETE_TIMEOUT = 100
-PING_TIMEOUT = functest_yaml.get("vping").get("ping_timeout")
+PING_TIMEOUT = ft_utils.get_functest_config('vping.ping_timeout')
+
+GLANCE_IMAGE_NAME = ft_utils.get_functest_config('vping.image_name')
+GLANCE_IMAGE_FILENAME = \
+    ft_utils.get_functest_config('general.openstack.image_file_name')
+GLANCE_IMAGE_FORMAT = \
+    ft_utils.get_functest_config('general.openstack.image_disk_format')
+GLANCE_IMAGE_PATH = \
+    ft_utils.get_functest_config('general.directories.dir_functest_data') + \
+    "/" + GLANCE_IMAGE_FILENAME
 
-GLANCE_IMAGE_NAME = functest_yaml.get("vping").get("image_name")
-GLANCE_IMAGE_FILENAME = functest_yaml.get("general").get(
-    "openstack").get("image_file_name")
-GLANCE_IMAGE_FORMAT = functest_yaml.get("general").get(
-    "openstack").get("image_disk_format")
-GLANCE_IMAGE_PATH = functest_yaml.get("general").get("directories").get(
-    "dir_functest_data") + "/" + GLANCE_IMAGE_FILENAME
 
-FLAVOR = functest_yaml.get("vping").get("vm_flavor")
+FLAVOR = ft_utils.get_functest_config('vping.vm_flavor')
 
 # NEUTRON Private Network parameters
-PRIVATE_NET_NAME = functest_yaml.get("vping").get(
-    "vping_private_net_name")
-PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get(
-    "vping_private_subnet_name")
-PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get(
-    "vping_private_subnet_cidr")
-ROUTER_NAME = functest_yaml.get("vping").get(
-    "vping_router_name")
-
-SECGROUP_NAME = functest_yaml.get("vping").get("vping_sg_name")
-SECGROUP_DESCR = functest_yaml.get("vping").get("vping_sg_descr")
+PRIVATE_NET_NAME = \
+    ft_utils.get_functest_config('vping.vping_private_net_name')
+PRIVATE_SUBNET_NAME = \
+    ft_utils.get_functest_config('vping.vping_private_subnet_name')
+PRIVATE_SUBNET_CIDR = \
+    ft_utils.get_functest_config('vping.vping_private_subnet_cidr')
+ROUTER_NAME = ft_utils.get_functest_config('vping.vping_router_name')
+
+SECGROUP_NAME = ft_utils.get_functest_config('vping.vping_sg_name')
+SECGROUP_DESCR = ft_utils.get_functest_config('vping.vping_sg_descr')
 
 
 neutron_client = None