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

implement SECoP proxy modules

Browse Source 
A proxy module is a module with a known structure, but
accessed over a SECoP connection.
For the configuration, a Frappy module class has to be given.
The proxy class is created from this, but does not inherit from it.
However, the class of the returned object will be subclass of the
SECoP base classes (Readable, Drivable etc.).
A possible extension might be, that instead of the Frappy class,
the JSON module description can be given, as a separate file
or directly in the config file.
Or we might offer a tool to convert the JSON description to
a python class.

Change-Id: I9212d9f3fe82ec56dfc08611d0e1efc0b0112271
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22386
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker
2020-01-30 10:24:40 +01:00
parent 9825b9c135
commit 97034fb998
12 changed files with 550 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
secop/modules.py
View File

@@ -140,6 +140,13 @@ class Module(HasProperties, metaclass=ModuleMeta):
for aname, aobj in self.accessibles.items():
# make a copy of the Parameter/Command object
aobj = aobj.copy()
if isinstance(aobj, Parameter):
# fix default properties poll and needscfg
if aobj.poll is None:
aobj.properties['poll'] = bool(aobj.handler)
if aobj.needscfg is None:
aobj.properties['needscfg'] = not aobj.poll
if aobj.export:
if aobj.export is True:
predefined_obj = PREDEFINED_ACCESSIBLES.get(aname, None)
@@ -200,7 +207,7 @@ class Module(HasProperties, metaclass=ModuleMeta):
self.writeDict[pname] = pobj.value
else:
if pobj.default is None:
if not pobj.poll:
if pobj.needscfg:
raise ConfigError('Module %s: Parameter %r has no default '
'value and was not given in config!' %
(self.name, pname))
@@ -349,7 +356,7 @@ class Readable(Module):
def startModule(self, started_callback):
"""start basic polling thread"""
if issubclass(self.pollerClass, BasicPoller):
if self.pollerClass and issubclass(self.pollerClass, BasicPoller):
# use basic poller for legacy code
mkthread(self.__pollThread, started_callback)
else:
@@ -479,4 +486,4 @@ class Attached(Property):
super().__init__('attached module', StringType())
def __repr__(self):
return 'Attached(%r)' % self.description
return 'Attached(%s)' % (repr(self.attrname) if self.attrname else '')