Merge "Prepare env will exit when an error is raised"

2 files changed, 34 insertions, 24 deletions

diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 80bcfc7db..86e922919 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -1,18 +1,11 @@
 #!/usr/bin/env python
 #
-# Author: Jose Lausuch (jose.lausuch@ericsson.com)
-#
-# Installs the Functest framework within the Docker container
-# and run the tests automatically
-#
-#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-
 import argparse
 import json
 import os
@@ -224,20 +217,19 @@ def install_rally():
         "Deployment %s does not exist."
         % CONST.rally_deployment_name),
         verbose=False)
+
     rally_conf = os_utils.get_credentials_for_rally()
     with open('rally_conf.json', 'w') as fp:
         json.dump(rally_conf, fp)
     cmd = ("rally deployment create "
-           "--file=rally_conf.json --name={}"
+           "--file=rally_conf.json --name={0}"
            .format(CONST.rally_deployment_name))
-    ft_utils.execute_command(cmd,
-                             error_msg=("Problem while creating "
-                                        "Rally deployment"))
+    error_msg = "Problem while creating Rally deployment"
+    ft_utils.execute_command_raise(cmd, error_msg=error_msg)
 
     cmd = "rally deployment check"
-    ft_utils.execute_command(cmd,
-                             error_msg=("OpenStack not responding or "
-                                        "faulty Rally deployment."))
+    error_msg = "OpenStack not responding or faulty Rally deployment."
+    ft_utils.execute_command_raise(cmd, error_msg=error_msg)
 
     cmd = "rally deployment list"
     ft_utils.execute_command(cmd,
@@ -252,19 +244,30 @@ def install_rally():
 
 def install_tempest():
     logger.info("Installing tempest from existing repo...")
-    cmd = ("rally verify create-verifier --source {0} "
-           "--name {1} --type tempest"
-           .format(CONST.dir_repo_tempest, CONST.tempest_deployment_name))
-    ft_utils.execute_command(cmd,
-                             error_msg="Problem while installing Tempest.")
+    cmd = ("rally verify list-verifiers | "
+           "grep '{0}' | wc -l".format(CONST.tempest_deployment_name))
+    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
+    while p.poll() is None:
+        line = p.stdout.readline().rstrip()
+        if str(line) == '0':
+            logger.debug("Tempest %s does not exist" %
+                         CONST.tempest_deployment_name)
+            cmd = ("rally verify create-verifier --source {0} "
+                   "--name {1} --type tempest"
+                   .format(CONST.dir_repo_tempest,
+                           CONST.tempest_deployment_name))
+            error_msg = "Problem while installing Tempest."
+            ft_utils.execute_command_raise(cmd, error_msg=error_msg)
 
 
 def create_flavor():
-    os_utils.get_or_create_flavor('m1.tiny',
-                                  '512',
-                                  '1',
-                                  '1',
-                                  public=True)
+    _, flavor_id = os_utils.get_or_create_flavor('m1.tiny',
+                                                 '512',
+                                                 '1',
+                                                 '1',
+                                                 public=True)
+    if flavor_id is None:
+        raise Exception('Failed to create flavor')
 
 
 def check_environment():
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index b2c36cff9..78831c113 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -291,6 +291,13 @@ def get_ci_envvars():
     return ci_env_var
 
 
+def execute_command_raise(cmd, info=False, error_msg="",
+                          verbose=True, output_file=None):
+    ret = execute_command(cmd, info, error_msg, verbose, output_file)
+    if ret != 0:
+        raise Exception(error_msg)
+
+
 def execute_command(cmd, info=False, error_msg="",
                     verbose=True, output_file=None):
     if not error_msg: