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

armodel/parser/arxml_parser.py

@@ -2,73 +2,96 @@ from typing import List
 import xml.etree.ElementTree as ET
 import os
 
-from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
-
-from ..models.ar_ref import RefType
-from ..models.m2.autosar_templates.common_structure.implementation import ImplementationProps
-from ..models.m2.autosar_templates.common_structure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
-from ..models.m2.autosar_templates.generic_structure.abstract_structure import AnyInstanceRef
-from ..models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataTypeElement
-from ..models.m2.autosar_templates.sw_component_template.composition.instance_refs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
-from ..models.m2.autosar_templates.sw_component_template.port_interface.instance_refs import ApplicationCompositeElementInPortInterfaceInstanceRef
-from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
-from ..models.m2.autosar_templates.system_template.instance_refs import VariableDataPrototypeInSystemInstanceRef
-from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
-from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior import RunnableEntityArgument
-from ..models.m2.autosar_templates.sw_component_template.components import PortGroup, SwComponentType, SymbolProps, PPortPrototype, RPortPrototype
-from ..models.m2.autosar_templates.sw_component_template.composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector
-
-from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.mode_declaration_group import ModeAccessPoint
-from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.server_call import ServerCallPoint
-from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, ParameterRequireComSpec, QueuedSenderComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
+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.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.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.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.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.GenericStructure.AbstractStructure import AnyInstanceRef
+from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import 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.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.data_dictionary.data_def_properties import SwDataDefProps
-from ..models.m2.msr.documentation.block_elements import DocumentationBlock
-from ..models.m2.autosar_templates.system_template import System, SystemMapping
-from ..models.m2.autosar_templates.system_template.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
-from ..models.m2.autosar_templates.system_template.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
+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.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+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.internal_behavior import IncludedDataTypeSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
 from ..models.timing import ExecutionOrderConstraint, TimingExtension
-from ..models.bsw_module_template import BswModeSenderPolicy
-from ..models.m2.autosar_templates.sw_component_template.port_interface import InvalidationPolicy, ModeSwitchInterface, ParameterInterface, PortInterface
-from ..models.common_structure import IncludedModeDeclarationGroupSet, MemorySection, ModeDeclarationGroup, ModeDeclarationGroupPrototype, ModeRequestTypeMap
-from ..models.implementation import BswImplementation, EngineeringObject
-from ..models.general_structure import MultilanguageReferrable
-from ..models.multilanguage_data import LOverviewParagraph, MultiLanguageOverviewParagraph, LLongName, MultiLanguageParagraph, MultilanguageLongName
-from ..models.data_def_properties import ValueList
-from ..models.record_layout import SwRecordLayoutGroup, SwRecordLayoutGroupContent, SwRecordLayoutV
-from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, AutosarDataType, BaseTypeDirectDefinition
-from ..models.calibration import SwAxisGrouped, SwAxisIndividual, SwCalprmAxis, SwCalprmAxisSet
-from ..models.communication import CompositeNetworkRepresentation
-from ..models.end_to_end_protection import EndToEndDescription, EndToEndProtection, EndToEndProtectionSet, EndToEndProtectionVariablePrototype
-from ..models.service_mapping import RoleBasedPortAssignment
-from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
-from ..models.ar_object import ARLiteral
-from ..models.service_needs import RoleBasedDataAssignment
+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.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationCompositeElementDataPrototype, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
-from ..models.port_prototype import ModeSwitchReceiverComSpec, QueuedReceiverComSpec
-from ..models.annotation import Annotation, GeneralAnnotation
-from ..models.global_constraints import InternalConstrs, DataConstr, DataConstrRule, PhysConstrs
+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,  SwPointerTargetProps, DataTypeMappingSet, DataTypeMap
-from ..models import SenderReceiverInterface, ClientServerInterface, ClientServerOperation, ArgumentDataPrototype
-from ..models import Identifiable, AdminData, Sdg, Sd
-from ..models import CompuMethod, CompuScale, CompuScales, Compu, CompuConst, CompuConstTextContent, CompuScaleConstantContents, CompuScaleRationalFormula, CompuRationalCoeffs, CompuNominatorDenominator
-from ..models import InternalBehavior, ExecutableEntity
-from ..models import Implementation, Code, AutosarEngineeringObject, ResourceConsumption
-from ..models import TransmissionAcknowledgementRequest
-from ..models import BswModuleDescription, BswInternalBehavior, BswModuleEntity, BswScheduleEvent, SwcBswMapping, SwcBswRunnableMapping
-from ..models import ApplicationRecordDataType
-from ..models import SwValueCont, SwValues
+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 .abstract_arxml_parser import AbstractARXMLParser
 
