armodel 1.6.4__py3-none-any.whl → 1.7.1__py3-none-any.whl

armodel/writer/arxml_writer.py

@@ -2,52 +2,61 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup, SwRecordLayoutV
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import InternalConstrs, PhysConstrs
-from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis
-from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
-from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
+
+
+
+
+from ..models.M2.MSR.AsamHdo.AdminData import AdminData
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
+from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
+from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr, InternalConstrs, PhysConstrs
 from ..models.M2.MSR.AsamHdo.SpecialData import Sdg
-from ..models.M2.MSR.AsamHdo.AdminData import AdminData
-from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph
+from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
+from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
+from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
 from ..models.M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
-from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
-from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
-from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
-from ..models.M2.MSR.AsamHdo.Units import Unit
+from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis, SwCalprmAxisSet
+from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
+from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.M2.MSR.Documentation.Annotation import Annotation
+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.LanguageDataModel import LLongName, LPlainText, LanguageSpecific
+from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultiLanguagePlainText, MultilanguageLongName
 
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import TimingExtension
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import EOCExecutableEntityRef, ExecutionOrderConstraint
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
+from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.Filter import DataFilter
+from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code, Implementation
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceDependency
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming, TimingExtension
+from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import EOCExecutableEntityRef, ExecutionOrderConstraint
+from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds, RoleBasedDataAssignment, ServiceDependency
 from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
 from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
-from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype
+from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
+
 from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage, ReferenceBase
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral, Limit
+
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior, SynchronousServerCallPoint
@@ -59,36 +68,28 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate import System, SystemMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
-from ..models.M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
-from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway, ISignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame, CanFrameTriggering, RxIdentifierRange
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FrameTriggering, IPdu, ISignalGroup, ISignalIPdu, ISignalIPduGroup, ISignalTriggering, PduTriggering, SecuredIPdu, SystemSignal, DcmIPdu, Frame, ISignal, NPdu, NmPdu, SystemSignalGroup
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering, LinUnconditionalFrame
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanCluster, EcuInstance, CanPhysicalChannel, CommunicationCluster, LinCluster, LinPhysicalChannel, PhysicalChannel
-from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
-
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment, SwcServiceDependency
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ServiceSwComponentType
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, ParameterInterface, PortInterface, SenderReceiverInterface, TriggerInterface
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
-from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+
+from ..models.M2.AUTOSARTemplates.SystemTemplate import SwcToEcuMapping, System, SystemMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FrameTriggering, IPdu, IPduTiming, ISignalGroup, ISignalIPdu, ISignalIPduGroup, ISignalTriggering, PduTriggering, SecuredIPdu, SystemSignal, DcmIPdu, Frame, ISignal, NPdu, NmPdu, SystemSignalGroup
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import EventControlledTiming, TimeRangeType, TransmissionModeCondition, TransmissionModeDeclaration, TransmissionModeTiming
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway, ISignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame, CanFrameTriggering, RxIdentifierRange
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering, LinUnconditionalFrame
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanCluster, CanPhysicalChannel, CommConnectorPort, CommunicationCluster, CommunicationConnector, FramePort, IPduPort, ISignalPort, LinCluster, LinPhysicalChannel, PhysicalChannel
+from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef, VariableDataPrototypeInSystemInstanceRef
+from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
+from ..models.M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
 
 from .abstract_arxml_writer import AbstractARXMLWriter
 class ARXMLWriter(AbstractARXMLWriter):
@@ -140,44 +141,62 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setARObjectAttributes(element, referrable)
         self.setShortName(element, referrable.short_name)
 
+    def setLanguageSpecific(self, element: ET.Element, key: str, specific: LanguageSpecific):
+        child_element = ET.SubElement(element, key)
+        self.setARObjectAttributes(child_element, specific)
+        if specific.l is not None:
+            child_element.attrib['L'] = specific.l
+        child_element.text = specific.value
+
+    def setLLongName(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-4", name)
+
     def setMultiLongName(self, element: ET.Element, key: str, long_name: MultilanguageLongName):
         if long_name is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, long_name)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, long_name)
             for l4 in long_name.getL4s():
