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

change interfaces_class to interface_classes

Browse Source 
according to the newset SECoP syntax
accept both namings on the client side

Change-Id: I23abfa163d189044d997b715c912359158c16e42
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21478
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
zolliker 2019-10-29 15:21:18 +01:00 committed by Enrico Faulhaber
parent 98f87f1306
commit 1768aaefaa
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
secop/client/baseclient.py
View File

@ -383,6 +383,11 @@ class Client:
describing_data = self._decode_substruct( describing_data = self._decode_substruct(
['modules'], describing_data) ['modules'], describing_data)
for modname, module in list(describing_data['modules'].items()): for modname, module in list(describing_data['modules'].items()):
# convert old namings of interface_classes
if 'interface_class' in module:
module['interface_classes'] = module.pop('interface_class')
elif 'interfaces' in module:
module['interface_classes'] = module.pop('interfaces')
describing_data['modules'][modname] = self._decode_substruct( describing_data['modules'][modname] = self._decode_substruct(
['accessibles'], module) ['accessibles'], module)
@ -551,7 +556,7 @@ class Client:
return self.describing_data['modules'][module]['properties'] return self.describing_data['modules'][module]['properties']
def getModuleBaseClass(self, module): def getModuleBaseClass(self, module):
return self.getModuleProperties(module)['interface_class'] return self.getModuleProperties(module)['interface_classes']
def getCommands(self, module): def getCommands(self, module):
cmds = filter(lambda item: isinstance(item[1]['datatype'], CommandType), cmds = filter(lambda item: isinstance(item[1]['datatype'], CommandType),

5
secop/gui/nodectrl.py
View File

@ -135,10 +135,7 @@ class NodeCtrl(QWidget):
row = 0 row = 0
for modname in sorted(self._node.modules): for modname in sorted(self._node.modules):
modprops = self._node.getModuleProperties(modname) modprops = self._node.getModuleProperties(modname)
if 'interface_class' in modprops: interfaces = modprops.get('interface_classes', '')
interfaces = modprops['interface_class']
else:
interfaces = modprops.get('interfaces', '')
description = modprops.get('description', '!!! missing description !!!') description = modprops.get('description', '!!! missing description !!!')
# fallback: allow (now) invalid 'Driveable' # fallback: allow (now) invalid 'Driveable'

8
secop/modules.py
View File

@ -74,8 +74,8 @@ class Module(HasProperties, metaclass=ModuleMeta):
default='user', extname='visibility'), default='user', extname='visibility'),
'implementation': Property('Internal name of the implementation class of the module', StringType(), 'implementation': Property('Internal name of the implementation class of the module', StringType(),
extname='implementation'), extname='implementation'),
'interface_class': Property('Offical highest Interface-class of the module', ArrayOf(StringType()), 'interface_classes': Property('Offical highest Interface-class of the module', ArrayOf(StringType()),
extname='interface_class'), extname='interface_classes'),
# what else? # what else?
} }
@ -111,10 +111,10 @@ class Module(HasProperties, metaclass=ModuleMeta):
myclassname = '%s.%s' % (mycls.__module__, mycls.__name__) myclassname = '%s.%s' % (mycls.__module__, mycls.__name__)
self.properties['implementation'] = myclassname self.properties['implementation'] = myclassname
# list of all 'secop' modules # list of all 'secop' modules
self.properties['interface_class'] = [ self.properties['interface_classes'] = [
b.__name__ for b in mycls.__mro__ if b.__module__.startswith('secop.modules')] b.__name__ for b in mycls.__mro__ if b.__module__.startswith('secop.modules')]
# list of only the 'highest' secop module class # list of only the 'highest' secop module class
self.properties['interface_class'] = [[ self.properties['interface_classes'] = [[
b.__name__ for b in mycls.__mro__ if b.__module__.startswith('secop.modules')][0]] b.__name__ for b in mycls.__mro__ if b.__module__.startswith('secop.modules')][0]]
# handle Features # handle Features

2
test/test_modules.py
View File

@ -138,7 +138,7 @@ def test_ModuleMeta():
assert o2.parameters['a1'].datatype.unit == 'mm/s' assert o2.parameters['a1'].datatype.unit == 'mm/s'
cfg = newclass2.configurables cfg = newclass2.configurables
assert set(cfg.keys()) == {'export', 'group', 'description', assert set(cfg.keys()) == {'export', 'group', 'description',
'meaning', 'visibility', 'implementation', 'interface_class', 'target', 'stop', 'meaning', 'visibility', 'implementation', 'interface_classes', 'target', 'stop',
'status', 'param1', 'param2', 'cmd', 'a2', 'pollinterval', 'b2', 'cmd2', 'value', 'status', 'param1', 'param2', 'cmd', 'a2', 'pollinterval', 'b2', 'cmd2', 'value',
'a1'} 'a1'}
assert set(cfg['value'].keys()) == {'group', 'export', 'relative_resolution', assert set(cfg['value'].keys()) == {'group', 'export', 'relative_resolution',