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

config: do not override equipment_id with name

Browse Source 
In the previous code, the equipment_id was overridden by the
server name when the interface argument was given over
the commandline. This was leftover from the previous config
file format, where the config files not neccessarly needed
an equipment_id.

Change-Id: I2fc248372a7d2f61cc0690804268d6d066a0a9fa
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35391
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2025-01-09 17:13:32 +01:00
parent 8ee49caba5
commit 0ab849d0cf
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frappy/server.py
View File

@ -108,7 +108,6 @@ class Server:
self.node_cfg = merged_cfg.pop('node') self.node_cfg = merged_cfg.pop('node')
self.module_cfg = merged_cfg self.module_cfg = merged_cfg
if interface: if interface:
self.node_cfg['equipment_id'] = name
self.node_cfg['interface'] = str(interface) self.node_cfg['interface'] = str(interface)
elif not self.node_cfg.get('interface'): elif not self.node_cfg.get('interface'):
raise ConfigError('No interface specified in configuration or arguments!') raise ConfigError('No interface specified in configuration or arguments!')