@@ -369,7 +392,7 @@ class ARXMLParser(AbstractARXMLParser):
     
     def getRoleBasedPortAssignment(self, element: ET.Element) -> RoleBasedPortAssignment:
         assignment = RoleBasedPortAssignment()
-        assignment.port_prototype_ref = self.getChildElementOptionalRefType(element, "PORT-PROTOTYPE-REF")
+        assignment.portPrototypeRef = self.getChildElementOptionalRefType(element, "PORT-PROTOTYPE-REF")
         assignment.role = self.getChildElementOptionalLiteral(element, "ROLE")
         return assignment
 
@@ -1096,10 +1119,10 @@ class ARXMLParser(AbstractARXMLParser):
         '''
 
     def readBaseTypeDirectDefinition(self, element: ET.Element, definition: BaseTypeDirectDefinition):
-        definition.base_type_size = self.getChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE")
-        definition.base_type_encoding = self.getChildElementOptionalLiteral(element, "BASE-TYPE-ENCODING")
-        definition.mem_alignment = self.getChildElementOptionalNumericalValue(element, "MEM-ALIGNMENT")
-        definition.native_declaration = self.getChildElementOptionalLiteral(element, "NATIVE-DECLARATION")
+        definition.baseTypeSize = self.getChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE")
+        definition.baseTypeEncoding = self.getChildElementOptionalLiteral(element, "BASE-TYPE-ENCODING")
+        definition.memAlignment = self.getChildElementOptionalNumericalValue(element, "MEM-ALIGNMENT")
+        definition.nativeDeclaration = self.getChildElementOptionalLiteral(element, "NATIVE-DECLARATION")
 
     def readSwBaseType(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)

armodel/parser/connector_xlsx_parser.py

@@ -5,13 +5,15 @@ from openpyxl.worksheet.worksheet import Worksheet
 import openpyxl
 import re
 
-from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 
 from ..parser.excel_parser import AbstractExcelParser
 from ..data_models.sw_connector import AssemblySwConnectorData, DelegationSwConnectorData, SwConnectorData
-from ..models.ar_ref import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef, RefType
+from ..models.ar_ref import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
 from ..models.sw_component import CompositionSwComponentType
-from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 
 class ConnectorXls:
 

armodel/report/connector_xls_report.py

@@ -1,4 +1,4 @@
-from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 from .excel_report import ExcelReporter
 from ..models import AUTOSAR, CompositionSwComponentType
 from ..models import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef

armodel/tests/test_armodel/models/test_ar_object.py

@@ -1,5 +1,6 @@
 
-from ....models.ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
 
 
 class TestARObject:

armodel/tests/test_armodel/models/test_ar_package.py

@@ -1,15 +1,27 @@
 """ Test AR Package """
 import pytest
 
-from ....models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataType
-from ....models.m2.autosar_templates.sw_component_template.components import SwComponentType
-from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
-from ....models.datatype import ApplicationPrimitiveDataType, ApplicationRecordDataType, DataTypeMappingSet, SwBaseType
-from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
-from ....models.m2_msr import CompuMethod
-from ....models.m2.autosar_templates.sw_component_template.port_interface import ClientServerInterface, DataInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationPrimitiveDataType, ApplicationRecordDataType
+
+from ....models.M2.MSR.AsamHdo.BaseTypes import SwBaseType
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+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.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.autosar_templates.sw_component_template.composition import CompositionSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
 
 class TestAUTOSAR:
 

armodel/tests/test_armodel/models/test_ar_ref.py

@@ -2,11 +2,13 @@
 
 import pytest
 
-from ....models.m2.autosar_templates.generic_structure.abstract_structure import AtpInstanceRef
-from ....models.m2.autosar_templates.sw_component_template.composition.instance_refs import OperationInAtomicSwcInstanceRef, POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
-from ....models.m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import ArVariableInImplementationDataInstanceRef, AutosarVariableRef
-from ....models.ar_ref import RefType, TRefType
-from ....models.general_structure import ARObject
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpInstanceRef
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import OperationInAtomicSwcInstanceRef, POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import ArVariableInImplementationDataInstanceRef, AutosarVariableRef
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 
 class TestARRef:

armodel/tests/test_armodel/models/test_bsw_module_template.py

@@ -1,6 +1,10 @@
 import pytest
 
-from ....models.bsw_module_template import BswModuleDescription, BswModuleEntry, BswModuleEntity, BswCalledEntity
+from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
+
+from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswModuleEntity
+
+from ....models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 from .... import AUTOSAR
 
 class TestBswModuleDescription:

armodel/tests/test_armodel/models/test_common_structure.py

@@ -1,11 +1,17 @@
 import pytest
 
-from ....models.m2.autosar_templates.common_structure.implementation_data_types import AbstractImplementationDataTypeElement, ImplementationDataTypeElement
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ....models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import AbstractImplementationDataTypeElement, ImplementationDataTypeElement
 from .... import AUTOSAR
-from ....models.m2.autosar_templates.common_structure import ConstantReference, ConstantSpecification, ValueSpecification
-from ....models.common_structure import ExecutableEntity
-from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable
-from ....models.general_structure import MultilanguageReferrable, PackageableElement, Referrable
+from ....models.M2.AUTOSARTemplates.CommonStructure import ConstantReference, ConstantSpecification, ValueSpecification
+from ....models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
 
 class Test_M2_AUTOSARTemplates_CommonStructure_Constants:
     

armodel/tests/test_armodel/models/test_data_dictionary.py

@@ -1,7 +1,7 @@
 import pytest
 
-from ....models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps, SwPointerTargetProps
-from ....models.general_structure import ARObject
+from ....models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class Test_M2_MSR_DataDictionary_DataDefProperties:
     def test_SwDataDefProps(self):

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -1,9 +1,13 @@
 import pytest
 
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
 from .... import AUTOSAR
-from ....models.ar_ref import RefType
-from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
-from ....models.general_structure import ARObject, AtpFeature, Identifiable, MultilanguageReferrable, Referrable
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
 

armodel/tests/test_armodel/models/test_datatype.py

@@ -1,12 +1,26 @@
 import pytest
 
-from ....models.m2.autosar_templates.common_structure.implementation_data_types import AbstractImplementationDataType, ImplementationDataType, ImplementationDataTypeElement
-from ....models.m2.autosar_templates.sw_component_template.components import SymbolProps
-from ....models.m2.autosar_templates.common_structure.implementation import ImplementationProps
-from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationRecordElement
-from ....models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AtpType, AutosarDataType, BaseType, DataTypeMap, DataTypeMappingSet
-from ....models.datatype import BaseTypeDirectDefinition, SwBaseType
-from ....models.general_structure import ARElement, ARObject, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, DataTypeMap
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
+
+from ....models.M2.MSR.AsamHdo.BaseTypes import BaseType, BaseTypeDirectDefinition
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ....models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import AbstractImplementationDataType, ImplementationDataType, ImplementationDataTypeElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import SymbolProps
+from ....models.M2.AUTOSARTemplates.CommonStructure.Implementation import ImplementationProps
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationRecordElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
+from ....models.M2.MSR.AsamHdo.BaseTypes import SwBaseType
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 from .... import AUTOSAR
 class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
     def test_ImplementationProps(self):

armodel/tests/test_armodel/models/test_general_structure.py

@@ -1,7 +1,17 @@
 import pytest
 
-from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
-from ....models.general_structure import ARElement, ARObject, AtpFeature, CollectableElement, Identifiable, Limit, MultilanguageReferrable, PackageableElement, Referrable
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, PackageableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 
 class TestGeneralStructure:
     def test_ar_object(self):

armodel/tests/test_armodel/models/test_implementation.py

@@ -1,6 +1,7 @@
 
-from ....models.implementation import AutosarEngineeringObject, Code
-from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject
+from ....models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 
 
 class TestImplementation:

armodel/tests/test_armodel/models/test_m2_msr.py

@@ -1,8 +1,10 @@
 import pytest
 
+from ....models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent, CompuContent, CompuScale
+
 from .... import AUTOSAR
-from ....models.general_structure import ARObject
-from ....models.m2_msr import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent, CompuContent, CompuScale, CompuScales
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuScales
 
 class Test_M2_MSR_AsamHdo_ComputationMethod:
     def test_CompuContent(self):

armodel/tests/test_armodel/models/test_port_interface.py

@@ -1,11 +1,21 @@
 import pytest
 
-from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
-from ....models.ar_ref import RefType
-from ....models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
-from ....models.datatype import AtpType
-from ....models.general_structure import ARElement, ARObject, AtpFeature, CollectableElement, Identifiable, MultilanguageReferrable, PackageableElement, Referrable
-from ....models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
+
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+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
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:

armodel/tests/test_armodel/models/test_port_prototype.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.port_prototype import PPortComSpec, RPortComSpec
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import PPortComSpec, RPortComSpec
 
 class Test_PortProtype:
     def test_PPortComSpec(self):

armodel/tests/test_armodel/parser/test_parse_bswmd.py

@@ -1,6 +1,6 @@
 import filecmp
 
-from ....models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 
 from .... import AUTOSAR
 from .... import ARXMLParser, ARXMLWriter

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,8 +1,8 @@
 import filecmp
-from ....models.m2.autosar_templates.sw_component_template.composition import CompositionSwComponentType
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
-from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 
 class TestSWComponents:
     def setup_method(self):

armodel/tests/test_armodel/parser/test_system.py

@@ -0,0 +1,30 @@
+import filecmp
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
+from ....writer.arxml_writer import ARXMLWriter
+from ....parser.arxml_parser import ARXMLParser
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+
+class TestSystemTemplate:
+    def setup_method(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/CanSystem.arxml", document)
+
+    
+    def test_bswm_mode_arxml_loading_and_saving(self):
+        document = AUTOSAR.getInstance()
+        document.clear()
+        parser = ARXMLParser()
+        parser.load("src/armodel/tests/test_files/CanSystem.arxml", document)
+
+        writer = ARXMLWriter()
+        writer.save("data/generated_CanSystem.arxml", document)
+
+        #assert(filecmp.cmp("src/armodel/tests/test_files/CanSystem.arxml", "data/generated_CanSystem.arxml", shallow = False) == True)
+
+        
+
+    
+        
+        

armodel/writer/abstract_arxml_writer.py

@@ -7,9 +7,12 @@ from colorama import Fore
 import logging
 import xml.etree.cElementTree as ET
 
-from armodel.models.ar_ref import TRefType
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-from ..models.ar_object import ARBoolean, ARFloat, ARLiteral, ARNumerical, ARObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
+
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
 
 class AbstractARXMLWriter:
     __metaclass__ = ABCMeta