armodel 1.7.8__py3-none-any.whl → 1.7.9__py3-none-any.whl

armodel/parser/arxml_parser.py

@@ -2,6 +2,8 @@ from typing import List
 import xml.etree.ElementTree as ET
 import os
 
+from armodel.models.M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import DocumentViewSelectable, Paginateable
+
 from ..models.M2.MSR.AsamHdo.AdminData import AdminData
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
 from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstrRule, InternalConstrs, PhysConstrs, DataConstr
@@ -21,20 +23,22 @@ from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup
 from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
 from ..models.M2.MSR.DataDictionary.ServiceProcessTask import SwServiceArg
 from ..models.M2.MSR.Documentation.Annotation import Annotation, GeneralAnnotation
+from ..models.M2.MSR.Documentation.BlockElements.Figure import Graphic, LGraphic, MlFigure
 from ..models.M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
-from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ARList
 from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LOverviewParagraph, LParagraph, LanguageSpecific
 from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultiLanguagePlainText
 from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswApiOptions, BswBackgroundEvent, BswCalledEntity, BswDataReceivedEvent
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswOperationInvokedEvent
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswApiOptions, BswAsynchronousServerCallPoint, BswBackgroundEvent
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswDataReceivedEvent, BswModuleCallPoint
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalTriggeringPoint, BswOperationInvokedEvent
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswDataReceptionPolicy, BswExternalTriggerOccurredEvent, BswInternalBehavior
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalTriggerOccurredEvent, BswInterruptEntity, BswModeSwitchEvent
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswModuleEntity, BswQueuedDataReceptionPolicy, BswSchedulableEntity
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswScheduleEvent, BswModeSenderPolicy, BswTimingEvent, BswVariableAccess
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleClientServerEntry, BswModuleEntry
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
 from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference
@@ -50,10 +54,13 @@ from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySect
 from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import RoughEstimateStackUsage, StackUsage
 from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagEventDebounceMonitorInternal
+from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticCapabilityElement, DtcStatusChangeNotificationNeeds
 from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticCommunicationManagerNeeds, DiagnosticEventInfoNeeds
 from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds
 from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import EcuStateMgrUserNeeds, NvBlockNeeds, RoleBasedDataAssignment
 from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataTypeAssignment, ServiceDependency
+from ..models.M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.BlueprintDedicated.PortPrototypeBlueprint import PortPrototypeBlueprint
+from ..models.M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.Keyword import Keyword, KeywordSet
 from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
 from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import ExecutionOrderConstraint
@@ -66,12 +73,13 @@ from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucReferenceVa
 from ..models.M2.AUTOSARTemplates.EcuResourceTemplate import HwDescriptionEntity, HwElement, HwPinGroup
 from ..models.M2.AUTOSARTemplates.EcuResourceTemplate.HwElementCategory import HwAttributeDef, HwCategory, HwType
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ElementCollection import Collection
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Describable, Identifiable
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Referrable, MultilanguageReferrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage, ReferenceBase
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral
-from ..models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
+from ..models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfo, LifeCycleInfoSet, LifeCyclePeriod
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationPrimitiveDataType, ApplicationRecordDataType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationDataType, AutosarDataType, DataTypeMap, DataTypeMappingSet
@@ -103,7 +111,8 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import Assembl
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationCompositeElementDataPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationRecordElement, AutosarDataPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import DataPrototype, ParameterDataPrototype, VariableDataPrototype
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ArgumentDataPrototype, ClientServerInterface, ClientServerOperation
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ArgumentDataPrototype, ClientServerInterface, ClientServerInterfaceMapping
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerOperation, ClientServerOperationMapping
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import DataPrototypeMapping, InvalidationPolicy, ModeSwitchInterface
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ParameterInterface, PortInterface, PortInterfaceMappingSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import SenderReceiverInterface, TriggerInterface, DataInterface
@@ -580,20 +589,23 @@ class ARXMLParser(AbstractARXMLParser):
              .setWritingFrequency(self.getChildElementOptionalPositiveInteger(element, "WRITING-FREQUENCY")) \
              .setWritingPriority(self.getChildElementOptionalLiteral(element, "WRITING-PRIORITY"))
         
