From 025eb5fff5ea8fd07a7723013f4b9f659b1dfbe7 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 14 Oct 2024 07:48:52 +0200 Subject: [PATCH] fix descriptive data - remove unspecified "version" and "interface" properties - add frappy version to "firmware" property - keep custom node props with underscores Change-Id: Ib047e4765a90f2833f9e41af69a665554dd20737 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34792 Tested-by: Jenkins Automated Tests Reviewed-by: Georg Brandl Reviewed-by: Markus Zolliker Reviewed-by: Alexander Zaft Reviewed-by: Enrico Faulhaber --- frappy/secnode.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappy/secnode.py b/frappy/secnode.py index 3e16aa64..c0ae1bc4 100644 --- a/frappy/secnode.py +++ b/frappy/secnode.py @@ -25,6 +25,7 @@ from collections import OrderedDict from frappy.dynamic import Pinata from frappy.errors import ConfigError, NoSuchModuleError, NoSuchParameterError from frappy.lib import get_class +from frappy.version import get_version class SecNode: @@ -216,9 +217,11 @@ class SecNode: f'has no parameter {pname!r}') elif not modname or modname == '.': result['equipment_id'] = self.equipment_id - result['firmware'] = 'FRAPPY - The Python Framework for SECoP' - result['version'] = '2021.02' - result.update(self.nodeprops) + result['firmware'] = 'FRAPPY ' + get_version() + result['description'] = self.nodeprops['description'] + for prop in self.nodeprops: + if prop.startswith('_'): + result[prop] = self.nodeprops[prop] else: raise NoSuchModuleError(f'Module {modname!r} does not exist') return result