aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vIMS/CI/orchestrator.py
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2016-01-28 16:30:47 +0100
committerboucherv <valentin.boucher@orange.com>2016-01-29 11:22:03 +0100
commit9ec86196a8e96fea966beef08c01b9c9822a9bc4 (patch)
treee4b46d4e8c851d6716ae4ecf7c4ac75d106b0e99 /testcases/vIMS/CI/orchestrator.py
parent2e8ecc1b2b2e16a3dc8d9bf1689dfcbb96c3e391 (diff)
Add some error result in result db api
Change-Id: I1c5f9bc51c04e321ace8c0ee0312be28d321910f Signed-off-by: boucherv <valentin.boucher@orange.com>
Diffstat (limited to 'testcases/vIMS/CI/orchestrator.py')
-rw-r--r--testcases/vIMS/CI/orchestrator.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py
index 382fbd139..965c2646d 100644
--- a/testcases/vIMS/CI/orchestrator.py
+++ b/testcases/vIMS/CI/orchestrator.py
@@ -106,7 +106,9 @@ class orchestrator:
script += "pip install -r requirements.txt; "
script += "timeout 1800 cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; "
cmd = "/bin/bash -c '" + script + "'"
- execute_command(cmd, self.logger)
+ error = execute_command(cmd, self.logger)
+ if error:
+ return error
if self.logger:
self.logger.info("Cloudify-manager server is UP !")
@@ -160,8 +162,9 @@ class orchestrator:
script += "cfy executions start -w install -d " + dep_name + " --timeout 1800; "
cmd = "/bin/bash -c '" + script + "'"
- execute_command(cmd, self.logger)
-
+ error = execute_command(cmd, self.logger)
+ if error:
+ return error
if self.logger:
self.logger.info("The deployment of {0} is ended".format(dep_name))
@@ -196,11 +199,16 @@ def execute_command(cmd, logger):
if result != "" and logger:
logger.debug(result)
if p == 0:
- return True
+ return False
else:
if logger:
logger.error("Error when executing command %s" % cmd)
- exit(-1)
+ f = open(output_file, 'r')
+ lines = f.readlines()
+ result = lines[len(lines) - 3]
+ result += lines[len(lines) - 2]
+ result += lines[len(lines) - 1]
+ return result
def download_blueprints(blueprint_url, branch, dest_path):