-    def reaDiagnosticCommunicationManagerNeeds(self, element: ET.Element, needs: DiagnosticCommunicationManagerNeeds):
-        self.logger.debug("Read DiagnosticCommunicationManagerNeeds <%s>" % needs.getShortName())
+    def readDiagnosticCapabilityElement(self, element: ET.Element, needs: DiagnosticCapabilityElement):
         self.readIdentifiable(element, needs)
+        
+    def readDiagnosticCommunicationManagerNeeds(self, element: ET.Element, needs: DiagnosticCommunicationManagerNeeds):
+        self.logger.debug("Read DiagnosticCommunicationManagerNeeds <%s>" % needs.getShortName())
+        self.readDiagnosticCapabilityElement(element, needs)
         needs.setServiceRequestCallbackType(self.getChildElementOptionalLiteral(element, "SERVICE-REQUEST-CALLBACK-TYPE"))
 
     def readDiagnosticRoutineNeeds(self, element: ET.Element, needs: DiagnosticRoutineNeeds):
         self.logger.debug("Read DiagnosticRoutineNeeds %s" % needs.getShortName())
-        self.readIdentifiable(element, needs)
+        self.readDiagnosticCapabilityElement(element, needs)
         needs.setDiagRoutineType(self.getChildElementOptionalLiteral(element, "DIAG-ROUTINE-TYPE")) \
              .setRidNumber(self.getChildElementOptionalIntegerValue(element, "RID-NUMBER"))
 
     def readDiagnosticValueNeeds(self, element: ET.Element, needs: DiagnosticValueNeeds):
         self.logger.debug("Read DiagnosticValueNeeds %s" % needs.getShortName())
-        self.readIdentifiable(element, needs)
+        self.readDiagnosticCapabilityElement(element, needs)
         needs.setDataLength(self.getChildElementOptionalPositiveInteger(element, "DATA-LENGTH")) \
              .setDiagnosticValueAccess(self.getChildElementOptionalLiteral(element, "DIAGNOSTIC-VALUE-ACCESS")) \
              .setDidNumber(self.getChildElementOptionalIntegerValue(element, "DID-NUMBER")) \
@@ -601,7 +613,7 @@ class ARXMLParser(AbstractARXMLParser):
              .setProcessingStyle(self.getChildElementOptionalLiteral(element, "PROCESSING-STYLE"))
         
     def readDiagEventDebounceMonitorInternal(self, element: ET.Element, algorithm: DiagEventDebounceMonitorInternal):
-        self.readIdentifiable(element, algorithm)
+        self.readDiagnosticCapabilityElement(element, algorithm)
         
     def readDiagEventDebounceAlgorithm(self, element: ET.Element, needs: DiagnosticEventNeeds):
         for child_element in self.findall(element, "DIAG-EVENT-DEBOUNCE-ALGORITHM/*"):
@@ -614,14 +626,15 @@ class ARXMLParser(AbstractARXMLParser):
     
     def readDiagnosticEventNeeds(self, element: ET.Element, needs: DiagnosticEventNeeds):
         self.logger.debug("Read DiagnosticEventNeeds <%s>" % needs.getShortName())
-        self.readIdentifiable(element, needs)
+        self.readDiagnosticCapabilityElement(element, needs)
         self.readDiagEventDebounceAlgorithm(element, needs)
         needs.setDtcKind(self.getChildElementOptionalLiteral(element, "DTC-KIND")) \
              .setUdsDtcNumber(self.getChildElementOptionalIntegerValue(element, "UDS-DTC-NUMBER"))
         
     def readDiagnosticEventInfoNeeds(self, element: ET.Element, needs: DiagnosticEventInfoNeeds):
         self.logger.debug("Read DiagnosticEventInfoNeeds <%s>" % needs.getShortName())
-        self.readIdentifiable(element, needs)
+        self.readDiagnosticCapabilityElement(element, needs)
+        needs.setDtcKind(self.getChildElementOptionalLiteral(element, "DTC-KIND"))
         needs.setUdsDtcNumber(self.getChildElementOptionalPositiveInteger(element, "UDS-DTC-NUMBER"))
 
     def readCryptoServiceNeeds(self, element: ET.Element, needs: CryptoServiceNeeds):
