summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-02-25 19:01:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-25 19:01:00 +0000
commit48fc7087653384cc83a6f89fa984ad6281e1752b (patch)
tree006448fce2524a643435f36340f155568e6440c2
parent542de3204e8fa7730a6c837b3f751b677343644c (diff)
parentcdf7b01b032398caadeb0b7c796a97c5cd090290 (diff)
Merge "Bugfix:Added the adapter info for compass and joid"
-rw-r--r--functest/ci/installer_params.yaml16
-rwxr-xr-xfunctest/ci/prepare_env.py41
-rw-r--r--functest/utils/functest_utils.py2
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 bec60d13e..5a9f99cb6 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -288,25 +288,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 78831c113..dbed811a7 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -369,7 +369,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