Merge branch 'wanam-master'

Author: pylessard

test/client/test_read_data_by_identifier.py

@@ -17,6 +17,26 @@ def decode(self, did_payload):
     def __len__(self):
         return 1
 
+class ReadRemainingDataCodec(DidCodec):
+
+    def encode(self, *args, **kwargs):
+        return b''
+
+    def decode(self, did_payload):
+        return did_payload
+
+    def __len__(self):
+        raise self.ReadAllRemainingData
+
+class CodecWithNoLength(DidCodec):
+
+    def encode(self, *args, **kwargs):
+        return b''
+
+    def decode(self, did_payload):
+        return did_payload
+
+
 class TestReadDataByIdentifier(ClientServerTest):
     def __init__(self, *args, **kwargs):
         ClientServerTest.__init__(self, *args, **kwargs)
@@ -26,7 +46,9 @@ def postClientSetUp(self):
                 1 : '>H',
                 2 : '<H',
                 3 : StubbedDidCodec,
-                4 : AsciiCodec(5)
+                4 : AsciiCodec(5),
+                5 : ReadRemainingDataCodec,
+                6 : CodecWithNoLength
         }
 
     def test_rdbi_single_success(self):
@@ -125,10 +147,29 @@ def _test_rdbi_multiple_zero_padding_not_tolerated_no_exception(self):
             self.udsclient.config['data_identifiers'][0] = 'B'*i
             response = self.udsclient.read_data_by_identifier(didlist = [1,2,3])
             self.assertTrue(response.valid)
-            self.assertTrue(response.unexpected)		
+            self.assertTrue(response.unexpected)	
 
+    def test_rdbi_variable_size_did(self):
+        self.wait_request_and_respond(b"\x62\x00\x01\x12\x34\x00\x02\x56\x78\x00\x05\xaa\xbb\xcc\xdd")  
+
+    def _test_rdbi_variable_size_did(self):
+        response = self.udsclient.read_data_by_identifier(didlist = [1,2,5])
+        self.assertTrue(response.positive)
+        values = response.service_data.values
+        self.assertEqual(values[1], (0x1234,))      
+        self.assertEqual(values[2], (0x7856,))      
+        self.assertEqual(values[5], b'\xaa\xbb\xcc\xdd') 
+
+    # DID 5 read all the data up to the end. Makes no sense to read another DID after that.
+    def test_rdbi_variable_size_did_not_last(self):
+        pass
+
+    def _test_rdbi_variable_size_did_not_last(self):
+        with self.assertRaises(ValueError):
+            self.udsclient.read_data_by_identifier(didlist = [1,2,5,3])
+       
     def test_rdbi_incomplete_response_exception(self):
-        self.wait_request_and_respond(b"\x62\x00\x01\x12\x34\x00\x02\x56\x78\x00\x03")	
+        self.wait_request_and_respond(b"\x62\x00\x01\x12\x34\x00\x02\x56\x78\x00\x03")  
 
     def _test_rdbi_incomplete_response_exception(self):
         with self.assertRaises(InvalidResponseException):
@@ -211,3 +252,10 @@ def test_no_config(self):
     def _test_no_config(self):
         with self.assertRaises(ConfigError):
             self.udsclient.read_data_by_identifier(didlist=[1,2,3,99]) 
+
+    def test_no_length(self):
+        pass
+
+    def _test_no_length(self):
+        with self.assertRaises(NotImplementedError):
+            self.udsclient.read_data_by_identifier(didlist=[6]) 

udsoncan/__init__.py

@@ -40,6 +40,9 @@ class DidCodec:
     :type packstr: string
     """
 
+    class ReadAllRemainingData(Exception):
+        pass
+
     def __init__(self, packstr=None):
         self.packstr = packstr
 

udsoncan/services/ReadDataByIdentifier.py

@@ -45,10 +45,28 @@ def make_request(cls, didlist, didconfig):
         :raises ConfigError: If didlist contains a DID not defined in didconfig
         """		
         from udsoncan import Request
+        from udsoncan import DidCodec
+
         didlist = cls.validate_didlist_input(didlist)
 
         req = Request(cls)
         ServiceHelper.check_did_config(didlist, didconfig)
+
+        did_reading_all_data = None
+        for did in didlist:
+            if did not in didconfig:    # Already checked in check_did_config. Paranoid check
+                raise ConfigError(key=did, msg='Actual data identifier configuration contains no definition for data identifier 0x%04x' % did)
+                
+            codec = DidCodec.from_config(didconfig[did])
+            try:
+                length = len(codec)
+                if did_reading_all_data is not None:
+                    raise ValueError('Did 0x%04X is configured to read the rest of the payload (__len__ raisong ReadAllRemainingData), but a subsequent DID is requested (0x%04x)' % (did_reading_all_data, did))
+            except DidCodec.ReadAllRemainingData:
+                if did_reading_all_data is not None:
+                    raise ValueError('It is impossible to read 2 DIDs configured to read the rest of the payload (__len__ raising ReadAllRemainingData). Dids are : 0x%04X and 0x%04X' % (did_reading_all_data, did))
+                did_reading_all_data = did
+
         req.data = struct.pack('>'+'H'*len(didlist), *didlist) #Encode list of DID
 
         return req
@@ -104,11 +122,16 @@ def interpret_response(cls, response, didlist, didconfig, tolerate_zero_padding=
             codec = DidCodec.from_config(didconfig[did])
             offset+=2
 
-            if len(response.data) < offset+len(codec):
+            try:
+                payload_size = len(codec)
+            except DidCodec.ReadAllRemainingData:
+                payload_size = len(response.data) - offset
+
+            if len(response.data) < offset+payload_size:
                 raise InvalidResponseException(response, "Value for data identifier 0x%04x was incomplete according to definition in configuration" % did)
 
-            subpayload = response.data[offset:offset+len(codec)]
-            offset += len(codec)	# Codec must define a __len__ function that matches the encoded payload length.
+            subpayload = response.data[offset:offset+payload_size]
+            offset += payload_size	# Codec must define a __len__ function that matches the encoded payload length.
             val = codec.decode(subpayload)
             response.service_data.values[did] = val