result from merge with gerrit

secop subdir only

Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1

secop/proxy.py

@@ -29,17 +29,17 @@ from secop.lib import get_class
 from secop.modules import Drivable, Module, Readable, Writable
 from secop.params import Command, Parameter
 from secop.properties import Property
-from secop.io import HasIodev
+from secop.io import HasIO
 
 
-class ProxyModule(HasIodev, Module):
+class ProxyModule(HasIO, Module):
     module = Property('remote module name', datatype=StringType(), default='')
 
-    pollerClass = None
     _consistency_check_done = False
     _secnode = None
+    enablePoll = False
 
-    def iodevClass(self, name, logger, opts, srv):
+    def ioClass(self, name, logger, opts, srv):
         opts['description'] = 'secnode %s on %s' % (opts.get('module', name), opts['uri'])
         return SecNode(name, logger, opts, srv)
 
@@ -54,7 +54,7 @@ class ProxyModule(HasIodev, Module):
     def initModule(self):
         if not self.module:
             self.module = self.name
-        self._secnode = self._iodev.secnode
+        self._secnode = self.io.secnode
         self._secnode.register_callback(self.module, self.updateEvent,
                                         self.descriptiveDataChange, self.nodeStateChange)
         super().initModule()
@@ -123,7 +123,8 @@ class ProxyModule(HasIodev, Module):
                 self.announceUpdate('status', newstatus)
 
     def checkProperties(self):
-        pass # skip
+        pass  # skip
+
 
 class ProxyReadable(ProxyModule, Readable):
     pass
@@ -144,10 +145,12 @@ class SecNode(Module):
     uri = Property('uri of a SEC node', datatype=StringType())
 
     def earlyInit(self):
+        super().earlyInit()
         self.secnode = SecopClient(self.uri, self.log)
 
-    def startModule(self, started_callback):
-        self.secnode.spawn_connect(started_callback)
+    def startModule(self, start_events):
+        super().startModule(start_events)
+        self.secnode.spawn_connect(start_events.get_trigger())
 
     @Command(StringType(), result=StringType())
     def request(self, msg):
@@ -182,7 +185,7 @@ def proxy_class(remote_class, name=None):
 
     for aname, aobj in rcls.accessibles.items():
         if isinstance(aobj, Parameter):
-            pobj = aobj.merge(dict(poll=False, handler=None, needscfg=False))
+            pobj = aobj.merge(dict(handler=None, needscfg=False))
             attrs[aname] = pobj
 
             def rfunc(self, pname=aname):
@@ -225,5 +228,5 @@ def Proxy(name, logger, cfgdict, srv):
     remote_class = cfgdict.pop('remote_class')
     if 'description' not in cfgdict:
         cfgdict['description'] = 'remote module %s on %s' % (
-            cfgdict.get('module', name), cfgdict.get('iodev', '?'))
+            cfgdict.get('module', name), cfgdict.get('io', '?'))
     return proxy_class(remote_class)(name, logger, cfgdict, srv)