Merge pull request #247 from mercedes-benz/hotfix/comparam_instance

Hotfix for ComparamInstance
mercedes-benz · Dec 8, 2023 · f9777bc · f9777bc
2 parents 480a5f6 + 4901b2c
commit f9777bc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/examples/somersaultecu.py b/examples/somersaultecu.py
@@ -1582,7 +1582,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1616,7 +1616,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1650,7 +1650,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1693,7 +1693,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1725,7 +1725,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1776,7 +1776,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1821,7 +1821,7 @@ class SomersaultSID(IntEnum):
             is_mandatory_raw=None,
             is_executable_raw=None,
             is_final_raw=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -2256,7 +2256,7 @@ class SomersaultSID(IntEnum):
             neg_response_refs=[
                 OdxLinkRef.from_id(somersault_assiduous_negative_responses["fell_over"].odx_id),
             ],
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,

diff --git a/odxtools/diagservice.py b/odxtools/diagservice.py
@@ -38,7 +38,7 @@ class DiagService(DiagComm):
     """Representation of a diagnostic service description.
     """
 
-    comparam_refs: NamedItemList[ComparamInstance]
+    comparam_refs: List[ComparamInstance]
 
     request_ref: OdxLinkRef
     pos_response_refs: List[OdxLinkRef]
@@ -56,10 +56,10 @@ def from_et(et_element: ElementTree.Element, doc_frags: List[OdxDocFragment]) ->
 
         kwargs = dataclass_fields_asdict(DiagComm.from_et(et_element, doc_frags))
 
-        comparam_refs = NamedItemList([
+        comparam_refs = [
             ComparamInstance.from_et(el, doc_frags)
             for el in et_element.iterfind("COMPARAM-REFS/COMPARAM-REF")
-        ])
+        ]
 
         request_ref = odxrequire(OdxLinkRef.from_et(et_element.find("REQUEST-REF"), doc_frags))
 
@@ -135,7 +135,7 @@ def negative_responses(self) -> NamedItemList[Response]:
 
     @property
     def comparams(self) -> NamedItemList[ComparamInstance]:
-        return self.comparam_refs
+        return self._comparams
 
     @property
     def addressing(self) -> Addressing:
@@ -181,6 +181,10 @@ def _resolve_snrefs(self, diag_layer: "DiagLayer") -> None:
         for cpr in self.comparam_refs:
             cpr._resolve_snrefs(diag_layer)
 
+        # comparams named list is lazy loaded
+        # since ComparamInstance short_name is only valid after resolution
+        self._comparams = NamedItemList(self.comparam_refs)
+
     def decode_message(self, raw_message: bytes) -> Message:
         request_prefix = b''
         candidate_coding_objects: List[Union[Request, Response]] = [

diff --git a/tests/test_decoding.py b/tests/test_decoding.py
@@ -2,7 +2,6 @@
 import unittest
 from typing import cast
 
-from odxtools.comparaminstance import ComparamInstance
 from odxtools.compumethods.identicalcompumethod import IdenticalCompuMethod
 from odxtools.compumethods.limit import IntervalType, Limit
 from odxtools.compumethods.linearcompumethod import LinearCompuMethod
@@ -95,7 +94,7 @@ def test_prefix_tree_construction(self) -> None:
             admin_data=None,
             semantic=None,
             audience=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -170,7 +169,7 @@ def test_prefix_tree_construction(self) -> None:
             admin_data=None,
             semantic=None,
             audience=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -294,7 +293,7 @@ def test_decode_request_coded_const(self) -> None:
             is_executable_raw=None,
             is_final_raw=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -438,7 +437,7 @@ def test_decode_request_coded_const_undefined_byte_position(self) -> None:
             is_final_raw=None,
             admin_data=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -624,7 +623,7 @@ def test_decode_request_structure(self) -> None:
             is_final_raw=None,
             admin_data=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -829,7 +828,7 @@ def test_decode_request_end_of_pdu_field(self) -> None:
             is_final_raw=None,
             admin_data=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -988,7 +987,7 @@ def test_decode_request_linear_compu_method(self) -> None:
             is_executable_raw=None,
             is_final_raw=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,
@@ -1184,7 +1183,7 @@ def test_decode_response(self) -> None:
             is_executable_raw=None,
             is_final_raw=None,
             semantic=None,
-            comparam_refs=NamedItemList[ComparamInstance](),
+            comparam_refs=[],
             is_cyclic_raw=None,
             is_multiple_raw=None,
             addressing_raw=None,

diff --git a/tests/test_ecu_variant_matching.py b/tests/test_ecu_variant_matching.py
@@ -4,7 +4,6 @@
 
 import pytest
 
-from odxtools.comparaminstance import ComparamInstance
 from odxtools.diaglayer import DiagLayer
 from odxtools.diaglayerraw import DiagLayerRaw
 from odxtools.diaglayertype import DiagLayerType
@@ -74,7 +73,7 @@ def ident_service(monkeypatch: pytest.MonkeyPatch, dummy_response: Response) ->
         is_mandatory_raw=None,
         is_executable_raw=None,
         is_final_raw=None,
-        comparam_refs=NamedItemList[ComparamInstance](),
+        comparam_refs=[],
         is_cyclic_raw=None,
         is_multiple_raw=None,
         addressing_raw=None,
@@ -123,7 +122,7 @@ def supplier_service(monkeypatch: pytest.MonkeyPatch, dummy_response: Response)
         is_mandatory_raw=None,
         is_executable_raw=None,
         is_final_raw=None,
-        comparam_refs=NamedItemList[ComparamInstance](),
+        comparam_refs=[],
         is_cyclic_raw=None,
         is_multiple_raw=None,
         addressing_raw=None,