From fc9a8346809137810f9c85a232191d4edb7c9fb3 Mon Sep 17 00:00:00 2001 From: Moshe Date: Wed, 4 Jul 2018 09:10:44 +0300 Subject: resources are located by logical path Issue-ID: VNFSDK-275 Change-Id: I2a8a5430634d5a12a58fbd5cd85511ccce53518a Signed-off-by: Moshe fix tests Issue-ID: VNFSDK-275 Change-Id: I20f48139b2cae3b57959a33739f34e811c2ffe38 Signed-off-by: Moshe --- vnftest/common/utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'vnftest/common/utils.py') diff --git a/vnftest/common/utils.py b/vnftest/common/utils.py index 406796d..10edc05 100644 --- a/vnftest/common/utils.py +++ b/vnftest/common/utils.py @@ -514,6 +514,7 @@ def load_resource(path): def format(st, params): if not isinstance(st, basestring): return st + dotdict(params) ret_str = "" ret_obj = None for literal_text, field_name, format_spec, conversion in \ @@ -522,7 +523,12 @@ def format(st, params): ret_str = ret_str + literal_text else: dict = ret_obj or params - value = dict[field_name] + try: + value = dict[field_name] + except KeyError: + dict = dotdict(dict) + field_name = '{' + field_name + '}' + value = field_name.format(**dict) if isinstance(value, basestring): ret_str = ret_str + value else: -- cgit 1.2.3-korg