armodel 1.6.3__py3-none-any.whl → 1.7.0__py3-none-any.whl

armodel/writer/arxml_writer.py

@@ -2,95 +2,91 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup, SwRecordLayoutV
 
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
 
-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.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 ..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.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.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.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
 
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
 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
-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.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+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.SWComponentTemplate.Components import PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+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 RunnableEntityArgument, SynchronousServerCallPoint
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior, SynchronousServerCallPoint
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwConnector
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, DelegationSwConnector, SwComponentPrototype, SwConnector
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface.instance_refs import ApplicationCompositeElementInPortInterfaceInstanceRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate import System, SystemMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
-from ..models.M2.AUTOSARTemplates.SystemTemplate.transport_protocols import CanTpConfig
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
-
-from ..models.fibex.fibex_4_multiplatform import Gateway, ISignalMapping
-from ..models.fibex.can_communication import CanFrame, CanFrameTriggering, RxIdentifierRange
-from ..models.fibex.fibex_core.core_communication import FrameTriggering, IPdu, ISignalGroup, ISignalIPdu, ISignalIPduGroup, ISignalTriggering, PduTriggering, SecuredIPdu, SystemSignal, DcmIPdu, Frame, ISignal, NPdu, NmPdu, SystemSignalGroup
-from ..models.fibex.lin_communication import LinFrameTriggering, LinUnconditionalFrame
-from ..models.fibex.fibex_core.core_topology import AbstractCanCluster, CanCluster, EcuInstance, CanPhysicalChannel, CommunicationCluster, LinCluster, LinPhysicalChannel, PhysicalChannel
-
-from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
-from ..models.timing import EOCExecutableEntityRef, ExecutionOrderConstraint, SwcTiming, TimingExtension
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment, SwcServiceDependency
 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.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
-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.Components import ServiceSwComponentType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
-
-from ..models.M2.MSR.Documentation.Annotation import Annotation
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, PortInterface, SenderReceiverInterface, TriggerInterface
-from ..models.M2.MSR.AsamHdo.Units import Unit
+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.sw_component import RunnableEntity, SwcInternalBehavior, TimingEvent
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
+
+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):
@@ -861,7 +857,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             child_element = ET.SubElement(element, "DISABLED-MODE-IREFS")
             for iref in irefs:
                 self.setRModeInAtomicSwcInstanceRef(child_element, "DISABLED-MODE-IREF", iref)
-        self.setChildElementOptionalRefType(element, "START-ON-EVENT-REF", event.start_on_event_ref)
+        self.setChildElementOptionalRefType(element, "START-ON-EVENT-REF", event.startOnEventRef)
 
     def setTimingEvent(self, element: ET.Element, event: TimingEvent):
         if event is not None:
@@ -873,7 +869,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         if event is not None:
             child_element = ET.SubElement(element, "OPERATION-INVOKED-EVENT")
             self.setRTEEvent(child_element, event)
-            self.setPOperationInAtomicSwcInstanceRef(child_element, "OPERATION-IREF", event.operation_iref)
+            self.setPOperationInAtomicSwcInstanceRef(child_element, "OPERATION-IREF", event.operationIRef)
 
     def setSwcModeSwitchEvent(self, element: ET.Element, event: SwcModeSwitchEvent):
         if event is not None:
@@ -965,6 +961,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)
@@ -1166,7 +1170,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if argument_value.value is not None:
                     value_tag = ET.SubElement(child_element, "VALUE")
                     self.setValueSpecification(value_tag, argument_value.value)
-                self.setChildElementOptionalRefType(child_element, "VALUE-TYPE-TREF", argument_value.value_type)
+                self.setChildElementOptionalRefType(child_element, "VALUE-TYPE-TREF", argument_value.valueTypeTRef)
 
     def writePortAPIOptions(self, element: ET.Element, behavior: SwcInternalBehavior):
         options = behavior.getPortAPIOptions()
@@ -1174,10 +1178,10 @@ class ARXMLWriter(AbstractARXMLWriter):
             port_api_options_tag = ET.SubElement(element, "PORT-API-OPTIONS")
             for option in options:
                 child_element = ET.SubElement(port_api_options_tag, "PORT-API-OPTION")
-                self.setChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS", option.enable_take_address)
-                self.setChildElementOptionalBooleanValue(child_element, "INDIRECT-API", option.indirect_api)
+                self.setChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS", option.enableTakeAddress)
+                self.setChildElementOptionalBooleanValue(child_element, "INDIRECT-API", option.indirectAPI)
                 self.writePortDefinedArgumentValues(child_element, option)
-                self.setChildElementOptionalRefType(child_element, "PORT-REF", option.port_ref)
+                self.setChildElementOptionalRefType(child_element, "PORT-REF", option.portRef)
 
     def writeServiceDependency(self, element: ET.Element, dependency: ServiceDependency):
         self.setIdentifiable(element, dependency)
