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

armodel/parser/arxml_parser.py

@@ -2,96 +2,84 @@ from typing import List
 import xml.etree.ElementTree as ET
 import os
 
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroupContent, SwRecordLayoutV
 
 
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstrRule, InternalConstrs, PhysConstrs
+
+
+from ..models.M2.MSR.AsamHdo.AdminData import AdminData
+from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition
+from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstrRule, InternalConstrs, PhysConstrs, DataConstr
+from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod, Compu, CompuConst, CompuConstTextContent, CompuNominatorDenominator, CompuRationalCoeffs, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
+from ..models.M2.MSR.AsamHdo.SpecialData import Sdg, Sd
+from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
+from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps
 from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis
 from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
-from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValues
-from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition
-from ..models.M2.MSR.AsamHdo.SpecialData import Sdg
-from ..models.M2.MSR.AsamHdo.AdminData import AdminData
-from ..models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstTextContent, CompuNominatorDenominator, CompuRationalCoeffs, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
-from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
+from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroupContent, SwRecordLayoutV
+from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
+from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup
+from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
+from ..models.M2.MSR.Documentation.Annotation import Annotation, GeneralAnnotation
+from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LOverviewParagraph
 from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
-from ..models.M2.MSR.Documentation.Annotation import GeneralAnnotation
 
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationCompositeDataType, ApplicationDataType, AutosarDataType, DataTypeMap, DataTypeMappingSet
-from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup, ModeRequestTypeMap
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior, BswModuleEntity, BswScheduleEvent, BswModeSenderPolicy
+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, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.Filter import DataFilter
+from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import ImplementationProps, Code
+from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup, ModeRequestTypeMap, ModeDeclarationGroupPrototype
 from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
 from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import MemorySection
-from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
+from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity, InternalBehavior
 from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswInternalBehavior, BswModuleEntity, BswScheduleEvent
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import ImplementationProps
-from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceDependency
+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
+from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import TimingExtension
+from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
-from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataTypeElement
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption, PortDefinedArgumentValue
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationRecordDataType, ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, AutosarDataType, DataTypeMap, DataTypeMappingSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet, EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
 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 InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntityArgument
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import PortGroup, SwComponentType, SymbolProps, PPortPrototype, RPortPrototype
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import ModeAccessPoint
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
-
-from ..models.fibex.lin_communication import LinFrameTriggering
-from ..models.fibex.fibex_core.core_topology import AbstractCanCluster, CanPhysicalChannel, CommunicationCluster, LinPhysicalChannel, PhysicalChannel
-from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.AUTOSARTemplates.SystemTemplate import System, SystemMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
-from ..models.fibex.can_communication import CanFrameTriggering, RxIdentifierRange
-from ..models.M2.AUTOSARTemplates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.fibex.fibex_4_multiplatform import ISignalMapping
-from ..models.fibex.fibex_core.core_communication import Frame, FrameTriggering, IPdu, ISignalIPdu, ISignalTriggering, PduTriggering
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
-from ..models.timing import ExecutionOrderConstraint, TimingExtension
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswModeSenderPolicy
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, InvalidationPolicy, ModeSwitchInterface, ParameterInterface, PortInterface, SenderReceiverInterface
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import MultilanguageReferrable
-from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
-from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType
-from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
-
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment
-from ..models.sw_component import AtomicSwComponentType, PortAPIOption, PortDefinedArgumentValue, ServiceDependency,  SwcServiceDependency
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType, PortGroup, SwComponentType, SymbolProps, PPortPrototype, RPortPrototype
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, DelegationSwConnector
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet, ModeAccessPoint
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment, SwcServiceDependency
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, InvalidationPolicy, ModeSwitchInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationCompositeElementDataPrototype, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
-from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
-from ..models.M2.MSR.Documentation.Annotation import Annotation
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
-from ..models.M2.MSR.AsamHdo.SpecialData import Sd
-from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
-from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont
-
-from ..models import SwcInternalBehavior, RunnableEntity, RTEEvent, OperationInvokedEvent, DataReceivedEvent, RVariableInAtomicSwcInstanceRef
-from ..models import SwcModeSwitchEvent, RModeInAtomicSwcInstanceRef
-from ..models import ImplementationDataType
-from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationRecordDataType
+
+from ..models.M2.AUTOSARTemplates.SystemTemplate import SwcToEcuMapping , System, SystemMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
+from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef, VariableDataPrototypeInSystemInstanceRef
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanPhysicalChannel, CommConnectorPort, CommunicationCluster, CommunicationConnector, FramePort, IPduPort, ISignalPort, LinPhysicalChannel, PhysicalChannel
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import Frame, FrameTriggering, IPdu, IPduTiming, ISignalIPdu, ISignalTriggering, PduTriggering
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import CyclicTiming, EventControlledTiming, TimeRangeType, TransmissionModeCondition, TransmissionModeDeclaration, TransmissionModeTiming
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering, RxIdentifierRange
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import ISignalMapping
 
 from .abstract_arxml_parser import AbstractARXMLParser
 