-                l4_tag = ET.SubElement(long_name_tag, "L-4")
-                self.setARObjectAttributes(l4_tag, l4)
-                if l4.l is not None:
-                    l4_tag.attrib['L'] = l4.l
-                l4_tag.text = l4.value
+                self.setLLongName(child_element, l4)
+
+    def setLOverviewParagraph(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-2", name)
 
     def setMultiLanguageOverviewParagraph(self, element: ET.Element, key: str, paragraph: MultiLanguageOverviewParagraph):
         if paragraph is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, paragraph)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
             for l2 in paragraph.getL2s():
-                l2_tag = ET.SubElement(long_name_tag, "L-2")
-                self.setARObjectAttributes(l2_tag, l2)
-                if l2.l is not None:
-                    l2_tag.attrib['L'] = l2.l
-                l2_tag.text = l2.value
+                self.setLOverviewParagraph(child_element, l2)
 
     def setMultilanguageReferrable(self, element: ET.Element, referrable: MultilanguageReferrable):
         self.setReferable(element, referrable)
         if referrable.longName is not None:
             self.setMultiLongName(element, "LONG-NAME", referrable.longName)
 
+    def setLPlainText(self, element: ET.Element, text: LPlainText):
+        self.setLanguageSpecific(element, "L-10", text)
+
+    def setMultiLanguagePlainText(self, element: ET.Element, key: str, paragraph: MultiLanguagePlainText):
+        if paragraph is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
+            for l10 in paragraph.getL10s():
+                self.setLPlainText(child_element, l10)
+
     def setAdminData(self, element: ET.Element, admin_data: AdminData):
-        element = ET.SubElement(element, "ADMIN-DATA")
-        self.writeSdgs(element, admin_data)
+        if admin_data is not None:
+            child_element = ET.SubElement(element, "ADMIN-DATA")
+            self.setChildElementOptionalLiteral(child_element, "LANGUAGE", admin_data.getLanguage())
+            self.setMultiLanguagePlainText(child_element, "USED-LANGUAGES", admin_data.getUsedLanguages())
+            self.writeSdgs(child_element, admin_data)
 
     def setIdentifiable(self, element: ET.Element, identifiable: Identifiable):
         self.setMultilanguageReferrable(element, identifiable)
         self.setAnnotations(element, identifiable.getAnnotations())
         self.setMultiLanguageOverviewParagraph(element, "DESC", identifiable.getDesc())
         self.setChildElementOptionalLiteral(element, "CATEGORY", identifiable.getCategory())
-        if identifiable.getAdminData() is not None:
-            self.setAdminData(element, identifiable.getAdminData())
+        self.setDocumentationBlock(element, "INTRODUCTION", identifiable.getIntroduction())
+        self.setAdminData(element, identifiable.getAdminData())
 
     def setARElement(self, parent: ET.Element, ar_element: ARElement):
         self.setIdentifiable(parent, ar_element)
@@ -575,12 +594,23 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setARObjectAttributes(child_element, paragraph)
             self.writeLParagraphs(child_element, paragraph)
         return paragraphs
+    
+    def setListElement(self, element: ET.Element, key: str, list: ListElement):
+        if list is not None:
+            child_element = ET.SubElement(element, key)
+            type = list.getType()
+            if type is not None:
+                child_element.attrib['TYPE'] = type
+            for item in list.getItems():
+                self.setDocumentationBlock(child_element, "ITEM", item)
 
     def setDocumentationBlock(self, element: ET.Element, key: str, block: DocumentationBlock):
         if block is not None:
             child_element = ET.SubElement(element, key)
             self.setARObjectAttributes(child_element, block)
             self.setMultiLanguageParagraphs(child_element, "P", block.getPs())