@@ -630,9 +643,14 @@ class ARXMLParser(AbstractARXMLParser):
         needs.setMaximumKeyLength(self.getChildElementOptionalPositiveInteger(element, "MAXIMUM-KEY-LENGTH"))
 
     def readEcuStateMgrUserNeeds(self, element: ET.Element, needs: EcuStateMgrUserNeeds):
-        self.logger.debug("read EcuStateMgrUserNeeds %s" % needs.getShortName())
+        self.logger.debug("Read EcuStateMgrUserNeeds %s" % needs.getShortName())
         self.readIdentifiable(element, needs)
 
+    def readDtcStatusChangeNotificationNeeds(self, element: ET.Element, needs: DtcStatusChangeNotificationNeeds):
+        self.logger.debug("Read DtcStatusChangeNotificationNeeds %s" % needs.getShortName())
+        self.readDiagnosticCapabilityElement(element, needs)
+        needs.setDtcFormatType(self.getChildElementOptionalLiteral(element, "DTC-FORMAT-TYPE"))
+
     def readSwcServiceDependencyServiceNeeds(self, element: ET.Element, parent: SwcServiceDependency):
         for child_element in self.findall(element, "SERVICE-NEEDS/*"):
             tag_name = self.getTagName(child_element)
@@ -641,7 +659,7 @@ class ARXMLParser(AbstractARXMLParser):
                 self.readNvBlockNeeds(child_element, needs)
             elif tag_name == "DIAGNOSTIC-COMMUNICATION-MANAGER-NEEDS":
                 needs = parent.createDiagnosticCommunicationManagerNeeds(self.getShortName(child_element))
-                self.reaDiagnosticCommunicationManagerNeeds(child_element, needs)
+                self.readDiagnosticCommunicationManagerNeeds(child_element, needs)
             elif tag_name == "DIAGNOSTIC-ROUTINE-NEEDS":
                 needs = parent.createDiagnosticRoutineNeeds(self.getShortName(child_element))
                 self.readDiagnosticRoutineNeeds(child_element, needs)
@@ -660,6 +678,9 @@ class ARXMLParser(AbstractARXMLParser):
             elif tag_name == "ECU-STATE-MGR-USER-NEEDS":
                 needs = parent.createEcuStateMgrUserNeeds(self.getShortName(child_element))
                 self.readEcuStateMgrUserNeeds(child_element, needs)
+            elif tag_name == "DTC-STATUS-CHANGE-NOTIFICATION-NEEDS":
+                needs = parent.createDtcStatusChangeNotificationNeeds(self.getShortName(child_element))
+                self.readDtcStatusChangeNotificationNeeds(child_element, needs)
             else:
                 self.notImplemented("Unsupported service needs <%s>" % tag_name)
 
@@ -778,9 +799,31 @@ class ARXMLParser(AbstractARXMLParser):
     def readBswModuleEntityIssuedTriggerRefs(self, element: ET.Element, entity: BswModuleEntity):
         for ref in self.getChildElementRefTypeList(element, "ISSUED-TRIGGERS/TRIGGER-REF-CONDITIONAL/TRIGGER-REF"):
             entity.addIssuedTriggerRef(ref)