@@ -189,29 +177,39 @@ class ARXMLParser(AbstractARXMLParser):
         return paragraph
     
     def getVariableInAtomicSWCTypeInstanceRef(self, element: ET.Element) -> VariableInAtomicSWCTypeInstanceRef:
-        autosar_variable_iref  = None
+        iref  = None
         if element is not None:
-            autosar_variable_iref = VariableInAtomicSWCTypeInstanceRef()
-            self.readElementAttributes(element, autosar_variable_iref)
-            autosar_variable_iref.setPortPrototypeRef(self.getChildElementOptionalRefType(element, "PORT-PROTOTYPE-REF"))
-            autosar_variable_iref.setTargetDataPrototypeRef(self.getChildElementOptionalRefType(element, "TARGET-DATA-PROTOTYPE-REF"))
-        return autosar_variable_iref
+            iref = VariableInAtomicSWCTypeInstanceRef()
+            self.readElementAttributes(element, iref)
+            iref.setPortPrototypeRef(self.getChildElementOptionalRefType(element, "PORT-PROTOTYPE-REF"))
+            iref.setTargetDataPrototypeRef(self.getChildElementOptionalRefType(element, "TARGET-DATA-PROTOTYPE-REF"))
+        return iref
+    
+    def getComponentInSystemInstanceRef(self, element: ET.Element) -> ComponentInSystemInstanceRef:
+        iref  = None
+        if element is not None:
+            iref = ComponentInSystemInstanceRef()
+            self.readElementAttributes(element, iref)
+            iref.setBaseRef(self.getChildElementOptionalRefType(element, "BASE-REF"))
+            iref.setContextCompositionRef(self.getChildElementOptionalRefType(element, "CONTEXT-COMPOSITION-REF"))
+            iref.setTargetComponentRef(self.getChildElementOptionalRefType(element, "TARGET-COMPONENT-REF"))
+        return iref
 
     def getAutosarVariableInImplDatatype(self, element: ET.Element) ->  AutosarVariableRef:
         child_element = self.find(element, "ACCESSED-VARIABLE")
-        accessed_variable_ref  = None
+        ref  = None
         if (child_element is not None):
-            accessed_variable_ref = AutosarVariableRef()
-            accessed_variable_ref.setAutosarVariableIRef(self.getVariableInAtomicSWCTypeInstanceRef(self.find(child_element, "AUTOSAR-VARIABLE-IREF")))
-        return accessed_variable_ref
+            ref = AutosarVariableRef()
+            ref.setAutosarVariableIRef(self.getVariableInAtomicSWCTypeInstanceRef(self.find(child_element, "AUTOSAR-VARIABLE-IREF")))
+        return ref
 
     def getLocalVariableRef(self, element: ET.Element) ->  AutosarVariableRef:
         child_element = self.find(element, "ACCESSED-VARIABLE")
-        accessed_variable_ref  = None
+        ref  = None
         if (child_element is not None):