+            for list in block.getLists():
+                self.setListElement(child_element, "LIST", list)
 
     def writeGeneralAnnotation(self, element: ET.Element, annotation: Annotation):
         self.setMultiLongName(element, "LABEL", annotation.getLabel())
@@ -646,9 +676,10 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-CALIBRATION-ACCESS", sw_data_def_props.getSwCalibrationAccess())
             self.setSwCalprmAxisSet(sw_data_def_props_conditional_tag, "SW-CALPRM-AXIS-SET", sw_data_def_props.getSwCalprmAxisSet())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "COMPU-METHOD-REF", sw_data_def_props.getCompuMethodRef())
+            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-IMPL-POLICY", sw_data_def_props.getSwImplPolicy())
+            self.setChildElementOptionalNumericalValue(sw_data_def_props_conditional_tag, "SW-INTENDED-RESOLUTION", sw_data_def_props.getSwIntendedResolution())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF", sw_data_def_props.getImplementationDataTypeRef())
-            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "SW-RECORD-LAYOUT-REF", sw_data_def_props.getSwRecordLayoutRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "VALUE-AXIS-DATA-TYPE-REF", sw_data_def_props.getValueAxisDataTypeRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "UNIT-REF", sw_data_def_props.getUnitRef())
@@ -963,6 +994,14 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", ref.getAutosarVariableIRef().getTargetDataPrototypeRef())
             self.setChildElementOptionalRefType(child_element, "LOCAL-VARIABLE-REF", ref.getLocalVariableRef())
 
+    def setComponentInSystemInstanceRef(self, element: ET.Element, tag_name: str, ref: ComponentInSystemInstanceRef):
+        if ref is not None:
+            child_element = ET.SubElement(element, tag_name)
+            self.setARObjectAttributes(child_element, ref)
+            self.setChildElementOptionalRefType(child_element, "BASE-REF", ref.getBaseRef())
+            self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPOSITION-REF", ref.getContextCompositionRef())
+            self.setChildElementOptionalRefType(child_element, "TARGET-COMPONENT-REF", ref.getTargetComponentRef())
+
     def setVariableAccess(self, element: ET.Element, access: VariableAccess):
         child_element = ET.SubElement(element, "VARIABLE-ACCESS")
         self.setIdentifiable(child_element, access)
@@ -2239,6 +2278,7 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def readAbstractCanCluster(self, element: ET.Element, cluster: AbstractCanCluster):
         self.setChildElementOptionalNumericalValue(element, "CAN-FD-BAUDRATE", cluster.getCanFdBaudrate())
+        self.setChildElementOptionalNumericalValue(element, "SPEED", cluster.getSpeed())
 
     def writeLinCluster(self, element: ET.Element, cluster: LinCluster):
         self.logger.debug("LinCluster %s" % cluster.short_name)
@@ -2259,14 +2299,89 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.readAbstractCanCluster(child_element, cluster)
 
     def writeCanFrame(self, element: ET.Element, frame: CanFrame):
-        self.logger.debug("CanFrame %s" % frame.short_name)
+        self.logger.debug("Write CanFrame %s" % frame.short_name)
         child_element = ET.SubElement(element, "CAN-FRAME")
         self.writeFrame(child_element, frame)
 
