From f4fac1f3dda74e34d768365720c3477309b15d0b Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Wed, 22 Feb 2023 18:19:36 +0100 Subject: [PATCH] Fix Simulation and Proxy Combination of changes 30188 and 30194 leads to simulation and proxy still reading 'default' instead of 'value' Change-Id: I176a42f534a4eb04916b57bb3b54e880a2531ed3 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30502 Tested-by: Jenkins Automated Tests Reviewed-by: Alexander Zaft --- frappy/proxy.py | 4 ++-- frappy/simulation.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappy/proxy.py b/frappy/proxy.py index 9d7463d..cabb656 100644 --- a/frappy/proxy.py +++ b/frappy/proxy.py @@ -227,11 +227,11 @@ def Proxy(name, logger, cfgdict, srv): """ remote_class = cfgdict.pop('remote_class') if isinstance(remote_class, dict): - remote_class = remote_class['default'] + remote_class = remote_class['value'] if 'description' not in cfgdict: cfgdict['description'] = 'remote module %s on %s' % ( cfgdict.get('module', name), - cfgdict.get('io', {'default:': '?'})['default']) + cfgdict.get('io', {'value:': '?'})['value']) return proxy_class(remote_class)(name, logger, cfgdict, srv) diff --git a/frappy/simulation.py b/frappy/simulation.py index b0ddb00..f3918cf 100644 --- a/frappy/simulation.py +++ b/frappy/simulation.py @@ -35,7 +35,7 @@ class SimBase: extra_params = cfgdict.pop('extra_params', '') or cfgdict.pop('.extra_params', '') attrs = {} if extra_params: - for k in extra_params['default'].split(','): + for k in extra_params['value'].split(','): k = k.strip() attrs[k] = Parameter('extra_param: %s' % k.strip(), datatype=FloatRange(),