-            accessed_variable_ref = AutosarVariableRef()
-            accessed_variable_ref.setLocalVariableRef(self.getChildElementOptionalRefType(child_element, "LOCAL-VARIABLE-REF"))
-        return accessed_variable_ref
+            ref = AutosarVariableRef()
+            ref.setLocalVariableRef(self.getChildElementOptionalRefType(child_element, "LOCAL-VARIABLE-REF"))
+        return ref
 
     def _readVariableAccesses(self, element: ET.Element, parent: RunnableEntity, key: str):
         for child_element in element.findall("./xmlns:%s/xmlns:VARIABLE-ACCESS" % key, self.nsmap):
@@ -598,12 +596,12 @@ class ARXMLParser(AbstractARXMLParser):
     def readImplementation(self, element: ET.Element, impl: Implementation):
         self.readIdentifiable(element, impl)
         self.readCodeDescriptor(element, impl)
-        impl.programming_language = self.getChildElementOptionalLiteral(element, "PROGRAMMING-LANGUAGE")
+        impl.programmingLanguage = self.getChildElementOptionalLiteral(element, "PROGRAMMING-LANGUAGE")
         self.readResourceConsumption(element, impl)
-        impl.sw_version = self.getChildElementOptionalLiteral(element, "SW-VERSION")
-        impl.swc_bsw_mapping_ref = self.getChildElementOptionalRefType(element, "SWC-BSW-MAPPING-REF")
-        impl.used_code_generator = self.getChildElementOptionalLiteral(element, "USED-CODE-GENERATOR")
-        impl.vendor_id = self.getChildElementOptionalNumericalValue(element, "VENDOR-ID")
+        impl.swVersion = self.getChildElementOptionalLiteral(element, "SW-VERSION")
+        impl.swcBswMappingRef = self.getChildElementOptionalRefType(element, "SWC-BSW-MAPPING-REF")
+        impl.usedCodeGenerator = self.getChildElementOptionalLiteral(element, "USED-CODE-GENERATOR")
+        impl.vendorId = self.getChildElementOptionalNumericalValue(element, "VENDOR-ID")
 
     def readBswImplementationVendorSpecificModuleDefRefs(self, element: ET.Element, parent: BswImplementation):
         child_element = element.find("./xmlns:VENDOR-SPECIFIC-MODULE-DEF-REFS", self.nsmap)
@@ -616,8 +614,8 @@ class ARXMLParser(AbstractARXMLParser):
         impl = parent.createBswImplementation(short_name)   
         self.logger.debug("readBswImplementation %s" % impl.getShortName())
         self.readImplementation(element, impl)
-        impl.ar_release_version = self.getChildElementOptionalLiteral(element, "AR-RELEASE-VERSION")
-        impl.behavior_ref = self.getChildElementOptionalRefType(element, "BEHAVIOR-REF")
+        impl.setArReleaseVersion(self.getChildElementOptionalLiteral(element, "AR-RELEASE-VERSION")) \
+            .setBehaviorRef(self.getChildElementOptionalRefType(element, "BEHAVIOR-REF"))
         self.readBswImplementationVendorSpecificModuleDefRefs(element, impl)
 
     def readSwcImplementation(self, element: ET.Element, parent: ARPackage):
@@ -625,7 +623,7 @@ class ARXMLParser(AbstractARXMLParser):
         impl = parent.createSwcImplementation(short_name)   
         self.logger.debug("readSwcImplementation %s" % impl.getShortName())
         self.readImplementation(element, impl)
-        impl.behavior_ref = self.getChildElementOptionalRefType(element, "BEHAVIOR-REF")
+        impl.behaviorRef = self.getChildElementOptionalRefType(element, "BEHAVIOR-REF")
 
     def readDataReceivePointByArguments(self, element, parent: RunnableEntity):
         self._readVariableAccesses(element, parent, "DATA-RECEIVE-POINT-BY-ARGUMENTS")
@@ -807,7 +805,7 @@ class ARXMLParser(AbstractARXMLParser):
 
     def readRTEEvent(self, element: ET.Element, event: RTEEvent):
         self.readIdentifiable(element, event)
