linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Simulation and Proxy

Browse Source 
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 <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
This commit is contained in:
Alexander Zaft 2023-02-22 18:19:36 +01:00 committed by Markus Zolliker
parent c9500bcd96
commit f4fac1f3dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frappy/proxy.py
View File

@ -227,11 +227,11 @@ def Proxy(name, logger, cfgdict, srv):
""" """
remote_class = cfgdict.pop('remote_class') remote_class = cfgdict.pop('remote_class')
if isinstance(remote_class, dict): if isinstance(remote_class, dict):
remote_class = remote_class['default'] remote_class = remote_class['value']
if 'description' not in cfgdict: if 'description' not in cfgdict:
cfgdict['description'] = 'remote module %s on %s' % ( cfgdict['description'] = 'remote module %s on %s' % (
cfgdict.get('module', name), cfgdict.get('module', name),
cfgdict.get('io', {'default:': '?'})['default']) cfgdict.get('io', {'value:': '?'})['value'])
return proxy_class(remote_class)(name, logger, cfgdict, srv) return proxy_class(remote_class)(name, logger, cfgdict, srv)

2
frappy/simulation.py
View File

@ -35,7 +35,7 @@ class SimBase:
extra_params = cfgdict.pop('extra_params', '') or cfgdict.pop('.extra_params', '') extra_params = cfgdict.pop('extra_params', '') or cfgdict.pop('.extra_params', '')
attrs = {} attrs = {}
if extra_params: if extra_params:
for k in extra_params['default'].split(','): for k in extra_params['value'].split(','):
k = k.strip() k = k.strip()
attrs[k] = Parameter('extra_param: %s' % k.strip(), attrs[k] = Parameter('extra_param: %s' % k.strip(),
datatype=FloatRange(), datatype=FloatRange(),