+
+    def readBswModuleEntityActivationPointRefs(self, element: ET.Element, entity: BswModuleEntity):
+        for ref in self.getChildElementRefTypeList(element, "ACTIVATION-POINTS/BSW-INTERNAL-TRIGGERING-POINT-REF-CONDITIONAL/BSW-INTERNAL-TRIGGERING-POINT-REF"):   # noqa E501
+            entity.addActivationPointRef(ref)
+
+    def readBswModuleCallPoint(self, element: ET.Element, point: BswModuleCallPoint):
+        self.readReferrable(element, point)
+
+    def readBswAsynchronousServerCallPoint(self, element: ET.Element, point: BswAsynchronousServerCallPoint):
+        self.readBswModuleCallPoint(element, point)
+        point.setCalledEntryRef(self.getChildElementOptionalRefType(element, "CALLED-ENTRY-REF"))
+
+    def readBswModuleEntityCallPoints(self, element: ET.Element, entity: BswModuleEntity):
+        for child_element in self.findall(element, "CALL-POINTS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "BSW-ASYNCHRONOUS-SERVER-CALL-POINT":
+                point = entity.createBswAsynchronousServerCallPoint(self.getShortName(child_element))
+                self.readBswAsynchronousServerCallPoint(child_element, point)
+            else:
+                self.notImplemented("Unsupported Call Point <%s>" % tag_name)
     
     def readBswModuleEntity(self, element: ET.Element, entity: BswModuleEntity):
         self.readExecutableEntity(element, entity)
+        self.readBswModuleEntityActivationPointRefs(element, entity)
+        self.readBswModuleEntityCallPoints(element, entity)
         self.readBswModuleEntityDataReceiverPoints(element, entity)
         self.readBswModuleEntityDataSendPoints(element, entity)
         entity.setImplementedEntryRef(self.getChildElementRefType(entity.getShortName(), element, "IMPLEMENTED-ENTRY-REF"))
@@ -876,11 +919,24 @@ class ARXMLParser(AbstractARXMLParser):
             else:
                 self.notImplemented("Unsupported Reception Policies <%s>" % tag_name)
 
+    def readBswInternalTriggeringPoint(self, element: ET.Element, point: BswInternalTriggeringPoint):
+        self.readIdentifiable(element, point)
+
+    def readBswInternalBehaviorInternalTriggeringPoints(self, element: ET.Element, behavior: BswInternalBehavior):
+        for child_element in self.findall(element, "INTERNAL-TRIGGERING-POINTS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "BSW-INTERNAL-TRIGGERING-POINT":
+                point = behavior.createBswInternalTriggeringPoint(self.getShortName(child_element))
+                self.readBswInternalTriggeringPoint(child_element, point)
+            else:
+                self.notImplemented("Unsupported Internal Triggering Points <%s>" % tag_name)
+
     def readBswInternalBehavior(self, element: ET.Element, behavior: BswInternalBehavior):
         self.logger.debug("Read BswInternalBehavior <%s>" % behavior.full_name)
 
         # read the internal behavior
         self.readInternalBehavior(element, behavior)
+        self.readBswInternalBehaviorInternalTriggeringPoints(element, behavior)
         self.readBswInternalBehaviorEntities(element, behavior)
         self.readBswInternalBehaviorEvents(element, behavior)
         self.readBswInternalBehaviorModeSenderPolicy(element, behavior)
@@ -936,6 +992,30 @@ class ARXMLParser(AbstractARXMLParser):
             else:
                 self.notImplemented("Unsupported Required Data <%s>" % tag_name)
 
+    def readBswModuleClientServerEntry(self, element: ET.Element, entry: BswModuleClientServerEntry):
+        self.readReferrable(element, entry)
+        entry.setEncapsulatedEntryRef(self.getChildElementOptionalRefType(element, "ENCAPSULATED-ENTRY-REF")) \
+             .setIsReentrant(self.getChildElementOptionalBooleanValue(element, "IS-REENTRANT")) \
+             .setIsSynchronous(self.getChildElementOptionalBooleanValue(element, "IS-SYNCHRONOUS"))
+
+    def readBswModuleDescriptionProvidedClientServerEntries(self, element: ET.Element, desc: BswModuleDescription):
+        for child_element in self.findall(element, "PROVIDED-CLIENT-SERVER-ENTRYS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "BSW-MODULE-CLIENT-SERVER-ENTRY":
+                entry = desc.createProvidedClientServerEntry(self.getShortName(child_element))
+                self.readBswModuleClientServerEntry(child_element, entry)
+            else:
+                self.notImplemented("Unsupported Provided Client Server Entry <%s>" % tag_name)
+
+    def readBswModuleDescriptionRequiredClientServerEntries(self, element: ET.Element, desc: BswModuleDescription):
+        for child_element in self.findall(element, "REQUIRED-CLIENT-SERVER-ENTRYS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "BSW-MODULE-CLIENT-SERVER-ENTRY":
+                entry = desc.createRequiredClientServerEntry(self.getShortName(child_element))
+                self.readBswModuleClientServerEntry(child_element, entry)
+            else:
+                self.notImplemented("Unsupported Required Client Server Entry <%s>" % tag_name)
+
     def readBswModuleDescription(self, element: ET.Element, desc: BswModuleDescription):
         self.logger.debug("Read BswModuleDescription <%s>" % desc.getShortName())
 
@@ -944,11 +1024,12 @@ class ARXMLParser(AbstractARXMLParser):
         self.readBswModuleDescriptionImplementedEntryRefs(element, desc)
         self.readBswModuleDescriptionProvidedModeGroups(element, desc)
         self.readBswModuleDescriptionRequiredModeGroups(element, desc)
-        self.readBswModuleDescriptionReleasedTriggers(element, desc)
-        self.readBswModuleDescriptionRequiredTriggers(element, desc)
+        self.readBswModuleDescriptionProvidedClientServerEntries(element, desc)
+        self.readBswModuleDescriptionRequiredClientServerEntries(element, desc)
         self.readBswModuleDescriptionProvidedDatas(element, desc)
         self.readBswModuleDescriptionRequiredDatas(element, desc)
         self.readBswModuleDescriptionBswInternalBehaviors(element, desc)
+        self.readBswModuleDescriptionRequiredTriggers(element, desc)
 
     def readSwServiceArg(self, element: ET.Element, arg: SwServiceArg):
         self.readIdentifiable(element, arg)
@@ -994,7 +1075,7 @@ class ARXMLParser(AbstractARXMLParser):
             if tag_name == "AUTOSAR-ENGINEERING-OBJECT":
                 code_desc.addArtifactDescriptor(self.getAutosarEngineeringObject(child_element))
             else:
-                self.raiseError("Unsupported Artifact Descriptor <%s>" % tag_name)
+                self.notImplemented("Unsupported Artifact Descriptor <%s>" % tag_name)
             
     def readCodeDescriptor(self, element: ET.Element, impl: Implementation):
         for child_element in self.findall(element, "CODE-DESCRIPTORS/CODE"):
@@ -1486,13 +1567,13 @@ class ARXMLParser(AbstractARXMLParser):
             results.append(l1)
         return results
     
-    def getListElements(self, element: ET.Element, key: str) -> List[ListElement]:
+    def getListElements(self, element: ET.Element, key: str) -> List[ARList]:
         '''
             Read the DocumentationBlock List
         '''
         result = []
         for child_element in self.findall(element, key):
-            list = ListElement()
+            list = ARList()
             if 'TYPE' in child_element.attrib:
                 list.setType(child_element.attrib['TYPE'])
             for block in self.getDocumentationBlockList(child_element, "ITEM"):
@@ -1500,6 +1581,41 @@ class ARXMLParser(AbstractARXMLParser):
             result.append(list)
         return result
     
+    def getGraphic(self, element: ET.Element, key: str) -> Graphic:
+        graphic = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            graphic = Graphic()
+            if "FILENAME" in child_element.attrib:
+                graphic.setFilename(child_element.attrib["FILENAME"])
+        return graphic
+    
+    def readMlFigureLGraphics(self, element: ET.Element, figure: MlFigure):
+        for child_element in self.findall(element, "L-GRAPHIC"):
+            graphic = LGraphic()
+            if "L" in child_element.attrib:
+                graphic.setL(child_element.attrib["L"])
+            graphic.setGraphic(self.getGraphic(child_element, "GRAPHIC"))
+            figure.addLGraphics(graphic)
+
+    def readDocumentViewSelectable(self, element: ET.Element, selectable: DocumentViewSelectable):
+        self.readARObjectAttributes(element, selectable)
+
+    def readPaginateable(self, element: ET.Element, paginateable: Paginateable):
+        self.readDocumentViewSelectable(element, paginateable)
+    
+    def readMlFigure(self, element: ET.Element, figure: MlFigure):
+        self.readPaginateable(element, figure)
+        self.readMlFigureLGraphics(element, figure)
+
+    def getMlFigures(self, element: ET.Element, key: str) -> List[MlFigure]:
+        result = []
+        for child_element in self.findall(element, key):
+            figure = MlFigure()
+            self.readMlFigure(child_element, figure)
+            result.append(figure)
+        return result
+    
     def getMultiLanguagePlainText(self, element: ET.Element, key: str) -> MultiLanguagePlainText:
         paragraph = None
         child_element = self.find(element, key)
@@ -1509,13 +1625,15 @@ class ARXMLParser(AbstractARXMLParser):
             for l10 in self.getLPlainTexts(child_element, "L-10"):
                 paragraph.addL10(l10)
         return paragraph
-    
+
     def readDocumentationBlock(self, element: ET.Element, block: DocumentationBlock):
         self.readARObjectAttributes(element, block)
         for paragraph in self.getMultiLanguageParagraphs(element, "P"):
             block.addP(paragraph)
         for list in self.getListElements(element, "LIST"):
             block.addList(list)
+        for figure in self.getMlFigures(element, "FIGURE"):
+            block.addFigure(figure)
 
     def getDocumentationBlock(self, element: ET.Element, key: str) -> DocumentationBlock:
         block = None
@@ -4069,10 +4187,55 @@ class ARXMLParser(AbstractARXMLParser):
 
     def readDataTransformationSet(self, element: ET.Element, dtf_set: DataTransformationSet):
         self.logger.debug("Read DataTransformationSet <%s>" % dtf_set.getShortName())
-        self.readIdentifiable(element, dtf_set)
+        self.readARElement(element, dtf_set)
         self.readDataTransformationSetDataTransformations(element, dtf_set)
         self.readDataTransformationSetTransformationTechnologies(element, dtf_set)
 
+    def readCollectionElementRefs(self, element: ET.Element, collection: Collection):
+        for ref in self.getChildElementRefTypeList(element, "ELEMENT-REFS/ELEMENT-REF"):
+            collection.addElementRef(ref)
+
+    def readCollectionSourceElementRefs(self, element: ET.Element, collection: Collection):
+        for ref in self.getChildElementRefTypeList(element, "SOURCE-ELEMENT-REFS/SOURCE-ELEMENT-REF"):
+            collection.addSourceElementRef(ref)
+
+    def readCollection(self, element: ET.Element, collection: Collection):
+        self.logger.debug("Read Collection <%s>" % collection.getShortName())
+        self.readARElement(element, collection)
+        collection.setAutoCollect(self.getChildElementOptionalLiteral(element, "AUTO-COLLECT")) \
+                  .setElementRole(self.getChildElementOptionalLiteral(element, "ELEMENT-ROLE"))
+        self.readCollectionElementRefs(element, collection)
+        self.readCollectionSourceElementRefs(element, collection)
+
+    def readKeywordClassifications(self, element: ET.Element, keyword: Keyword):
+        for literal in self.getChildElementLiteralValueList(element, "CLASSIFICATIONS/CLASSIFICATION"):
+            keyword.addClassification(literal)
+
+    def readKeyword(self, element: ET.Element, keyword: Keyword):
+        # self.logger.debug("Read Keyword <%s>" % keyword.getShortName())
+        self.readIdentifiable(element, keyword)
+        keyword.setAbbrName(self.getChildElementOptionalLiteral(element, "ABBR-NAME"))
+        self.readKeywordClassifications(element, keyword)
+
+    def readKeywordSetKeywords(self, element: ET.Element, keyword_set: KeywordSet):
+        for child_element in self.findall(element, "KEYWORDS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "KEYWORD":
+                tech = keyword_set.createKeyword(self.getShortName(child_element))
+                self.readKeyword(child_element, tech)
+            else:
+                self.notImplemented("Unsupported Keyword <%s>" % tag_name)
+
+    def readKeywordSet(self, element: ET.Element, keyword_set: KeywordSet):
+        self.logger.debug("Read KeywordSet <%s>" % keyword_set.getShortName())
+        self.readARElement(element, keyword_set)
+        self.readKeywordSetKeywords(element, keyword_set)
+
+    def readPortPrototypeBlueprint(self, element: ET.Element, blueprint: PortPrototypeBlueprint):
+        self.logger.debug("Read PortPrototypeBlueprint <%s>" % blueprint.getShortName())
+        self.readARElement(element, blueprint)
+        blueprint.setInterfaceRef(self.getChildElementOptionalRefType(element, "INTERFACE-REF"))
+
     def readCommunicationController(self, element: ET.Element, controller: CommunicationController):
         controller.setWakeUpByControllerSupported(self.getChildElementOptionalBooleanValue(element, "WAKE-UP-BY-CONTROLLER-SUPPORTED"))
 
@@ -4525,20 +4688,10 @@ class ARXMLParser(AbstractARXMLParser):
         dimension.setLengthExp(self.getChildElementOptionalNumericalValue(element, "LENGTH-EXP")) \
                  .setLuminousIntensityExp(self.getChildElementOptionalNumericalValue(element, "LUMINOUS-INTENSITY-EXP")) \
                  .setMassExp(self.getChildElementOptionalNumericalValue(element, "MASS-EXP")) \
+                 .setMolarAmountExp(self.getChildElementOptionalNumericalValue(element, "MOLAR-AMOUNT-EXP")) \
                  .setTemperatureExp(self.getChildElementOptionalNumericalValue(element, "TEMPERATURE-EXP")) \
                  .setTimeExp(self.getChildElementOptionalNumericalValue(element, "TIME-EXP")) \
-                 .setCurrentExp(self.getChildElementOptionalNumericalValue(element, "CURRENT-EXP")) \
-
-    '''
-    def getIPduMappings(self, element: ET.Element) -> List[IPduMapping]:
-        mappings = []
-        for child_element in self.findall(element, tag_name):
-            mapping = IPduMapping()
-            mapping.sourceIPduRef = self.getChildElementOptionalRefType(child_element, "SOURCE-IPDU-REF")
-            mapping.targetIPduRef = self.getChildElementOptionalRefType(child_element, "TARGET-IPDU-REF")
-            mappings.append(mapping)
-        return mappings
-    '''
+                 .setCurrentExp(self.getChildElementOptionalNumericalValue(element, "CURRENT-EXP"))
 
     def readISignalGroupISignalRef(self, element: ET.Element, group: ISignalGroup):
         for ref_type in self.getChildElementRefTypeList(element, "I-SIGNAL-REFS/I-SIGNAL-REF"):
@@ -4856,9 +5009,42 @@ class ARXMLParser(AbstractARXMLParser):
         self.logger.debug("Read GenericEthernetFrame <%s>" % frame.getShortName())
         self.readFrame(element, frame)
 
+    def getLifeCyclePeriod(self, element: ET.Element, key: str) -> LifeCyclePeriod:
+        child_element = self.find(element, key)
+        period = None
+        if child_element is not None:
+            period = LifeCyclePeriod()
+            period.setArReleaseVersion(self.getChildElementOptionalRevisionLabelString(child_element, "AR-RELEASE-VERSION"))
+        return period
+    
+    def readLifeCycleInfoUseInsteadRefs(self, element: ET.Element, info: LifeCycleInfo):
+        for ref in self.getChildElementRefTypeList(element, "USE-INSTEAD-REFS/USE-INSTEAD-REF"):
+            info.addUseInsteadRef(ref)
+
+    def readLifeCycleInfo(self, element: ET.Element, info: LifeCycleInfo):
+        self.readARObjectAttributes(element, info)
+        info.setLcObjectRef(self.getChildElementOptionalRefType(element, "LC-OBJECT-REF")) \
+            .setLcStateRef(self.getChildElementOptionalRefType(element, "LC-STATE-REF")) \
+            .setPeriodBegin(self.getLifeCyclePeriod(element, "PERIOD-BEGIN")) \
+            .setRemark(self.getDocumentationBlock(element, "REMARK"))
+        self.readLifeCycleInfoUseInsteadRefs(element, info)
+
+    def readLifeCycleInfoSetLifeCycleInfos(self, element: ET.Element, info_set: LifeCycleInfoSet):
+        for child_element in self.findall(element, "LIFE-CYCLE-INFOS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "LIFE-CYCLE-INFO":
+                info = LifeCycleInfo()
+                self.readLifeCycleInfo(child_element, info)
+                info_set.addLifeCycleInfo(info)
+            else:
+                self.notImplemented("Unsupported Life Cycle Info <%s>" % tag_name)
+
     def readLifeCycleInfoSet(self, element: ET.Element, info_set: LifeCycleInfoSet):
         self.logger.debug("Read LifeCycleInfoSet <%s>" % info_set.getShortName())
         self.readIdentifiable(element, info_set)
+        info_set.setDefaultLcStateRef(self.getChildElementOptionalRefType(element, "DEFAULT-LC-STATE-REF"))
+        self.readLifeCycleInfoSetLifeCycleInfos(element, info_set)
+        info_set.setUsedLifeCycleStateDefinitionGroupRef(self.getChildElementOptionalRefType(element, "USED-LIFE-CYCLE-STATE-DEFINITION-GROUP-REF"))
 
     def readFlatInstanceDescriptor(self, element: ET.Element, desc: FlatInstanceDescriptor):
         self.logger.debug("Read LifeCycleInfoSet %s" % desc.getShortName())
@@ -4889,18 +5075,40 @@ class ARXMLParser(AbstractARXMLParser):
             mappings.append(mapping)
         return mappings
 
-    def getVariableAndParameterInterfaceMapping(self, element: ET.Element, mapping: VariableAndParameterInterfaceMapping):
-        self.logger.debug("get VariableAndParameterInterfaceMapping %s" % mapping.getShortName())
+    def readVariableAndParameterInterfaceMapping(self, element: ET.Element, mapping: VariableAndParameterInterfaceMapping):
+        # self.logger.debug("Read VariableAndParameterInterfaceMapping %s" % mapping.getShortName())
         self.readIdentifiable(element, mapping)
         for item in self.getDataPrototypeMappings(element, "DATA-MAPPINGS"):
             mapping.addDataMapping(item)
 
+    def readClientServerOperationMapping(self, element: ET.Element, mapping: ClientServerOperationMapping):
+        mapping.setFirstOperationRef(self.getChildElementOptionalRefType(element, "FIRST-OPERATION-REF")) \
+               .setSecondOperationRef(self.getChildElementOptionalRefType(element, "SECOND-OPERATION-REF"))
+
+    def readClientServerInterfaceMappingOperationMappings(self, element: ET.Element, mapping: ClientServerInterfaceMapping):
+        for child_element in self.findall(element, "OPERATION-MAPPINGS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "CLIENT-SERVER-OPERATION-MAPPING":
+                operation_mapping = ClientServerOperationMapping()
+                self.readClientServerOperationMapping(child_element, operation_mapping)
+                mapping.addOperationMapping(operation_mapping)
+            else:
+                self.notImplemented("Unsupported Operation Mapping <%s>" % tag_name)
+
+    def readClientServerInterfaceMapping(self, element: ET.Element, mapping: ClientServerInterfaceMapping):
+        # self.logger.debug("Read ClientServerInterfaceMapping %s" % mapping.getShortName())
+        self.readIdentifiable(element, mapping)
+        self.readClientServerInterfaceMappingOperationMappings(element, mapping)
+
     def readPortInterfaceMappings(self, element: ET.Element, mapping_set: PortInterfaceMappingSet):
         for child_element in self.findall(element, "PORT-INTERFACE-MAPPINGS/*"):
             tag_name = self.getTagName(child_element)
             if tag_name == "VARIABLE-AND-PARAMETER-INTERFACE-MAPPING":
                 mapping = mapping_set.createVariableAndParameterInterfaceMapping(self.getShortName(child_element))
-                self.getVariableAndParameterInterfaceMapping(child_element, mapping)
+                self.readVariableAndParameterInterfaceMapping(child_element, mapping)
+            elif tag_name == "CLIENT-SERVER-INTERFACE-MAPPING":
+                mapping = mapping_set.createClientServerInterfaceMapping(self.getShortName(child_element))
+                self.readClientServerInterfaceMapping(child_element, mapping)
             else:
                 self.notImplemented("Unsupported PortInterfaceMapping <%s>" % tag_name)
 
@@ -5137,8 +5345,17 @@ class ARXMLParser(AbstractARXMLParser):
             elif tag_name == "DATA-TRANSFORMATION-SET":
                 transformation_set = parent.createDataTransformationSet(self.getShortName(child_element))
                 self.readDataTransformationSet(child_element, transformation_set)
+            elif tag_name == "COLLECTION":
+                collection = parent.createCollection(self.getShortName(child_element))
+                self.readCollection(child_element, collection)
+            elif tag_name == "KEYWORD-SET":
+                keyword_set = parent.createKeywordSet(self.getShortName(child_element))
+                self.readKeywordSet(child_element, keyword_set)
+            elif tag_name == "PORT-PROTOTYPE-BLUEPRINT":
+                keyword_set = parent.createPortPrototypeBlueprint(self.getShortName(child_element))
+                self.readPortPrototypeBlueprint(child_element, keyword_set)
             else:
-                self.notImplemented("Unsupported element type of ARPackage <%s>" % tag_name)
+                self.notImplemented("Unsupported Element type of ARPackage <%s>" % tag_name)
 
     def readReferenceBases(self, element: ET.Element, parent: ARPackage):
         for child_element in self.findall(element, "REFERENCE-BASES/REFERENCE-BASE"):