-        event.start_on_event_ref = self.getChildElementOptionalRefType(element, "START-ON-EVENT-REF")
+        event.startOnEventRef = self.getChildElementOptionalRefType(element, "START-ON-EVENT-REF")
         for child_element in element.findall("./xmlns:DISABLED-MODE-IREFS/xmlns:DISABLED-MODE-IREF", self.nsmap):
             iref = self.getRModeInAtomicSwcInstanceRef(child_element)
             event.addDisabledModeIRef(iref)
@@ -815,9 +813,9 @@ class ARXMLParser(AbstractARXMLParser):
     def readOperationIRef(self, element: ET.Element, parent: OperationInvokedEvent):
         child_element = element.find("./xmlns:OPERATION-IREF", self.nsmap)
         if (child_element is not None):
-            parent.operation_iref = POperationInAtomicSwcInstanceRef()
-            parent.operation_iref.context_p_port_ref = self.getChildElementRefType(parent.getShortName(), child_element, "CONTEXT-P-PORT-REF")
-            parent.operation_iref.target_provided_operation_ref = self.getChildElementRefType(parent.getShortName(), child_element, "TARGET-PROVIDED-OPERATION-REF")
+            parent.operationIRef = POperationInAtomicSwcInstanceRef()
+            parent.operationIRef.context_p_port_ref = self.getChildElementRefType(parent.getShortName(), child_element, "CONTEXT-P-PORT-REF")
+            parent.operationIRef.target_provided_operation_ref = self.getChildElementRefType(parent.getShortName(), child_element, "TARGET-PROVIDED-OPERATION-REF")
 
     def readOperationInvokedEvent(self, element: ET.Element, parent: SwcInternalBehavior):
         short_name = self.getShortName(element)
@@ -865,15 +863,15 @@ class ARXMLParser(AbstractARXMLParser):
         child_element = element.find("./xmlns:VALUE/*", self.nsmap)
         if child_element is not None:
             argument_value.value = self.getValueSpecification(child_element)
-        argument_value.value_type = self.getChildElementOptionalRefType(element, "VALUE-TYPE-TREF")
+        argument_value.valueTypeTRef = self.getChildElementOptionalRefType(element, "VALUE-TYPE-TREF")
         return argument_value
 
     def readPortAPIOptions(self, element: ET.Element, behavior: SwcInternalBehavior):
         for child_element in element.findall("./xmlns:PORT-API-OPTIONS/xmlns:PORT-API-OPTION", self.nsmap):
             option = PortAPIOption()
-            option.enable_take_address = self.getChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS")
-            option.indirect_api = self.getChildElementOptionalBooleanValue(child_element, "INDIRECT-API")
-            option.port_ref = self.getChildElementOptionalRefType(child_element, "PORT-REF")
+            option.enableTakeAddress = self.getChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS")
+            option.indirectAPI = self.getChildElementOptionalBooleanValue(child_element, "INDIRECT-API")
+            option.portRef = self.getChildElementOptionalRefType(child_element, "PORT-REF")
             for argument_value_tag in child_element.findall("./xmlns:PORT-ARG-VALUES/xmlns:PORT-DEFINED-ARGUMENT-VALUE", self.nsmap):
                 option.addPortArgValue(self.readPortDefinedArgumentValue(argument_value_tag))
             behavior.addPortAPIOption(option)
@@ -2151,7 +2149,8 @@ class ARXMLParser(AbstractARXMLParser):
                .setProtocolVersion(self.getChildElementOptionalLiteral(element, "PROTOCOL-VERSION"))
 
     def readAbstractCanCluster(self, element: ET.Element, cluster: AbstractCanCluster):