+    def writeCommConnectorPort(self, element: ET.Element, port: CommConnectorPort):
+        self.setIdentifiable(element, port)
+        self.setChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION", port.getCommunicationDirection())
+
+    def writeFramePort(self, element: ET.Element, port: FramePort):
+        child_element = ET.SubElement(element, "FRAME-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeIPduPort(self, element: ET.Element, port: IPduPort):
+        child_element = ET.SubElement(element, "I-PDU-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeISignalPort(self, element: ET.Element, port: ISignalPort):
+        child_element = ET.SubElement(element, "I-SIGNAL-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeCommunicationConnectorEcuCommPortInstances(self, element: ET.Element, connector: CommunicationConnector):
+        self.logger.debug("write EcuCommPortInstances of CommunicationConnector %s" % connector.getShortName())
+        ports = connector.getEcuCommPortInstances()
+        if len(ports) > 0:
+            instances_tag = ET.SubElement(element, "ECU-COMM-PORT-INSTANCES")
+            for port in ports:
+                if isinstance(port, FramePort):
+                    self.writeFramePort(instances_tag, port)
+                elif isinstance(port, IPduPort):
+                    self.writeIPduPort(instances_tag, port)
+                elif isinstance(port, ISignalPort):
+                    self.writeISignalPort(instances_tag, port)
+                else:
+                    self._raiseError("Unsupported CommConnectorPort <%s>" % type(port))      
+
+    def writeCanCommunicationController(self, element: ET.Element, controller: CanCommunicationController):
+        self.logger.debug("Write CanCommunicationController %s" % controller.getShortName())
+        self.setIdentifiable(element, controller)
+
+    def writeEcuInstanceCommControllers(self, element: ET.Element, instance: EcuInstance):
+        controllers = instance.getCommControllers()
+        if len(controllers) > 0:
+            controllers_tag = ET.SubElement(element, "COMM-CONTROLLERS")
+            for controller in controllers:
+                if isinstance(controller, CanCommunicationController):
+                    child_element = ET.SubElement(controllers_tag, "CAN-COMMUNICATION-CONTROLLER")
+                    self.writeCanCommunicationController(child_element, controller)
+                else:
+                    self._raiseError("Unsupported Communication Controller <%s>" % type(controller))
+
+    def writeCommunicationConnector(self, element: ET.Element, connector: CommunicationConnector):
+        self.setIdentifiable(element, connector)
+        self.setChildElementOptionalRefType(element, "COMM-CONTROLLER-REF", connector.getCommControllerRef())
+        self.writeCommunicationConnectorEcuCommPortInstances(element, connector)
+
+
+    def writeCanCommunicationConnector(self, element: ET.Element, connector: CanCommunicationConnector):
+        self.logger.debug("Write CanCommunicationConnector %s" % connector.getShortName())
+        self.writeCommunicationConnector(element, connector)                
+
+    def writeEcuInstanceConnectors(self, element: ET.Element, instance: EcuInstance):
+        connectors = instance.getConnectors()
+        if len(connectors) > 0:
+            connectors_tag = ET.SubElement(element, "CONNECTORS")
+            for connector in connectors:
+                if isinstance(connector, CanCommunicationConnector):
+                    child_element = ET.SubElement(connectors_tag, "CAN-COMMUNICATION-CONNECTOR")
+                    self.writeCanCommunicationConnector(child_element, connector)
+                else:
+                    self._raiseError("Unsupported Communication connector <%s>" % type(connector))
+
     def writeEcuInstance(self, element: ET.Element, instance: EcuInstance):
         self.logger.debug("EcuInstance %s" % instance.short_name)
         child_element = ET.SubElement(element, "ECU-INSTANCE")
         self.setIdentifiable(child_element, instance)
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-GW-TIME-BASE", instance.getComConfigurationGwTimeBase())
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-RX-TIME-BASE", instance.getComConfigurationRxTimeBase())
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-TX-TIME-BASE", instance.getComConfigurationTxTimeBase())
+        self.setChildElementOptionalBooleanValue(child_element, "COM-ENABLE-MDT-FOR-CYCLIC-TRANSMISSION", instance.getComEnableMDTForCyclicTransmission())
+        self.writeEcuInstanceCommControllers(child_element, instance)
+        self.writeEcuInstanceConnectors(child_element, instance)
+        self.setChildElementOptionalBooleanValue(child_element, "SLEEP-MODE-SUPPORTED", instance.getSleepModeSupported())
+        self.setChildElementOptionalBooleanValue(child_element, "WAKE-UP-OVER-BUS-SUPPORTED", instance.getWakeUpOverBusSupported())
 
     def writeSystemSignalGroup(self, element: ET.Element, group: SystemSignalGroup):
         self.logger.debug("Write SystemSignalGroup %s" % group.short_name)
@@ -2299,12 +2414,33 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setSenderReceiverToSignalGroupMapping(child_element, data_mapping)
                 else:
                     raise NotImplementedError("Unsupported Data Mapping %s" % type(data_mapping))
+                
+    def setSwcToEcuMapping(self, element: ET.Element, mapping: SwcToEcuMapping):
+        child_element = ET.SubElement(element, "SWC-TO-ECU-MAPPING")
+        self.setIdentifiable(child_element, mapping)
+        irefs = mapping.getComponentIRefs()
+        if len(irefs) > 0:
+            irefs_tag = ET.SubElement(child_element, "COMPONENT-IREFS")
+            for iref in irefs:
+                self.setComponentInSystemInstanceRef(irefs_tag, "COMPONENT-IREF", iref)
+        self.setChildElementOptionalRefType(child_element, "ECU-INSTANCE-REF", mapping.getEcuInstanceRef())
+                
+    def writeSystemMappingSwMappings(self, element: ET.Element, system_mapping: SystemMapping):
+        sw_mappings = system_mapping.getSwMappings()
+        if len(sw_mappings) > 0:
+            child_element = ET.SubElement(element, "SW-MAPPINGS")
+            for sw_mapping in sw_mappings:
+                if isinstance(sw_mapping, SwcToEcuMapping):
+                    self.setSwcToEcuMapping(child_element, sw_mapping)
+                else:
+                    raise NotImplementedError("Unsupported Sw Mapping %s" % type(sw_mapping))
 
     def writeSystemMapping(self, element: ET.Element, mapping: SystemMapping):
         self.logger.debug("Write SystemMapping %s" % mapping.short_name)
         child_element = ET.SubElement(element, "SYSTEM-MAPPING")
         self.setIdentifiable(child_element, mapping)
         self.writeSystemMappingDataMappings(child_element, mapping)
+        self.writeSystemMappingSwMappings(child_element, mapping)
 
     def writeSystemMappings(self, element: ET.Element, system: System):
         mappings = system.getMappings()
@@ -2316,6 +2452,15 @@ class ARXMLWriter(AbstractARXMLWriter):
                 else:
                     raise NotImplementedError("Unsupported Mapping %s" % type(mapping))
                 
+    def writeRootSwCompositionPrototype(self, element: ET.Element, system: System):
+        prototype = system.getRootSoftwareComposition()
+        if prototype is not None:
+            self.logger.debug("Write RootSwCompositionPrototype <%s>" % prototype.getShortName())
+            child_element = ET.SubElement(element, "ROOT-SOFTWARE-COMPOSITIONS")
+            child_element = ET.SubElement(child_element, "ROOT-SW-COMPOSITION-PROTOTYPE")
+            self.setIdentifiable(child_element, prototype)
+            self.setChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF", prototype.getSoftwareCompositionTRef())
+                
     def writeSystem(self, element: ET.Element, system: System):
         self.logger.debug("Write System %s" % system.short_name)
         child_element = ET.SubElement(element, "SYSTEM")
@@ -2330,6 +2475,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(fibex_element_ref_conditional_tag, "FIBEX-ELEMENT-REF", ref)
 
         self.writeSystemMappings(child_element, system)
+        self.writeRootSwCompositionPrototype(child_element, system)
+        self.setChildElementOptionalRevisionLabelString(child_element, "SYSTEM-VERSION", system.getSystemVersion())
 
     def writePhysicalDimension(self, element: ET.Element, dimension: PhysicalDimension):
         self.logger.debug("Write PhysicalDimension %s" % dimension.short_name)
@@ -2518,11 +2665,16 @@ class ARXMLWriter(AbstractARXMLWriter):
         child_element = ET.SubElement(element, "PARAMETER-INTERFACE")
         self.setIdentifiable(child_element, signal)
 
-    def writeGenericEthernetFrame(self, element: ET.Element, signal: SystemSignal):
+    def writeGenericEthernetFrame(self, element: ET.Element, signal: GenericEthernetFrame):
         self.logger.debug("Write GenericEthernetFrame %s" % signal.short_name)
         child_element = ET.SubElement(element, "ETHERNET-FRAME")
         self.writeFrame(child_element, signal)
 
+    def writeLifeCycleInfoSet(self, element: ET.Element, set: LifeCycleInfoSet):
+        self.logger.debug("Write LifeCycleInfoSet %s" % set.short_name)
+        child_element = ET.SubElement(element, "LIFE-CYCLE-INFO-SET")
+        self.setIdentifiable(child_element, set)
+
     def writeISignalToPduMappings(self, element: ET.Element, parent: ISignalIPdu):
         mappings = parent.getISignalToPduMappings()
         if len(mappings) > 0:
@@ -2536,12 +2688,55 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalNumericalValue(child_element, "START-POSITION", mapping.getStartPosition())
                 self.setChildElementOptionalLiteral(child_element, "TRANSFER-PROPERTY", mapping.getTransferProperty())
                 self.setChildElementOptionalNumericalValue(child_element, "UPDATE-INDICATION-BIT-POSITION", mapping.getUpdateIndicationBitPosition())
+    
+    def setDataFilter(self, element: ET.Element, key: str, filter: DataFilter):
+        child_element = ET.SubElement(element, key)
+        self.setChildElementOptionalLiteral(child_element, "DATA-FILTER-TYPE", filter.getDataFilterType())
+
+    def setTransmissionModeConditions(self, element: ET.Element, conditions: List[TransmissionModeCondition]):
+        if len(conditions) > 0:
+            conditions_tag = ET.SubElement(element, "TRANSMISSION-MODE-CONDITIONS")
+            for condition in conditions:
+                child_element = ET.SubElement(conditions_tag, "TRANSMISSION-MODE-CONDITION")
+                self.setDataFilter(child_element, "DATA-FILTER", condition.getDataFilter())
+                self.setChildElementOptionalRefType(child_element, "I-SIGNAL-IN-I-PDU-REF", condition.getISignalInIPduRef())
+
+    def setTimeRangeType(self, element: ET.Element, key: str, time_range: TimeRangeType):
+         if time_range is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalTimeValue(child_element, "VALUE", time_range.getValue())
+
+    def setEventControlledTiming(self, element: ET.Element, key: str, timing: EventControlledTiming):
+        if timing is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalIntegerValue(child_element, "NUMBER-OF-REPETITIONS", timing.getNumberOfRepetitions())
+            self.setTimeRangeType(child_element, "REPETITION-PERIOD", timing.getRepetitionPeriod())
+
+    def setTransmissionModeTiming(self, element: ET.Element, key: str, timing: TransmissionModeTiming):
+        if timing is not None:
+            self.logger.debug("Set TransmissionModeTiming of <%s>" % key)
+            child_element = ET.SubElement(element, key)
+            #timing.getCyclicTiming(child_element, "")
+            self.setEventControlledTiming(child_element, "EVENT-CONTROLLED-TIMING", timing.getEventControlledTiming())
+
+    def setTransmissionModeDeclaration(self, element: ET.Element, key: str, decl : TransmissionModeDeclaration):
+        if decl is not None:
+            child_element = ET.SubElement(element, key)
+            self.setTransmissionModeConditions(child_element, decl.getTransmissionModeConditions())
+            self.setTransmissionModeTiming(child_element, "TRANSMISSION-MODE-TRUE-TIMING", decl.getTransmissionModeTrueTiming())
+
+    def setISignalIPduIPduTimingSpecification(self, element: ET.Element, timing: IPduTiming):
+        if timing is not None:
+            spec_tag = ET.SubElement(element, "I-PDU-TIMING-SPECIFICATIONS")
+            child_element = ET.SubElement(spec_tag, "I-PDU-TIMING")
+            self.setTransmissionModeDeclaration(child_element, "TRANSMISSION-MODE-DECLARATION", timing.getTransmissionModeDeclaration())
 
     def writeISignalIPdu(self, element: ET.Element, i_pdu: ISignalIPdu):
         self.logger.debug("ISignalIPdu %s" % i_pdu.short_name)
         child_element = ET.SubElement(element, "I-SIGNAL-I-PDU")
         self.setIdentifiable(child_element, i_pdu)
         self.setChildElementOptionalNumericalValue(child_element, "LENGTH", i_pdu.getLength())
+        self.setISignalIPduIPduTimingSpecification(child_element, i_pdu.getIPduTimingSpecification())
         self.writeISignalToPduMappings(child_element, i_pdu)
         self.setChildElementOptionalLiteral(child_element, "UNUSED-BIT-PATTERN", i_pdu.getUnusedBitPattern())
 
@@ -2640,9 +2835,23 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeParameterInterface(element, ar_element)
         elif isinstance(ar_element, GenericEthernetFrame):
             self.writeGenericEthernetFrame(element, ar_element)
+        elif isinstance(ar_element, LifeCycleInfoSet):
+            self.writeLifeCycleInfoSet(element, ar_element)
         else:
             raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
         
+    def writeReferenceBases(self, element: ET.Element, bases: List[ReferenceBase]):
+        self.logger.debug("Write ReferenceBases")
+        if len(bases) > 0:
+            bases_tag = ET.SubElement(element, "REFERENCE-BASES")
+            for base in bases:
+                child_element = ET.SubElement(bases_tag, "REFERENCE-BASE")
+                self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", base.getShortLabel())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-DEFAULT", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-GLOBAL", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element,  "BASE-IS-THIS-PACKAGE", base.getBaseIsThisPackage())
+                self.setChildElementOptionalRefType(child_element, "PACKAGE-REF", base.getPackageRef())
+        
     def writeARPackages(self, element: ET.Element, pkgs: List[ARPackage]):
         if len(pkgs) > 0:
             pkgs_tag = ET.SubElement(element, "AR-PACKAGES")
@@ -2653,6 +2862,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setIdentifiable(pkg_tag, pkg)
                 self.logger.debug("writeARPackage %s" % pkg.full_name)
 
+                self.writeReferenceBases(pkg_tag, pkg.getReferenceBases())
+
                 if pkg.getTotalElement() > 0:
                     elements_tag = ET.SubElement(pkg_tag, "ELEMENTS")
 
@@ -2661,6 +2872,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                             self.writeARPackageElement(elements_tag, ar_element)
 
                 self.writeARPackages(pkg_tag, pkg.getARPackages())
+                
 
     def save(self, filename, document: AUTOSAR):
         self.logger.info("Save %s ..." % filename)
@@ -2669,6 +2881,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         root.attrib["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance"
         root.attrib["xsi:schemaLocation"] = document.schema_location
         
+        self.setAdminData(root, document.getAdminData())
         self.writeARPackages(root, document.getARPackages())
 
         self.saveToFile(filename, root)

{armodel-1.6.4.dist-info → armodel-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.6.4
+Version: 1.7.1
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -369,3 +369,25 @@ Fix the attribute intervalType of **Limit** is empty issue.
 2. Fix the Binary value
 3. Refactor the SwComponentType.
 
+**Version 1.7.0**
+
+1. To support the following AR Element:
+   * SWC-TO-ECU-MAPPING
+   * SW-MAPPINGS
+   * ROOT-SOFTWARE-COMPOSITIONS
+   * SPEED
+   * ECU-INSTANCE
+   * COMM-CONTROLLERS
+   * CAN-COMMUNICATION-CONNECTOR
+   * I-PDU-TIMING
+   * DATA-FILTER
+   * EVENT-CONTROLLED-TIMING
+
+**Version 1.7.1**
+
+1. To support the following AR Element:
+   * INTRODUCTION
+   * LIST
+   * SW-INTENDED-RESOLUTION
+   * REFERENCE-BASE
+