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 <pedersen+jenkins@frm2.tum.de> Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch> Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de> Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
@ -25,6 +25,7 @@ from collections import OrderedDict
|
|||||||
from frappy.dynamic import Pinata
|
from frappy.dynamic import Pinata
|
||||||
from frappy.errors import ConfigError, NoSuchModuleError, NoSuchParameterError
|
from frappy.errors import ConfigError, NoSuchModuleError, NoSuchParameterError
|
||||||
from frappy.lib import get_class
|
from frappy.lib import get_class
|
||||||
|
from frappy.version import get_version
|
||||||
|
|
||||||
|
|
||||||
class SecNode:
|
class SecNode:
|
||||||
@ -216,9 +217,11 @@ class SecNode:
|
|||||||
f'has no parameter {pname!r}')
|
f'has no parameter {pname!r}')
|
||||||
elif not modname or modname == '.':
|
elif not modname or modname == '.':
|
||||||
result['equipment_id'] = self.equipment_id
|
result['equipment_id'] = self.equipment_id
|
||||||
result['firmware'] = 'FRAPPY - The Python Framework for SECoP'
|
result['firmware'] = 'FRAPPY ' + get_version()
|
||||||
result['version'] = '2021.02'
|
result['description'] = self.nodeprops['description']
|
||||||
result.update(self.nodeprops)
|
for prop in self.nodeprops:
|
||||||
|
if prop.startswith('_'):
|
||||||
|
result[prop] = self.nodeprops[prop]
|
||||||
else:
|
else:
|
||||||
raise NoSuchModuleError(f'Module {modname!r} does not exist')
|
raise NoSuchModuleError(f'Module {modname!r} does not exist')
|
||||||
return result
|
return result
|
||||||
|
Reference in New Issue
Block a user