From 366a89b97863c820a063b62609fa88142550a2f5 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Wed, 22 Mar 2017 18:45:54 +0800
Subject: Opera adapter fix 1

After adding sudo opera_adapter can't get $COMPASS_DIR
and still has the issue returning 0 when launch opera
fail.

Changing the way opera_adapter gets $COMPASS_DIR and
add judgement inside opera_adapter to get opera launch
error.

Change-Id: I59d0d496f47b38e474de3dfc1277877dbe8ed840
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 deploy/launch.sh        |  3 ++-
 deploy/opera_adapter.py | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'deploy')

diff --git a/deploy/launch.sh b/deploy/launch.sh
index 5f1ee1cb..51b502f2 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -142,8 +142,9 @@ echo "NOTE: openrc file is in the controller nodes"
 echo ""
 
 if [[ ${DHA##*/} =~ "openo" ]]; then
-    sudo python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK
+    python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK
     if [[ $? -ne 0 ]]; then
+        log_error 'opera launch failed'
         exit 1
     fi
 fi
diff --git a/deploy/opera_adapter.py b/deploy/opera_adapter.py
index 71f19951..f83638d7 100644
--- a/deploy/opera_adapter.py
+++ b/deploy/opera_adapter.py
@@ -76,14 +76,14 @@ if __name__ == "__main__":
     compass_dir = os.getenv('COMPASS_DIR')
 
     if not compass_dir:
-        print("env var COMPASS_DIR  doesn't exit")
+        print("env var COMPASS_DIR  doesn't exist")
         sys.exit(1)
 
     if not os.path.exists(dha_file):
-        print("DHA file doesn't exit")
+        print("DHA file doesn't exist")
         sys.exit(1)
     if not os.path.exists(network_file):
-        print("NETWORK file doesn't exit")
+        print("NETWORK file doesn't exist")
         sys.exit(1)
 
     dha = load_file(dha_file)
@@ -119,5 +119,8 @@ if __name__ == "__main__":
     dump_file(openo_config, openo_config_file)
     sync_admin_openrc(network, admin_openrc_file)
 
-    p2 = subprocess.Popen("./opera_launch.sh", cwd=opera_dir, shell=True)
+    p2 = subprocess.Popen("sudo ./opera_launch.sh", cwd=opera_dir, shell=True)
     p2.communicate()
+    if p2.returncode != 0:
+        print('./opera_launch.sh fail')
+        sys.exit(1)
-- 
cgit 1.2.3-korg