Add SSH connectivity check

[functest.git] / testcases / features / promise.py

diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index 170f754..cce0f5d 100755 (executable)
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -16,12 +16,11 @@ import subprocess
 import time
 
 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 openstack_utils
 import keystoneclient.v2_0.client as ksclient
 from neutronclient.v2_0 import client as ntclient
 import novaclient.client as nvclient
-import yaml
 
 
 parser = argparse.ArgumentParser()
@@ -32,37 +31,35 @@ parser.add_argument("-r", "--report",
                     action="store_true")
 args = parser.parse_args()
 
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
-    functest_yaml = yaml.safe_load(f)
 
-dirs = functest_yaml.get('general').get('directories')
-FUNCTEST_REPO = dirs.get('dir_repo_functest')
+dirs = ft_utils.get_functest_config('general.directories')
 PROMISE_REPO = dirs.get('dir_repo_promise')
-TEST_DB = functest_yaml.get('results').get('test_db_url')
-
-TENANT_NAME = functest_yaml.get('promise').get('general').get('tenant_name')
-TENANT_DESCRIPTION = functest_yaml.get('promise').get(
-    'general').get('tenant_description')
-USER_NAME = functest_yaml.get('promise').get('general').get('user_name')
-USER_PWD = functest_yaml.get('promise').get('general').get('user_pwd')
-IMAGE_NAME = functest_yaml.get('promise').get('general').get('image_name')
-FLAVOR_NAME = functest_yaml.get('promise').get('general').get('flavor_name')
-FLAVOR_VCPUS = functest_yaml.get('promise').get('general').get('flavor_vcpus')
-FLAVOR_RAM = functest_yaml.get('promise').get('general').get('flavor_ram')
-FLAVOR_DISK = functest_yaml.get('promise').get('general').get('flavor_disk')
-
-
-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
-
-NET_NAME = functest_yaml.get('promise').get('general').get('network_name')
-SUBNET_NAME = functest_yaml.get('promise').get('general').get('subnet_name')
-SUBNET_CIDR = functest_yaml.get('promise').get('general').get('subnet_cidr')
-ROUTER_NAME = functest_yaml.get('promise').get('general').get('router_name')
+RESULTS_DIR = ft_utils.get_functest_config('general.directories.dir_results')
+
+TENANT_NAME = ft_utils.get_functest_config('promise.tenant_name')
+TENANT_DESCRIPTION = \
+    ft_utils.get_functest_config('promise.tenant_description')
+USER_NAME = ft_utils.get_functest_config('promise.user_name')
+USER_PWD = ft_utils.get_functest_config('promise.user_pwd')
+IMAGE_NAME = ft_utils.get_functest_config('promise.image_name')
+FLAVOR_NAME = ft_utils.get_functest_config('promise.flavor_name')
+FLAVOR_VCPUS = ft_utils.get_functest_config('promise.flavor_vcpus')
+FLAVOR_RAM = ft_utils.get_functest_config('promise.flavor_ram')
+FLAVOR_DISK = ft_utils.get_functest_config('promise.flavor_disk')
+
+
+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
+
+NET_NAME = ft_utils.get_functest_config('promise.network_name')
+SUBNET_NAME = ft_utils.get_functest_config('promise.subnet_name')
+SUBNET_CIDR = ft_utils.get_functest_config('promise.subnet_cidr')
+ROUTER_NAME = ft_utils.get_functest_config('promise.router_name')
 
 
 """ logging configuration """
@@ -87,7 +84,7 @@ def main():
     logger.info("Creating tenant '%s'..." % TENANT_NAME)
     tenant_id = openstack_utils.create_tenant(
         keystone, TENANT_NAME, TENANT_DESCRIPTION)
-    if tenant_id == '':
+    if not tenant_id:
         logger.error("Error : Failed to create %s tenant" % TENANT_NAME)
         exit(-1)
     logger.debug("Tenant '%s' created successfully." % TENANT_NAME)
@@ -114,7 +111,7 @@ def main():
     user_id = openstack_utils.create_user(
         keystone, USER_NAME, USER_PWD, None, tenant_id)
 
-    if user_id == '':
+    if not user_id:
         logger.error("Error : Failed to create %s user" % USER_NAME)
         exit(-1)
     logger.debug("User '%s' created successfully." % USER_NAME)
@@ -171,7 +168,7 @@ def main():
                                                       SUBNET_NAME,
                                                       ROUTER_NAME,
                                                       SUBNET_CIDR)
-    if network_dic is False:
+    if not network_dic:
         logger.error("Failed to create the private network...")
         exit(-1)
 
@@ -185,7 +182,7 @@ def main():
     os.environ["OS_TEST_NETWORK"] = network_dic["net_id"]
 
     os.chdir(PROMISE_REPO)
-    results_file_name = 'promise-results.json'
+    results_file_name = RESULTS_DIR + '/' + 'promise-results.json'
     results_file = open(results_file_name, 'w+')
     cmd = 'npm run -s test -- --reporter json'
 
@@ -244,13 +241,12 @@ def main():
             status = "PASS"
             exit_code = 0
 
-        functest_utils.push_results_to_db("promise",
-                                          "promise",
-                                          logger,
-                                          start_time,
-                                          stop_time,
-                                          status,
-                                          json_results)
+        ft_utils.push_results_to_db("promise",
+                                    "promise",
+                                    start_time,
+                                    stop_time,
+                                    status,
+                                    json_results)
 
     exit(exit_code)