unify name and module on Attached property

- setting the attribute using the name of an attached module
- getting the attribute results in the module object

+ change names iodev to io, iodevClass to ioClass,
  sendRecv to communicate, HasIodev to HasIO

Change-Id: I200b63a5a7dc1453bf6ac998782b065645201900
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/27575
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>

test/test_attach.py

@@ -0,0 +1,78 @@
+#  -*- coding: utf-8 -*-
+# *****************************************************************************
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Module authors:
+#   Markus Zolliker <markus.zolliker@psi.ch>
+#
+# *****************************************************************************
+
+from secop.modules import Module, Attached
+from secop.protocol.dispatcher import Dispatcher
+
+
+# class DispatcherStub:
+#     # omit_unchanged_within = 0
+#
+#     # def __init__(self, updates):
+#     #     self.updates = updates
+#     #
+#     # def announce_update(self, modulename, pname, pobj):
+#     #     self.updates.setdefault(modulename, {})
+#     #     if pobj.readerror:
+#     #         self.updates[modulename]['error', pname] = str(pobj.readerror)
+#     #     else:
+#     #         self.updates[modulename][pname] = pobj.value
+#
+#     def __init__(self):
+#         self.modules = {}
+#
+#     def get_module(self, name):
+#         return self.modules[name]
+#
+#     def register_module(self, name, module):
+#         self.modules[name] = module
+
+
+class LoggerStub:
+    def debug(self, fmt, *args):
+        print(fmt % args)
+    info = warning = exception = debug
+    handlers = []
+
+
+logger = LoggerStub()
+
+
+class ServerStub:
+    restart = None
+    shutdown = None
+
+    def __init__(self):
+        self.dispatcher = Dispatcher('dispatcher', logger, {}, self)
+
+
+def test_attach():
+    class Mod(Module):
+        att = Attached()
+
+    srv = ServerStub()
+    a = Module('a', logger, {'description': ''}, srv)
+    m = Mod('m', logger, {'description': '', 'att': 'a'}, srv)
+    assert m.propertyValues['att'] == 'a'
+    srv.dispatcher.register_module(a, 'a')
+    srv.dispatcher.register_module(m, 'm')
+    assert m.att == a

test/test_iohandler.py

@@ -120,7 +120,7 @@ def test_IOHandler():
         real = Parameter('a float value', FloatRange(), default=12.3, handler=group2, readonly=False)
         text = Parameter('a string value', StringType(), default='x', handler=group2, readonly=False)
 
-        def sendRecv(self, command):
+        def communicate(self, command):
             assert data.pop('command') == command
             return data.pop('reply')
 
@@ -146,7 +146,7 @@ def test_IOHandler():
     print(updates)
     updates.clear() # get rid of updates from initialisation
 
-    # for sendRecv
+    # for communicate
     data.push('command', 'SIMPLE?')
     data.push('reply', '4.51')
     # for analyze_group1
@@ -159,7 +159,7 @@ def test_IOHandler():
     assert updates.pop('simple') == 45.1
     assert not updates
 
-    # for sendRecv
+    # for communicate
     data.push('command', 'CMD?3')
     data.push('reply', '1.23,text,5')
     # for analyze_group2
@@ -172,7 +172,7 @@ def test_IOHandler():
     assert data.empty()
     assert not updates
 
-    # for sendRecv
+    # for communicate
     data.push('command', 'CMD?3')
     data.push('reply', '1.23,text,5')
     # for analyze_group2
@@ -183,7 +183,7 @@ def test_IOHandler():
     data.push('self', 12.3, 'string')
     data.push('new', 12.3, 'FOO')
     data.push('changed', 1.23, 'foo', 9)
-    # for sendRecv
+    # for communicate
     data.push('command', 'CMD 3,1.23,foo,9|CMD?3')
     data.push('reply', '1.23,foo,9')
     # for analyze_group2

test/test_poller.py

@@ -117,7 +117,10 @@ class Parameter:
 class Module:
     properties = {}
     pollerClass = Poller
-    iodev = 'common_iodev'
+
+    class io:
+        name = 'common_io'
+
     def __init__(self, name, pollinterval=5, fastfactor=0.25, slowfactor=4, busy=False,
                  counts=(), auto=None):
         '''create a dummy module
@@ -203,7 +206,7 @@ def test_Poller(modules):
                     count[pobj.polltype] += 1
                     pobj.reset()
         assert len(pollTable) == 1
-        poller = pollTable[(Poller, 'common_iodev')]
+        poller = pollTable[(Poller, 'common_io')]
         artime.stop = poller.stop
         poller._event = Event() # patch Event.wait