-        cluster.setCanFdBaudrate(self.getChildElementOptionalNumericalValue(element, "CAN-FD-BAUDRATE")) 
+        cluster.setCanFdBaudrate(self.getChildElementOptionalNumericalValue(element, "CAN-FD-BAUDRATE")) \
+               .setSpeed(self.getChildElementOptionalNumericalValue(element, "SPEED"))
 
     def readLinCluster(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
@@ -2321,21 +2320,90 @@ class ARXMLParser(AbstractARXMLParser):
 
     def readCanTpConfig(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
-        self.logger.debug("CanTpConfig %s" % short_name)
+        self.logger.debug("read CanTpConfig %s" % short_name)
         pdu = parent.createCanTpConfig(short_name)
         self.readIdentifiable(element, pdu)
 
     def readCanFrame(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
-        self.logger.debug("CanFrame %s" % short_name)
+        self.logger.debug("read CanFrame %s" % short_name)
         frame = parent.createCanFrame(short_name)
         self.readFrame(element, frame)
 
+    def readCanCommunicationController(self, element: ET.Element, controller: CanCommunicationController):
+        self.logger.debug("read CanCommunicationController %s" % controller.getShortName())
+        self.readIdentifiable(element, controller)
+
+    def readEcuInstanceCommControllers(self, element: ET.Element, instance: EcuInstance):
+        self.logger.debug("readEcuInstanceCommControllers %s" % instance.getShortName())
+        for child_element in self.findall(element, "COMM-CONTROLLERS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "CAN-COMMUNICATION-CONTROLLER":
+                controller = instance.createCanCommunicationController(self.getShortName(child_element))
+                self.readCanCommunicationController(child_element, controller)
+            else:
+                self._raiseError("Unsupported Communication Controller <%s>" % tag_name)
+
+    def readCommConnectorPort(self, element: ET.Element, port: CommConnectorPort):
+        self.readIdentifiable(element, port)
+        port.setCommunicationDirection(self.getChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION"))
+
+    def readFramePort(self, element: ET.Element, port: FramePort):
+        self.readCommConnectorPort(element, port)
+
+    def readIPduPort(self, element: ET.Element, port: IPduPort):
+        self.readCommConnectorPort(element, port)
+
+    def readISignalPort(self, element: ET.Element, port: ISignalPort):
+        self.readCommConnectorPort(element, port)
+
+    def readCommunicationConnectorEcuCommPortInstances(self, element: ET.Element, connector: CommunicationConnector):
+        self.logger.debug("read EcuCommPortInstances of CommunicationConnector %s" % connector.getShortName())
+        for child_element in self.findall(element, "ECU-COMM-PORT-INSTANCES/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "FRAME-PORT":
+                port = connector.createFramePort(self.getShortName(child_element))
+                self.readFramePort(child_element, port)
+            elif tag_name == "I-PDU-PORT":
+                port = connector.createIPduPort(self.getShortName(child_element))
+                self.readIPduPort(child_element, port)
+            elif tag_name == "I-SIGNAL-PORT":
+                port = connector.createISignalPort(self.getShortName(child_element))
+                self.readISignalPort(child_element, port)
+            else:
+                self._raiseError("Unsupported EcuCommPortInstances <%s>" % tag_name)       
+
+    def readCommunicationConnector(self, element: ET.Element, connector: CommunicationConnector):
+        self.readIdentifiable(element, connector)
+        connector.setCommControllerRef(self.getChildElementOptionalRefType(element, "COMM-CONTROLLER-REF"))
+        self.readCommunicationConnectorEcuCommPortInstances(element, connector)
+
+    def readCanCommunicationConnector(self, element: ET.Element, connector: CanCommunicationConnector):
+        self.readCommunicationConnector(element, connector)
+
+    def readEcuInstanceConnectors(self, element: ET.Element, instance: EcuInstance):
+        self.logger.debug("readEcuInstanceCommControllers %s" % instance.getShortName())
+        for child_element in self.findall(element, "CONNECTORS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "CAN-COMMUNICATION-CONNECTOR":
+                connector = instance.createCanCommunicationConnector(self.getShortName(child_element))
+                self.readCanCommunicationConnector(child_element, connector)
+            else:
+                self._raiseError("Unsupported Communication Controller <%s>" % tag_name)                
+
     def readEcuInstance(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
         self.logger.debug("EcuInstance %s" % short_name)
         instance = parent.createEcuInstance(short_name)
         self.readIdentifiable(element, instance)
+        instance.setComConfigurationGwTimeBase(self.getChildElementOptionalTimeValue(element, "COM-CONFIGURATION-GW-TIME-BASE")) \
+                .setComConfigurationRxTimeBase(self.getChildElementOptionalTimeValue(element, "COM-CONFIGURATION-RX-TIME-BASE")) \
+                .setComConfigurationTxTimeBase(self.getChildElementOptionalTimeValue(element, "COM-CONFIGURATION-TX-TIME-BASE")) \
+                .setComEnableMDTForCyclicTransmission(self.getChildElementOptionalBooleanValue(element, "COM-ENABLE-MDT-FOR-CYCLIC-TRANSMISSION"))
+        self.readEcuInstanceCommControllers(element, instance)
+        self.readEcuInstanceConnectors(element, instance)
+        instance.setSleepModeSupported(self.getChildElementOptionalBooleanValue(element, "SLEEP-MODE-SUPPORTED")) \
+                .setWakeUpOverBusSupported(self.getChildElementOptionalBooleanValue(element, "WAKE-UP-OVER-BUS-SUPPORTED"))
 
     '''
     def getFrameMappings(self, element: ET.Element) -> List[FrameMapping]:
@@ -2566,13 +2634,84 @@ class ARXMLParser(AbstractARXMLParser):
                    .setStartPosition(self.getChildElementOptionalNumericalValue(child_element, "START-POSITION")) \
                    .setTransferProperty(self.getChildElementOptionalLiteral(child_element, "TRANSFER-PROPERTY")) \
                    .setUpdateIndicationBitPosition(self.getChildElementOptionalNumericalValue(child_element, "UPDATE-INDICATION-BIT-POSITION"))
+    
+    def getDataFilter(self, element: ET.Element, key: str) -> DataFilter:
+        filter = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            filter = DataFilter()
+            filter.setDataFilterType(self.getChildElementOptionalLiteral(child_element, "DATA-FILTER-TYPE"))
+        return filter
+            
+    def getTransmissionModeConditions(self, element: ET.Element, key: str) -> List[TransmissionModeCondition]:
+        result = []
+        child_elements = self.findall(element, key)
+        for child_element in child_elements:
+            condition = TransmissionModeCondition()
+            condition.setDataFilter(self.getDataFilter(child_element, "DATA-FILTER")) \
+                     .setISignalInIPduRef(self.getChildElementOptionalRefType(child_element, "I-SIGNAL-IN-I-PDU-REF"))
+            result.append(condition)
+        return result
+    
+    def getTimeRangeType(self, element: ET.Element, key: str) -> TimeRangeType:
+        time_range = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            time_range = TimeRangeType()
+            time_range.setValue(self.getChildElementOptionalTimeValue(child_element, "VALUE"))
+        return time_range
+    
+    def getCyclicTiming(self, element: ET.Element, key: str) -> CyclicTiming:
+        timing = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            timing = CyclicTiming()
+        return timing
+
+    def getEventControlledTiming(self, element: ET.Element, key: str) -> EventControlledTiming:
+        timing = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            timing = EventControlledTiming()
+            timing.setNumberOfRepetitions(self.getChildElementOptionalIntegerValue(child_element, "NUMBER-OF-REPETITIONS"))
+            timing.setRepetitionPeriod(self.getTimeRangeType(child_element, "REPETITION-PERIOD"))
+        return timing
+
+    def getTransmissionModeTiming(self, element: ET.Element, key: str) -> TransmissionModeTiming:
+        timing = None
+        child_element = self.find(element, key)
+        if child_element is not None:
+            self.logger.debug("Get TransmissionModeTiming of <%s>" % key)
+            timing = TransmissionModeTiming()
+            #timing.getCyclicTiming(child_element, "")
+            timing.setEventControlledTiming(self.getEventControlledTiming(child_element, "EVENT-CONTROLLED-TIMING"))
+        return timing
+
+    def getTransmissionModeDeclaration(self, element: ET.Element, key: str) -> TransmissionModeDeclaration:
+        decl = None
+        child_element = self.find(element, key)
+        if child_element != None:
+            decl = TransmissionModeDeclaration()
+            for condition in self.getTransmissionModeConditions(child_element, "TRANSMISSION-MODE-CONDITIONS/TRANSMISSION-MODE-CONDITION"):
+                decl.addTransmissionModeCondition(condition)
+            decl.setTransmissionModeTrueTiming(self.getTransmissionModeTiming(child_element, "TRANSMISSION-MODE-TRUE-TIMING"))
+        return decl
+
+    def getISignalIPduIPduTimingSpecification(self, element: ET.Element) -> IPduTiming:
+        timing = None
+        child_element = self.find(element, "I-PDU-TIMING-SPECIFICATIONS/I-PDU-TIMING")
+        if child_element is not None:
+            timing = IPduTiming()
+            timing.setTransmissionModeDeclaration(self.getTransmissionModeDeclaration(child_element, "TRANSMISSION-MODE-DECLARATION"))
+        return timing
 
     def readISignalIPdu(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
         self.logger.debug("ISignalIPdu %s" % short_name)
         i_pdu = parent.createISignalIPdu(short_name)
         self.readIdentifiable(element, i_pdu)
-        i_pdu.setLength(self.getChildElementOptionalNumericalValue(element, "LENGTH"))
+        i_pdu.setLength(self.getChildElementOptionalNumericalValue(element, "LENGTH")) \
+            .setIPduTimingSpecification(self.getISignalIPduIPduTimingSpecification(element))
         self.readISignalToPduMappings(element, i_pdu)
         i_pdu.setUnusedBitPattern(self.getChildElementOptionalLiteral(element, "UNUSED-BIT-PATTERN"))
 
@@ -2616,12 +2755,28 @@ class ARXMLParser(AbstractARXMLParser):
             else:
                 raise NotImplementedError("Unsupported Data Mapping %s" % tag_name)
 
+    def readSwcToEcuMapping(self, element: ET.Element, mapping: SwcToEcuMapping):
+        self.logger.debug("SwcToEcuMapping %s" % mapping.getShortName())
+        self.readIdentifiable(element, mapping)
+        for child_element in self.findall(element, "COMPONENT-IREFS/COMPONENT-IREF"):
+            mapping.addComponentIRef(self.getComponentInSystemInstanceRef(child_element))
+        mapping.setEcuInstanceRef(self.getChildElementOptionalRefType(element, "ECU-INSTANCE-REF"))
+            
+    def readSystemMappingSwMappings(self, element: ET.Element, mapping: SystemMapping):
+        for child_element in self.findall(element, "SW-MAPPINGS/*"):
+            tag_name = self.getTagName(child_element)
+            if tag_name == "SWC-TO-ECU-MAPPING":
+                self.readSwcToEcuMapping(child_element, mapping.createSwcToEcuMapping(self.getShortName(child_element)))
+            else:
+                raise NotImplementedError("Unsupported Sw Mapping %s" % tag_name)
+
     def readSystemMapping(self, element: ET.Element, parent: System):
         short_name = self.getShortName(element)
         self.logger.debug("SystemMapping %s" % short_name)
         mapping = parent.createSystemMapping(short_name)
         self.readIdentifiable(element, mapping)
         self.readSystemMappingDataMappings(element, mapping)
+        self.readSystemMappingSwMappings(element, mapping)
 
     def readSystemMappings(self, element: ET.Element, system: System):
         for child_element in self.findall(element, "MAPPINGS/*"):
@@ -2630,10 +2785,19 @@ class ARXMLParser(AbstractARXMLParser):
                 self.readSystemMapping(child_element, system)
             else:
                 raise NotImplementedError("Unsupported Mapping %s" % tag_name)
+            
+    def readRootSwCompositionPrototype(self, element: ET.Element, system: System):
+        child_element = self.find(element, "ROOT-SOFTWARE-COMPOSITIONS/ROOT-SW-COMPOSITION-PROTOTYPE")
+        if child_element is not None:
+            short_name = self.getShortName(child_element)
+            self.logger.debug("Read RootSwCompositionPrototype %s" % short_name)
+            prototype = system.createRootSoftwareComposition(short_name)
+            self.readIdentifiable(child_element, prototype)
+            prototype.setSoftwareCompositionTRef(self.getChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF"))
 
     def readSystem(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
-        self.logger.debug("System %s" % short_name)
+        self.logger.debug("Read System %s" % short_name)
         system = parent.createSystem(short_name)
         self.readIdentifiable(element, system)
 
@@ -2641,20 +2805,27 @@ class ARXMLParser(AbstractARXMLParser):
         for child_element in self.findall(element, "FIBEX-ELEMENTS/FIBEX-ELEMENT-REF-CONDITIONAL"):
             system.addFibexElementRef(self.getChildElementOptionalRefType(child_element, "FIBEX-ELEMENT-REF"))
         self.readSystemMappings(element, system)
+        self.readRootSwCompositionPrototype(element, system)
+        system.setSystemVersion(self.getChildElementOptionalRevisionLabelString(element, "SYSTEM-VERSION"))
 
     def readParameterInterfaceParameters(self, element: ET.Element, parent: ParameterInterface):
-        for child_element in element.findall("./xmlns:PARAMETERS/xmlns:PARAMETER-DATA-PROTOTYPE", self.nsmap):
+        for child_element in self.findall(element, "PARAMETERS/PARAMETER-DATA-PROTOTYPE"):
             short_name = self.getShortName(child_element)
             prototype = parent.createParameter(short_name)
             self.readParameterDataPrototype(child_element, prototype)
     
     def readParameterInterface(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
-        self.logger.debug("ParameterInterface %s" % short_name)
+        self.logger.debug("Read ParameterInterface %s" % short_name)
         pi_interface = parent.createParameterInterface(short_name)
         self.readIdentifiable(element, pi_interface)
         self.readParameterInterfaceParameters(element, pi_interface)
 
+    def readGenericEthernetFrame(self, element: ET.Element, parent: ARPackage):
+        short_name = self.getShortName(element)
+        self.logger.debug("Read EthernetFrame %s" % short_name)
+        frame = parent.createGenericEthernetFrame(short_name)
+        self.readFrame(element, frame)
 
     def readARPackageElements(self, element: ET.Element, parent: ARPackage):
         for child_element in self.findall(element, "./ELEMENTS/*"):
@@ -2767,6 +2938,8 @@ class ARXMLParser(AbstractARXMLParser):
                 self.readPhysicalDimensions(child_element, parent)
             elif tag_name == "PARAMETER-INTERFACE":
                 self.readParameterInterface(child_element, parent)
+            elif tag_name == "ETHERNET-FRAME":
+                self.readGenericEthernetFrame(child_element, parent)
             else:
                 self._raiseError("Unsupported element type of ARPackage <%s>" % tag_name)
 

armodel/parser/file_parser.py

@@ -20,7 +20,8 @@ class FileListParser:
         try:
             with open(file) as f_in:
                 for line in f_in:
-                    self.file_list.append(line.strip())
+                    if not line.startswith('#'):
+                        self.file_list.append(line.strip())
         except:
             self.logger.error("No such file or directory: %s" % os.path.realpath(file))
 

armodel/report/connector_xls_report.py

@@ -1,6 +1,7 @@
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 from .excel_report import ExcelReporter
-from ..models import AUTOSAR, CompositionSwComponentType
+from ..models import AUTOSAR
 from ..models import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
 from typing import List
 

armodel/tests/test_armodel/models/test_ar_object.py

@@ -1,8 +1,6 @@
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
 
-
 class TestARObject:
     
     def test_ARNumerical(self):

armodel/tests/test_armodel/models/test_ar_package.py

@@ -14,14 +14,14 @@ from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Iden
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 from ....models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import SwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType, EcuAbstractionSwComponentType, SwComponentType
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
-from ....models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, EcuAbstractionSwComponentType, ServiceSwComponentType
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ServiceSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType
 
 class TestAUTOSAR: