Merge "Refactor configure_tempest() function"

1 files changed, 36 insertions, 15 deletions

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 91a5bb4b..f013b442 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -110,24 +110,23 @@ def get_verifier_deployment_dir(verifier_id, deployment_id):
 
 def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None):
     """
-    Add/update needed parameters into tempest.conf file generated by Rally
+    Calls rally verify and updates the generated tempest.conf with
+    given parameters
     """
-    tempest_conf_file = os.path.join(deployment_dir, "tempest.conf")
-    if os.path.isfile(tempest_conf_file):
-        logger.debug("Verifier is already configured.")
-        logger.debug("Reconfiguring the current verifier...")
-        cmd = "rally verify configure-verifier --reconfigure"
+    conf_verifier_result = configure_verifier(deployment_dir)
+    if conf_verifier_result == releng_constants.EXIT_RUN_ERROR:
+        return releng_constants.EXIT_RUN_ERROR
     else:
-        logger.info("Configuring the verifier...")
-        cmd = "rally verify configure-verifier"
-    ft_utils.execute_command(cmd)
+        configure_tempest_update_params(conf_verifier_result,
+                                        IMAGE_ID, FLAVOR_ID)
+        return releng_constants.EXIT_OK
 
-    logger.debug("Looking for tempest.conf file...")
-    if not os.path.isfile(tempest_conf_file):
-        logger.error("Tempest configuration file %s NOT found."
-                     % tempest_conf_file)
-        return releng_constants.EXIT_RUN_ERROR
 
+def configure_tempest_update_params(tempest_conf_file,
+                                    IMAGE_ID=None, FLAVOR_ID=None):
+    """
+    Add/update needed parameters into tempest.conf file
+    """
     logger.debug("Updating selected tempest.conf parameters...")
     config = ConfigParser.RawConfigParser()
     config.read(tempest_conf_file)
@@ -178,7 +177,29 @@ def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None):
     shutil.copyfile(tempest_conf_file,
                     os.path.join(TEMPEST_RESULTS_DIR, 'tempest.conf'))
 
-    return releng_constants.EXIT_OK
+
+def configure_verifier(deployment_dir):
+    """
+    Execute rally verify configure-verifier, which generates tempest.conf
+    """
+    tempest_conf_file = os.path.join(deployment_dir, "tempest.conf")
+    if os.path.isfile(tempest_conf_file):
+        logger.debug("Verifier is already configured.")
+        logger.debug("Reconfiguring the current verifier...")
+        cmd = "rally verify configure-verifier --reconfigure"
+    else:
+        logger.info("Configuring the verifier...")
+        cmd = "rally verify configure-verifier"
+    ft_utils.execute_command(cmd)
+    logger.debug("Looking for tempest.conf file...")
+
+    if not os.path.isfile(tempest_conf_file):
+        logger.error("Tempest configuration file %s NOT found."
+                     % tempest_conf_file)
+        return releng_constants.EXIT_RUN_ERROR
+
+    else:
+        return tempest_conf_file
 
 
 def configure_tempest_multisite(deployment_dir):