@@ -1358,18 +1362,18 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeImplementation(self, element: ET.Element, impl: Implementation):
         self.setIdentifiable(element, impl)
         self.writeCodeDescriptors(element, impl)
-        self.setChildElementOptionalLiteral(element, "PROGRAMMING-LANGUAGE", impl.programming_language)
+        self.setChildElementOptionalLiteral(element, "PROGRAMMING-LANGUAGE", impl.getProgrammingLanguage())
         self.setResourceConsumption(element, impl.getResourceConsumption())
-        self.setChildElementOptionalLiteral(element, "SW-VERSION", impl.sw_version)
-        self.setChildElementOptionalRefType(element, "SWC-BSW-MAPPING-REF", impl.swc_bsw_mapping_ref)
-        self.setChildElementOptionalLiteral(element, "USED-CODE-GENERATOR", impl.used_code_generator)
-        self.setChildElementOptionalNumericalValue(element, "VENDOR-ID", impl.vendor_id)
+        self.setChildElementOptionalLiteral(element, "SW-VERSION", impl.getSwVersion())
+        self.setChildElementOptionalRefType(element, "SWC-BSW-MAPPING-REF", impl.getSwcBswMappingRef())
+        self.setChildElementOptionalLiteral(element, "USED-CODE-GENERATOR", impl.getUsedCodeGenerator())
+        self.setChildElementOptionalNumericalValue(element, "VENDOR-ID", impl.getVendorId())
 
     def writeSwcImplementation(self, element: ET.Element, impl: SwcImplementation):
         self.logger.debug("writeSwcImplementation %s" % impl.short_name)
         child_element = ET.SubElement(element, "SWC-IMPLEMENTATION")
         self.writeImplementation(child_element, impl)
-        self.setChildElementOptionalRefType(child_element, "BEHAVIOR-REF", impl.behavior_ref)
+        self.setChildElementOptionalRefType(child_element, "BEHAVIOR-REF", impl.getBehaviorRef())
 
     def writeEndToEndDescriptionDataId(self, element: ET.Element, parent: EndToEndDescription):
         data_ids = parent.getDataIds()
@@ -1692,8 +1696,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeBswModuleDescription %s" % impl.short_name)
         child_element = ET.SubElement(element, "BSW-IMPLEMENTATION")
         self.writeImplementation(child_element, impl)
-        self.setChildElementOptionalLiteral(child_element, "AR-RELEASE-VERSION", impl.ar_release_version)
-        self.setChildElementOptionalRefType(child_element, "BEHAVIOR-REF", impl.behavior_ref)
+        self.setChildElementOptionalLiteral(child_element, "AR-RELEASE-VERSION", impl.getArReleaseVersion())
+        self.setChildElementOptionalRefType(child_element, "BEHAVIOR-REF", impl.getBehaviorRef())
         self.writeBswImplementationVendorSpecificModuleDefRefs(child_element, impl)
 
     def writeImplementationDataTypeElements(self, element: ET.Element, parent: ImplementationDataType):
@@ -2241,6 +2245,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)
@@ -2261,14 +2266,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)
@@ -2301,12 +2381,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()
@@ -2318,6 +2419,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")
@@ -2332,6 +2442,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)
@@ -2515,6 +2627,16 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, signal)
         self.setChildElementOptionalBooleanValue(child_element, "DYNAMIC-LENGTH", signal.getDynamicLength())
 
+    def writeParameterInterface(self, element: ET.Element, signal: SystemSignal):
+        self.logger.debug("Write ParameterInterface %s" % signal.short_name)
+        child_element = ET.SubElement(element, "PARAMETER-INTERFACE")
+        self.setIdentifiable(child_element, signal)
+
+    def writeGenericEthernetFrame(self, element: ET.Element, signal: SystemSignal):
+        self.logger.debug("Write GenericEthernetFrame %s" % signal.short_name)
+        child_element = ET.SubElement(element, "ETHERNET-FRAME")
+        self.writeFrame(child_element, signal)
+
     def writeISignalToPduMappings(self, element: ET.Element, parent: ISignalIPdu):
         mappings = parent.getISignalToPduMappings()
         if len(mappings) > 0:
@@ -2528,12 +2650,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())
 
@@ -2628,6 +2793,10 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeISignalIPdu(element, ar_element)
         elif isinstance(ar_element, SystemSignal):
             self.writeSystemSignal(element, ar_element)
+        elif isinstance(ar_element, ParameterInterface):
+            self.writeParameterInterface(element, ar_element)
+        elif isinstance(ar_element, GenericEthernetFrame):
+            self.writeGenericEthernetFrame(element, ar_element)
         else:
             raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))