ReportSlaveIdResponse now tries to get slave id based on server ident…

…ity for pymodbus servers

pymodbus/other_message.py

@@ -7,7 +7,7 @@
 from pymodbus.constants import ModbusStatus
 from pymodbus.pdu import ModbusRequest
 from pymodbus.pdu import ModbusResponse
-from pymodbus.device import ModbusControlBlock
+from pymodbus.device import ModbusControlBlock, DeviceInformationFactory
 from pymodbus.compat import byte2int, int2byte
 
 _MCB = ModbusControlBlock()
@@ -364,7 +364,9 @@ def execute(self, context=None):
 
         :returns: The populated response
         '''
-        identifier = b'Pymodbus'
+        information = DeviceInformationFactory.get(_MCB)
+        identifier = "-".join(information.values()).encode()
+        identifier = identifier or b'Pymodbus'
         return ReportSlaveIdResponse(identifier)
 
     def __str__(self):

test/test_other_messages.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 import unittest
 from pymodbus.other_message import *
+import mock
+
 
 class ModbusOtherMessageTest(unittest.TestCase):
     '''
@@ -86,20 +88,22 @@ def testGetCommEventLogWithEvents(self):
         self.assertEqual(response.events, [0x12,0x34,0x56])
 
     def testReportSlaveId(self):
-        request = ReportSlaveIdRequest()
-        request.decode(b'\x12')
-        self.assertEqual(request.encode(), b'')
-        self.assertEqual(request.execute().function_code, 0x11)
-
-        response = ReportSlaveIdResponse(request.execute().identifier, True)
-
-        self.assertEqual(response.encode(), b'\tPymodbus\xff')
-        response.decode(b'\x03\x12\x00')
-        self.assertEqual(response.status, False)
-        self.assertEqual(response.identifier, b'\x12\x00')
-
-        response.status = False
-        self.assertEqual(response.encode(), b'\x03\x12\x00\x00')
+        with mock.patch("pymodbus.other_message.DeviceInformationFactory") as dif:
+            dif.get.return_value = dict()
+            request = ReportSlaveIdRequest()
+            request.decode(b'\x12')
+            self.assertEqual(request.encode(), b'')
+            self.assertEqual(request.execute().function_code, 0x11)
+
+            response = ReportSlaveIdResponse(request.execute().identifier, True)
+
+            self.assertEqual(response.encode(), b'\tPymodbus\xff')
+            response.decode(b'\x03\x12\x00')
+            self.assertEqual(response.status, False)
+            self.assertEqual(response.identifier, b'\x12\x00')
+
+            response.status = False
+            self.assertEqual(response.encode(), b'\x03\x12\x00\x00')
 
 #---------------------------------------------------------------------------#
 # Main