From: chenjiankun <chenjiankun1@huawei.com>
Date: Thu, 27 Apr 2017 02:27:39 +0000 (+0000)
Subject: Bugfix: yardstick env prepare cmd do not support other installer
X-Git-Tag: opnfv-5.0.RC1~492^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F33911%2F1;p=yardstick.git

Bugfix: yardstick env prepare cmd do not support other installer

JIRA: YARDSTICK-629

Currently yardstick env prepare do not support other installer.
I will add follow support:
1. Environment variable already exists: then do not fetch openrc file
and do not add EXTERNAL_NETWORK variable.
2. Already have openrc file in /etc/yardstick/openstack.creds: only
source this file in API.
3.Environment variable not exists and openrc file not in
/etc/yardstick/openstack.creds: fetch openrc file and append
EXTERNAL_NETWORK variable.

Change-Id: I4ce98f2e17ef8e0a0a1c33c3862ca301c53bb6c2
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---

diff --git a/api/resources/env_action.py b/api/resources/env_action.py
index f6f43e5ac..7bfaf27a7 100644
--- a/api/resources/env_action.py
+++ b/api/resources/env_action.py
@@ -199,30 +199,25 @@ def prepareYardstickEnv(args):
 def _already_source_openrc():
     """Check if openrc is sourced already"""
     return all(os.environ.get(k) for k in ['OS_AUTH_URL', 'OS_USERNAME',
-                                           'OS_PASSWORD', 'OS_TENANT_NAME',
-                                           'EXTERNAL_NETWORK'])
+                                           'OS_PASSWORD', 'EXTERNAL_NETWORK'])
 
 
 def _prepare_env_daemon(task_id):
     _create_task(task_id)
 
-    installer_ip = os.environ.get('INSTALLER_IP', 'undefined')
-    installer_type = os.environ.get('INSTALLER_TYPE', 'undefined')
-
     try:
-        _check_variables(installer_ip, installer_type)
-
         _create_directories()
 
         rc_file = consts.OPENRC
 
         if not _already_source_openrc():
-            _get_remote_rc_file(rc_file, installer_ip, installer_type)
+            if not os.path.exists(rc_file):
+                installer_ip = os.environ.get('INSTALLER_IP', '192.168.200.2')
+                installer_type = os.environ.get('INSTALLER_TYPE', 'compass')
+                _get_remote_rc_file(rc_file, installer_ip, installer_type)
+                _source_file(rc_file)
+                _append_external_network(rc_file)
             _source_file(rc_file)
-            _append_external_network(rc_file)
-
-        # update the external_network
-        _source_file(rc_file)
 
         _clean_images()
 
@@ -234,17 +229,6 @@ def _prepare_env_daemon(task_id):
         logger.debug('Error: %s', e)
 
 
-def _check_variables(installer_ip, installer_type):
-
-    if installer_ip == 'undefined':
-        raise SystemExit('Missing INSTALLER_IP')
-
-    if installer_type == 'undefined':
-        raise SystemExit('Missing INSTALLER_TYPE')
-    elif installer_type not in consts.INSTALLERS:
-        raise SystemExit('INSTALLER_TYPE is not correct')
-
-
 def _create_directories():
     yardstick_utils.makedirs(consts.CONF_DIR)