diff options
| author |   helenyao <yaohelan@huawei.com> | 2017-02-22 21:45:21 -0500 |
|---|---|---|
| committer | helenyao <yaohelan@huawei.com> | 2017-02-23 19:33:37 -0500 |
| commit | cdf7b01b032398caadeb0b7c796a97c5cd090290 (patch) | |
| tree | 82372d099b18639dfc85e824a58fd6395f55927c | |
| parent | 46dc6015888db0218330000613abf2249b6829dc (diff) | |
Bugfix:Added the adapter info for compass and joid
CI for compass and joid failed as there is no key defined in
installer_params.yaml
Change-Id: I8d17d36d854974c0751d3fd3bab4994205f786bb
Signed-off-by: helenyao <yaohelan@huawei.com>
| -rw-r--r-- | functest/ci/installer_params.yaml | 16 | ||||
| -rwxr-xr-x | functest/ci/prepare_env.py | 41 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 2 |
3 files changed, 32 insertions, 27 deletions
diff --git a/functest/ci/installer_params.yaml b/functest/ci/installer_params.yaml index bffa894e7..26aff9bb9 100644 --- a/functest/ci/installer_params.yaml +++ b/functest/ci/installer_params.yaml @@ -2,15 +2,15 @@ apex: ip: '' user: 'stack' pkey: '/root/.ssh/id_rsa' -#compass: -# ip: '' -# user: 'root' -# password: 'root' +# compass: +# ip: '192.168.200.2' +# user: 'root' +# password: 'root' fuel: ip: '10.20.0.2' user: 'root' password: 'r00tme' -#joid: -# ip: '' -# user: '' -# password: '' +# joid: +# ip: '' +# user: '' +# password: '' diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index 80bcfc7db..4b9c8201a 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -285,25 +285,30 @@ def print_deployment_info(): 'functest/ci/installer_params.yaml') if (CONST.INSTALLER_IP and CONST.INSTALLER_TYPE and CONST.INSTALLER_TYPE in opnfv_constants.INSTALLERS): - installer_params = ft_utils.get_parameter_from_yaml( - CONST.INSTALLER_TYPE, installer_params_yaml) - - user = installer_params.get('user', None) - password = installer_params.get('password', None) - pkey = installer_params.get('pkey', None) - try: - handler = factory.Factory.get_handler( - installer=CONST.INSTALLER_TYPE, - installer_ip=CONST.INSTALLER_IP, - installer_user=user, - installer_pwd=password, - pkey_file=pkey) - if handler: - logger.info('\n\nDeployment information:\n%s' % - handler.get_deployment_info()) - except Exception as e: - logger.debug("Cannot get deployment information. %s" % e) + installer_params = ft_utils.get_parameter_from_yaml( + CONST.INSTALLER_TYPE, installer_params_yaml) + except ValueError as e: + logger.debug('Printing deployment info is not supported for %s' % + CONST.INSTALLER_TYPE) + logger.debug(e) + else: + user = installer_params.get('user', None) + password = installer_params.get('password', None) + pkey = installer_params.get('pkey', None) + + try: + handler = factory.Factory.get_handler( + installer=CONST.INSTALLER_TYPE, + installer_ip=CONST.INSTALLER_IP, + installer_user=user, + installer_pwd=password, + pkey_file=pkey) + if handler: + logger.info('\n\nDeployment information:\n%s' % + handler.get_deployment_info()) + except Exception as e: + logger.debug("Cannot get deployment information. %s" % e) def main(**kwargs): diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index b2c36cff9..17e988b71 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -362,7 +362,7 @@ def get_parameter_from_yaml(parameter, file): value = value.get(element) if value is None: raise ValueError("The parameter %s is not defined in" - " config_functest.yaml" % parameter) + " %s" % (parameter, file)) return value |