Merge "Add reveal.js as a submodule"

[functest.git] / functest / opnfv_tests / vnf / ims / orchestrator_cloudify.py

diff --git a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
index f3838f8..82a9dca 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
+++ b/functest/opnfv_tests/vnf/ims/orchestrator_cloudify.py
@@ -21,7 +21,7 @@ from git import Repo
 import functest.utils.functest_logger as ft_logger
 
 
-class Orchestrator:
+class Orchestrator(object):
 
     def __init__(self, testcase_dir, inputs={}):
         self.testcase_dir = testcase_dir
@@ -114,6 +114,7 @@ class Orchestrator:
             cmd = "/bin/bash -c '" + script + "'"
             error = execute_command(cmd, self.logger)
             if error:
+                self.logger.error("Failed to deploy cloudify-manager")
                 return error
 
             self.logger.info("Cloudify-manager server is UP !")
@@ -171,6 +172,7 @@ class Orchestrator:
         cmd = "/bin/bash -c '" + script + "'"
         error = execute_command(cmd, self.logger, 2000)
         if error:
+            self.logger.error("Failed to deploy blueprint")
             return error
         self.logger.info("The deployment of {0} is ended".format(dep_name))
 
@@ -228,7 +230,4 @@ def execute_command(cmd, logger, timeout=1800):
             logger.error("Error when executing command %s" % cmd)
         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
+        return lines[-5:]