From 25c39e4d0d9b304e5a5874c8a0dac47d31971c85 Mon Sep 17 00:00:00 2001
From: John Hua <john.hua@citrix.com>
Date: Thu, 7 Jan 2016 10:14:54 +0800
Subject: [PATCH] Raise exception when fatal error occurs

In order to stop installation when some fatal errors like
configuraion files missing, cannot find himn, hotfix not
installed happen.

Change-Id: I41e11a0d0acd200387a42a2de8d8b1947a3fa319
Closes-Bug: #1531552
---
 deployment_scripts/compute_post_deployment.py | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/deployment_scripts/compute_post_deployment.py b/deployment_scripts/compute_post_deployment.py
index 2fd3578..d0470b6 100755
--- a/deployment_scripts/compute_post_deployment.py
+++ b/deployment_scripts/compute_post_deployment.py
@@ -18,6 +18,11 @@ ASTUTE_SECTION = 'fuel-plugin-xenserver'
 basicConfig(filename=LOG_FILE, level=DEBUG)
 
 
+def reportError(err):
+    warning(err)
+    raise Exception(err)
+
+
 def execute(*cmd, **kwargs):
     cmd = map(str, cmd)
     info(' '.join(cmd))
@@ -37,8 +42,7 @@ def execute(*cmd, **kwargs):
         debug(out)
 
     if proc.returncode is not None and proc.returncode != 0:
-        warning(err)
-        raise Exception(err)
+        reportError(err)
 
     return out
 
@@ -61,8 +65,7 @@ def scp(host, username, password, target_path, filename):
 def get_astute(astute_path):
     """Return the root object read from astute.yaml"""
     if not os.path.exists(astute_path):
-        warning('%s not found' % astute_path)
-        return None
+        reportError('%s not found' % astute_path)
 
     astute = yaml.load(open(astute_path))
     return astute
@@ -71,8 +74,7 @@ def get_astute(astute_path):
 def get_options(astute, astute_section):
     """Return username and password filled in plugin."""
     if not astute_section in astute:
-        warning('%s not found' % astute_section)
-        return None, None
+        reportError('%s not found' % astute_section)
 
     options = astute[astute_section]
     info('username: {username}'.format(**options))
@@ -114,8 +116,7 @@ def init_eth():
         netifaces.ifaddresses(eth).get(netifaces.AF_LINK)[0]['addr']
     eths = [eth for eth in netifaces.interfaces() if _mac(eth) == himn_mac]
     if len(eths) != 1:
-        warning('Cannot find eth matches himn_mac')
-        return None, None, None
+        reportError('Cannot find eth matches himn_mac')
 
     eth = eths[0]
     info('himn_eth: %s' % eth)
@@ -142,15 +143,14 @@ def init_eth():
             info('himn_ip: %s' % himn_local)
             return eth, himn_local, himn_xs
 
-    warning('HIMN failed to get IP address from XenServer')
-    return None, None, None
+    reportError('HIMN failed to get IP address from XenServer')
 
 
 def check_hotfix_exists(himn, username, password, hotfix):
     out = ssh(himn_xs, username, password,
               'xe patch-list name-label=%s' % hotfix)
     if not out:
-        raise Exception('Hotfix %s has not been installed' % hotfix)
+        reportError('Hotfix %s has not been installed' % hotfix)
 
 
 def install_xenapi_sdk():