add get/set for partner also

Author: gijzelaerr

.travis.yml

@@ -12,7 +12,7 @@ before_install:
 install:
   - python setup.py install
 script:
-  - /home/travis/virtualenv/python2.7/bin/nosetests test/test_partner.py
+  - sudo /home/travis/virtualenv/python2.7/bin/nosetests test/test_partner.py
   - /home/travis/virtualenv/python2.7/bin/nosetests test/test_server.py
   - nohup /home/travis/virtualenv/python2.7/bin/snap7-server.py &
   - nosetests test/test_client.py

snap7/client.py

@@ -437,7 +437,7 @@ def set_param(self, number, value):
                                          byref(type_(value)))
 
     def get_param(self, number):
-        """Reads an internal Server object parameter.
+        """Reads an internal Client object parameter.
         """
         logger.debug("retreiving param number %s" % number)
         type_ = param_types[number]

snap7/partner.py

@@ -11,7 +11,7 @@
 import logging
 import re
 from snap7.common import load_library, check_error, ipv4
-from snap7.types import S7Object
+import snap7.types
 from snap7.exceptions import Snap7Exception
 
 logger = logging.getLogger(__name__)
@@ -90,7 +90,7 @@ def create(self, active=False):
         :returns: a pointer to the partner object
         """
         self.library.Par_Create.restype = ctypes.c_void_p
-        return S7Object(self.library.Par_Create(int(active)))
+        return snap7.types.S7Object(self.library.Par_Create(int(active)))
 
     def destroy(self):
         """
@@ -109,11 +109,17 @@ def get_last_error(self):
         check_error(result, "partner")
         return error
 
-    def get_param(self):
+    def get_param(self, number):
         """
         Reads an internal Partner object parameter.
         """
-        return self.library.Par_GetParam(self.pointer)
+        logger.debug("retreiving param number %s" % number)
+        type_ = snap7.types.param_types[number]
+        value = type_()
+        code = self.library.Par_GetParam(self.pointer, ctypes.c_int(number),
+                                         ctypes.byref(value))
+        check_error(code)
+        return value.value
 
     def get_stats(self):
         """
@@ -152,11 +158,13 @@ def get_times(self):
         check_error(result, "partner")
         return send_time, recv_time
 
-    def set_param(self):
-        """
-        Sets an internal Partner object parameter.
+    @error_wrap
+    def set_param(self, number, value):
+        """Sets an internal Partner object parameter.
         """
-        return self.library.Par_SetParam(self.pointer)
+        logger.debug("setting param number %s to %s" % (number, value))
+        return self.library.Par_SetParam(self.pointer, number,
+                                         ctypes.byref(ctypes.c_int(value)))
 
     def set_recv_callback(self):
         """

test/test_client.py

@@ -3,11 +3,7 @@
 
 import snap7
 
-
-logging.basicConfig()
-l = logging.getLogger()
-l.setLevel(logging.INFO)
-
+logging.basicConfig(level=logging.WARNING)
 
 ip = '127.0.0.1'
 tcpport = 1102

test/test_partner.py

@@ -1,6 +1,8 @@
 import unittest as unittest
 import snap7.partner
 
+import logging
+logging.basicConfig(level=logging.WARNING)
 
 class TestPartner(unittest.TestCase):
     def setUp(self):
@@ -36,7 +38,27 @@ def test_get_last_error(self):
         self.partner.get_last_error()
 
     def test_get_param(self):
-        self.partner.get_param()
+        expected = (
+            (snap7.types.LocalPort, 0),
+            (snap7.types.RemotePort, 102),
+            (snap7.types.PingTimeout, 750),
+            (snap7.types.SendTimeout, 10),
+            (snap7.types.RecvTimeout, 3000),
+            (snap7.types.SrcRef, 256),
+            (snap7.types.DstRef, 0),
+            (snap7.types.SrcTSap, 0),
+            (snap7.types.PDURequest, 480),
+            (snap7.types.WorkInterval, 100),
+            (snap7.types.BSendTimeout, 3000),
+            (snap7.types.BRecvTimeout, 3000),
+            (snap7.types.RecoveryTime, 500L),
+            (snap7.types.KeepAliveTime, 5000L),
+        )
+        for param, value in expected:
+            self.assertEqual(self.partner.get_param(param), value)
+
+        self.assertRaises(Exception, self.partner.get_param,
+                          snap7.types.MaxClients)
 
     def test_get_stats(self):
         self.partner.get_stats()
@@ -48,7 +70,25 @@ def test_get_times(self):
         self.partner.get_times()
 
     def test_set_param(self):
-        self.partner.set_param()
+        values = (
+            (snap7.types.PingTimeout, 800),
+            (snap7.types.SendTimeout, 15),
+            (snap7.types.RecvTimeout, 3500),
+            (snap7.types.WorkInterval, 50),
+            (snap7.types.SrcRef, 128),
+            (snap7.types.DstRef, 128),
+            (snap7.types.SrcTSap, 128),
+            (snap7.types.PDURequest, 470),
+            (snap7.types.BSendTimeout, 2000),
+            (snap7.types.BRecvTimeout, 2000),
+            (snap7.types.RecoveryTime, 400),
+            (snap7.types.KeepAliveTime, 4000),
+        )
+        for param, value in values:
+            self.partner.set_param(param, value)
+
+        self.assertRaises(Exception, self.partner.set_param,
+                          snap7.types.RemotePort, 1)
 
     def test_set_recv_callback(self):
         self.partner.set_recv_callback()

test/test_server.py

@@ -6,6 +6,8 @@
 import snap7.error
 import snap7.server
 
+logging.basicConfig(level=logging.WARNING)
+
 class TestServer(unittest.TestCase):
     def setUp(self):
         self.server = snap7.server.Server()