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

armodel/models/M2/MSR/DataDictionary/CalibrationParameter.py

@@ -1,8 +1,8 @@
 from typing import List
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
-
 from abc import ABCMeta
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
+
 class SwCalprmAxisTypeProps(ARObject, metaclass = ABCMeta):
     def __init__(self):
         if type(self) == SwCalprmAxisTypeProps:

armodel/models/M2/MSR/DataDictionary/DataDefProperties.py

@@ -1,10 +1,9 @@
 from typing import List
-
-from ...MSR.Documentation import Annotation
-from ...MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
-from ...AUTOSARTemplates.CommonStructure import ValueSpecification
+from ....M2.MSR.Documentation.Annotation import Annotation
+from ....M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
+from ....M2.AUTOSARTemplates.CommonStructure import ValueSpecification
 
 class SwDataDefPropsConditional(ARObject):
     '''

armodel/models/M2/MSR/DataDictionary/RecordLayout.py

@@ -1,7 +1,7 @@
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
-from ...MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 
 class SwRecordLayoutV(ARObject):
     def __init__(self):

armodel/models/M2/MSR/DataDictionary/__init__.py

@@ -1 +0,0 @@
-from . import *

armodel/models/M2/MSR/Documentation/Annotation.py

@@ -1,11 +1,9 @@
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from .BlockElements import DocumentationBlock
-from armodel.models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
-
+from ....M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
 from abc import ABCMeta
 
-
 class GeneralAnnotation(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == ARObject:

armodel/models/M2/MSR/Documentation/BlockElements.py

@@ -1,6 +1,6 @@
 from typing import List
-from .TextModel.MultilanguageData import MultiLanguageParagraph
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class DocumentationBlock(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py

@@ -1,5 +1,4 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class LOverviewParagraph(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py

@@ -1,10 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
-from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
-
-
 from typing import List
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
 
 class MultiLanguageParagraph(ARObject):
     def __init__(self):

armodel/models/M2/MSR/Documentation/TextModel/__init__.py

@@ -1,2 +0,0 @@
-from .LanguageDataModel import *
-from .MultilanguageData import *

armodel/models/M2/MSR/Documentation/__init__.py

@@ -1,3 +1,3 @@
 from .Annotation import *
 from .BlockElements import *
-from .TextModel import *
+from .TextModel import *

armodel/models/M2/MSR/__init__.py

@@ -1 +1 @@
-from . import *
+ 

armodel/models/M2/__init__.py

@@ -1 +0,0 @@
-from . import *

armodel/models/__init__.py

@@ -1,7 +1,50 @@
-from .sw_component import *
+from .M2.MSR.AsamHdo import *
+from .M2.MSR.AsamHdo.AdminData import *
+from .M2.MSR.AsamHdo.BaseTypes import *
+from .M2.MSR.AsamHdo.ComputationMethod import *
+from .M2.MSR.AsamHdo.SpecialData import *
+from .M2.MSR.AsamHdo.Units import *
+from .M2.MSR.AsamHdo.Constraints.GlobalConstraints import *
 from .M2.MSR.DataDictionary import *
 from .M2.MSR.Documentation import *
-from .M2.MSR.AsamHdo import *
+from .M2.MSR.Documentation.Annotation import *
+from .M2.MSR.Documentation.BlockElements import *
+from .M2.MSR.Documentation.TextModel import *
+from .M2.MSR.Documentation.TextModel.LanguageDataModel import *
+from .M2.MSR.Documentation.TextModel.MultilanguageData import *
 from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
+from .M2.AUTOSARTemplates.BswModuleTemplate import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
+from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
-from .M2.AUTOSARTemplates.SWComponentTemplate import *
+from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
+from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
+from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
+from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
+from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
+from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
+from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
+from .M2.AUTOSARTemplates.SWComponentTemplate import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Communication import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Components import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.Composition import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *

armodel/parser/arxml_parser.py

@@ -2,21 +2,29 @@ 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.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.CalibrationData.CalibrationValue import 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.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.TextModel.LanguageDataModel import LLongName
+from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
 from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
 from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
 from ..models.M2.MSR.Documentation.Annotation import GeneralAnnotation
 
+from ..models.M2.AUTOSARTemplates.CommonStructure import SwcInternalBehavior
+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.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import ExecutionOrderConstraint
 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
@@ -34,50 +42,43 @@ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Primit
 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.GenericStructure.AbstractStructure import AnyInstanceRef
-from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataTypeElement
+from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType, ImplementationDataTypeElement
 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.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument
+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 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.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanPhysicalChannel, CommunicationCluster, LinPhysicalChannel, PhysicalChannel
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering, RxIdentifierRange
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import ISignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import Frame, FrameTriggering, IPdu, ISignalIPdu, ISignalTriggering, PduTriggering
 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.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
+from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate 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.CommonStructure.Timing.TimingConstraint.TimingExtensions import 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.SWComponentTemplate.PortInterface 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.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment, SwcServiceDependency
 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.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceDependency
+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
@@ -85,10 +86,6 @@ 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
@@ -598,12 +595,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 +613,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 +622,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 +804,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 +812,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 +862,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)
@@ -2643,18 +2640,23 @@ class ARXMLParser(AbstractARXMLParser):
         self.readSystemMappings(element, system)
 
     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 +2769,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:
 

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -46,7 +46,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
         assert(isinstance(prototype, MultilanguageReferrable))
         assert(isinstance(prototype, Referrable))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "prototype")
         assert(prototype.typeTRef is None)
 

armodel/tests/test_armodel/models/test_datatype.py

@@ -40,7 +40,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
         assert(isinstance(prototype, Referrable))
         assert(isinstance(prototype, SymbolProps))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "SymbolProps")
         assert(prototype.symbol == None)
 
@@ -66,7 +66,7 @@ class Test_M2_MSR_AsamHdo_BaseTypes:
         assert(isinstance(base_type, Referrable))
         assert(isinstance(base_type, SwBaseType))
 
-        assert(base_type._parent == ar_root)
+        assert(base_type.parent == ar_root)
         assert(base_type.short_name == "SwBaseType")
         assert(isinstance(base_type.baseTypeDefinition, BaseTypeDirectDefinition))
 
@@ -111,7 +111,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationPrimitiveDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationPrimitiveDataType")
         assert(data_type.swDataDefProps == None)
 
@@ -142,7 +142,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationArrayDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationArrayDataType")
         assert(data_type.dynamic_array_size_profile == None)
         assert(data_type.element == None)
@@ -167,7 +167,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ApplicationRecordDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ApplicationRecordDataType")
 
         element = data_type.createApplicationRecordElement("element")
@@ -199,7 +199,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_Datatypes:
         assert(isinstance(data_type_mapping_set, Referrable))
         assert(isinstance(data_type_mapping_set, DataTypeMappingSet))
 
-        assert(data_type_mapping_set._parent == ar_root)
+        assert(data_type_mapping_set.parent == ar_root)
         assert(data_type_mapping_set.short_name == "DataTypeMappingSet")
         assert(len(data_type_mapping_set._dataTypeMaps) == 0)
 
@@ -238,7 +238,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
         assert(isinstance(data_type, Referrable))
         assert(isinstance(data_type, ImplementationDataType))
 
-        assert(data_type._parent == ar_root)
+        assert(data_type.parent == ar_root)
         assert(data_type.short_name == "ImplementationDataType")
         assert(data_type.subElements == [])
         assert(data_type.symbolProps == None)

armodel/tests/test_armodel/models/test_port_interface.py

@@ -15,7 +15,7 @@ from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Prim
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
@@ -50,7 +50,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(data_if, Referrable))
         assert(isinstance(data_if, NvDataInterface))
 
-        assert(data_if._parent == ar_root)
+        assert(data_if.parent == ar_root)
         assert(data_if.short_name == "NvDataInterface")
 
     def test_ParameterInterface(self):
@@ -73,7 +73,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(data_if, Referrable))
         assert(isinstance(data_if, ParameterInterface))
 
-        assert(data_if._parent == ar_root)
+        assert(data_if.parent == ar_root)
         assert(data_if.short_name == "ParameterInterface")
 
     def test_SenderReceiverInterface(self):
@@ -97,7 +97,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(sr_if, SenderReceiverInterface))
 
         assert(sr_if.short_name == "sr_if")
-        assert(sr_if._parent == ar_root)
+        assert(sr_if.parent == ar_root)
         assert(len(sr_if.getDataElements()) == 0)
 
         element = sr_if.createDataElement("element")
@@ -127,7 +127,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(prototype, Referrable))
         assert(isinstance(prototype, ArgumentDataPrototype))
 
-        assert(prototype._parent == ar_root)
+        assert(prototype.parent == ar_root)
         assert(prototype.short_name == "ArgumentDataPrototype")
         assert(prototype.direction == "")
         assert(prototype.server_argument_impl_policy == "")
@@ -143,7 +143,7 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert(isinstance(app_error, Referrable))
         assert(isinstance(app_error, ApplicationError))
 
-        assert(app_error._parent == ar_root)
+        assert(app_error.parent == ar_root)
         assert(app_error.short_name == "ApplicationError")
 
     def test_ClientServerOperation(self):