From 0ab849d0cf33e375ad7b4d85c886f68977392bba Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Thu, 9 Jan 2025 17:13:32 +0100 Subject: [PATCH] config: do not override equipment_id with name 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 Reviewed-by: Markus Zolliker --- frappy/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappy/server.py b/frappy/server.py index 6334d98..71aba9c 100644 --- a/frappy/server.py +++ b/frappy/server.py @@ -108,7 +108,6 @@ class Server: self.node_cfg = merged_cfg.pop('node') self.module_cfg = merged_cfg if interface: - self.node_cfg['equipment_id'] = name self.node_cfg['interface'] = str(interface) elif not self.node_cfg.get('interface'): raise ConfigError('No interface specified in configuration or arguments!')