X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fdeploy%2Fcloud%2Fdeployment.py;h=90f24fd0b3cec6e4f8dea8ad01f850fdfc3f3f51;hb=563547b4a9f44090f32c0e17d040114854563760;hp=cf56c36308df67e09d794e3c1b01c157faa097f7;hpb=40daff8997e3e900da151f6e2eb499b6c0987ea4;p=genesis.git

diff --git a/fuel/deploy/cloud/deployment.py b/fuel/deploy/cloud/deployment.py
index cf56c36..90f24fd 100644
--- a/fuel/deploy/cloud/deployment.py
+++ b/fuel/deploy/cloud/deployment.py
@@ -1,3 +1,13 @@
+###############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# szilard.cserey@ericsson.com
+# 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 common
 import os
 import shutil
@@ -19,42 +29,13 @@ log = common.log
 
 class Deployment(object):
 
-    def __init__(self, dea, yaml_config_dir, env_id, node_id_roles_dict):
+    def __init__(self, dea, yaml_config_dir, env_id, node_id_roles_dict,
+                 no_health_check):
         self.dea = dea
         self.yaml_config_dir = yaml_config_dir
         self.env_id = env_id
         self.node_id_roles_dict = node_id_roles_dict
-
-    def download_deployment_info(self):
-        log('Download deployment info for environment %s' % self.env_id)
-        deployment_dir = '%s/deployment_%s' \
-                         % (self.yaml_config_dir, self.env_id)
-        if os.path.exists(deployment_dir):
-            shutil.rmtree(deployment_dir)
-        exec_cmd('fuel --env %s deployment --default --dir %s'
-                 % (self.env_id, self.yaml_config_dir))
-
-    def upload_deployment_info(self):
-        log('Upload deployment info for environment %s' % self.env_id)
-        exec_cmd('fuel --env %s deployment --upload --dir %s'
-                 % (self.env_id, self.yaml_config_dir))
-
-    def config_opnfv(self):
-        log('Configure OPNFV settings on environment %s' % self.env_id)
-        opnfv_compute = self.dea.get_opnfv('compute')
-        opnfv_controller = self.dea.get_opnfv('controller')
-        self.download_deployment_info()
-        for node_file in glob.glob('%s/deployment_%s/*.yaml'
-                                   % (self.yaml_config_dir, self.env_id)):
-             with io.open(node_file) as stream:
-                 node = yaml.load(stream)
-             if node['role'] == 'compute':
-                node.update(opnfv_compute)
-             else:
-                node.update(opnfv_controller)
-             with io.open(node_file, 'w') as stream:
-                 yaml.dump(node, stream, default_flow_style=False)
-        self.upload_deployment_info()
+        self.no_health_check = no_health_check
 
     def run_deploy(self):
         WAIT_LOOP = 180
@@ -75,7 +56,8 @@ class Deployment(object):
             if env[0][E['status']] == 'operational':
                 ready = True
                 break
-            elif env[0][E['status']] == 'error':
+            elif (env[0][E['status']] == 'error'
+                  or env[0][E['status']] == 'stopped'):
                 break
             else:
                 time.sleep(SLEEP_TIME)
@@ -102,12 +84,14 @@ class Deployment(object):
 
     def health_check(self):
         log('Now running sanity and smoke health checks')
-        exec_cmd('fuel health --env %s --check sanity,smoke --force'
-                 % self.env_id)
-        log('Health checks passed !')
+        r = exec_cmd('fuel health --env %s --check sanity,smoke --force'
+                     % self.env_id)
+        log(r)
+        if 'failure' in r:
+            err('Healthcheck failed!')
 
     def deploy(self):
-        self.config_opnfv()
         self.run_deploy()
         self.verify_node_status()
-        self.health_check()
\ No newline at end of file
+        if not self.no_health_check:
+            self.health_check()