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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (157) hide show
  1. armodel/cli/arxml_dump_cli.py +10 -7
  2. armodel/cli/arxml_format_cli.py +1 -1
  3. armodel/cli/connector_update_cli.py +1 -1
  4. armodel/lib/sw_component.py +1 -1
  5. armodel/lib/system_signal.py +2 -2
  6. armodel/models/{m2/autosar_templates/autosar_top_level_structure.py → M2/AUTOSARTemplates/AutosarTopLevelStructure.py} +7 -4
  7. armodel/models/{bsw_module_template.py → M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py} +115 -140
  8. armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswImplementation.py +21 -0
  9. armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswInterfaces.py +52 -0
  10. armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswOverview.py +78 -0
  11. armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py +1 -0
  12. armodel/models/M2/AUTOSARTemplates/CommonStructure/Implementation.py +81 -0
  13. armodel/models/{m2/autosar_templates/common_structure/implementation_data_types.py → M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py} +9 -5
  14. armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py +108 -0
  15. armodel/models/M2/AUTOSARTemplates/CommonStructure/ModeDeclaration.py +96 -0
  16. armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py +72 -0
  17. armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/__init__.py +22 -0
  18. armodel/models/{service_needs.py → M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py} +7 -7
  19. armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcBswMapping.py +36 -0
  20. armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/ModeDeclarationGroup.py +27 -0
  21. armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/__init__.py +1 -0
  22. armodel/models/M2/AUTOSARTemplates/CommonStructure/TriggerDeclaration.py +9 -0
  23. armodel/models/{m2/autosar_templates/common_structure → M2/AUTOSARTemplates/CommonStructure}/__init__.py +5 -2
  24. armodel/models/{m2/autosar_templates/generic_structure/abstract_structure.py → M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py} +25 -2
  25. armodel/models/{m2/autosar_templates/generic_structure/ar_package.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py} +29 -21
  26. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ArObject.py +16 -0
  27. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ElementCollection.py +1 -0
  28. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/EngineeringObject.py +55 -0
  29. armodel/models/{general_structure.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py} +37 -149
  30. armodel/models/{ar_object.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py} +163 -70
  31. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/__init__.py +1 -0
  32. armodel/models/M2/AUTOSARTemplates/GenericStructure/__init__.py +1 -0
  33. armodel/models/{m2/autosar_templates/sw_component_template/communication.py → M2/AUTOSARTemplates/SWComponentTemplate/Communication.py} +22 -5
  34. armodel/models/{m2/autosar_templates/sw_component_template/components/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Components/InstanceRefs.py} +2 -2
  35. armodel/models/{m2/autosar_templates/sw_component_template/components → M2/AUTOSARTemplates/SWComponentTemplate/Components}/__init__.py +10 -8
  36. armodel/models/{m2/autosar_templates/sw_component_template/composition/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Composition/InstanceRefs.py} +2 -2
  37. armodel/models/{m2/autosar_templates/sw_component_template/composition → M2/AUTOSARTemplates/SWComponentTemplate/Composition}/__init__.py +5 -5
  38. armodel/models/{m2/autosar_templates/sw_component_template/data_type/data_prototypes.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/DataPrototypes.py} +25 -7
  39. armodel/models/{datatype.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py} +16 -73
  40. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/__init__.py +1 -0
  41. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/EndToEndProtection.py +177 -0
  42. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcImplementation.py +11 -0
  43. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/access_count.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/AccessCount.py} +2 -2
  44. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/data_elements.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py} +7 -5
  45. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/IncludedDataTypes.py +24 -0
  46. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/instance_refs_usage.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py} +3 -3
  47. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/mode_declaration_group.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py} +3 -3
  48. armodel/models/{per_instance_memory.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PerInstanceMemory.py} +5 -6
  49. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/server_call.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServerCall.py} +3 -3
  50. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py +23 -0
  51. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/trigger.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Trigger.py} +2 -2
  52. armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior}/__init__.py +9 -10
  53. armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/__init__.py +10 -6
  54. armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/instance_refs.py +2 -2
  55. armodel/models/{m2/autosar_templates/system_template/instance_refs.py → M2/AUTOSARTemplates/SystemTemplate/InstanceRefs.py} +2 -2
  56. armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/__init__.py +4 -2
  57. armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/data_mapping.py +2 -2
  58. armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/network_management.py +7 -3
  59. armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/transport_protocols.py +1 -1
  60. armodel/models/{m2/autosar_templates → M2/AUTOSARTemplates}/ecuc_description_template.py +10 -6
  61. armodel/models/M2/MSR/AsamHdo/AdminData.py +21 -0
  62. armodel/models/M2/MSR/AsamHdo/BaseTypes.py +77 -0
  63. armodel/models/{m2_msr.py → M2/MSR/AsamHdo/ComputationMethod.py} +44 -28
  64. armodel/models/{global_constraints.py → M2/MSR/AsamHdo/Constraints/GlobalConstraints.py} +7 -4
  65. armodel/models/M2/MSR/AsamHdo/Constraints/__init__.py +1 -0
  66. armodel/models/M2/MSR/AsamHdo/SpecialData.py +63 -0
  67. armodel/models/{m2/msr/asam_hdo/units.py → M2/MSR/AsamHdo/Units.py} +6 -3
  68. armodel/models/M2/MSR/AsamHdo/__init__.py +1 -0
  69. armodel/models/M2/MSR/CalibrationData/CalibrationValue.py +30 -0
  70. armodel/models/M2/MSR/CalibrationData/__init__.py +1 -0
  71. armodel/models/{m2/msr/data_dictionary/auxillary_objects.py → M2/MSR/DataDictionary/AuxillaryObjects.py} +4 -2
  72. armodel/models/M2/MSR/DataDictionary/Axis.py +145 -0
  73. armodel/models/M2/MSR/DataDictionary/CalibrationParameter.py +37 -0
  74. armodel/models/{m2/msr/data_dictionary/data_def_properties.py → M2/MSR/DataDictionary/DataDefProperties.py} +19 -9
  75. armodel/models/{record_layout.py → M2/MSR/DataDictionary/RecordLayout.py} +26 -25
  76. armodel/models/M2/MSR/DataDictionary/__init__.py +1 -0
  77. armodel/models/{annotation.py → M2/MSR/Documentation/Annotation.py} +8 -8
  78. armodel/models/{m2/msr/documentation/block_elements.py → M2/MSR/Documentation/BlockElements.py} +2 -2
  79. armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py +17 -0
  80. armodel/models/{multilanguage_data.py → M2/MSR/Documentation/TextModel/MultilanguageData.py} +21 -30
  81. armodel/models/M2/MSR/Documentation/TextModel/__init__.py +2 -0
  82. armodel/models/M2/MSR/Documentation/__init__.py +3 -0
  83. armodel/models/M2/MSR/__init__.py +1 -0
  84. armodel/models/M2/__init__.py +1 -0
  85. armodel/models/__init__.py +6 -23
  86. armodel/models/fibex/can_communication.py +3 -2
  87. armodel/models/fibex/fibex_4_multiplatform.py +5 -3
  88. armodel/models/fibex/fibex_core/core_communication.py +9 -3
  89. armodel/models/fibex/fibex_core/core_topology.py +7 -3
  90. armodel/models/fibex/lin_communication.py +5 -1
  91. armodel/models/rpt_scenario.py +2 -2
  92. armodel/models/sw_component.py +19 -14
  93. armodel/models/timing.py +3 -3
  94. armodel/parser/abstract_arxml_parser.py +8 -4
  95. armodel/parser/arxml_parser.py +85 -62
  96. armodel/parser/connector_xlsx_parser.py +5 -3
  97. armodel/report/connector_xls_report.py +1 -1
  98. armodel/tests/test_armodel/models/test_ar_object.py +2 -1
  99. armodel/tests/test_armodel/models/test_ar_package.py +20 -8
  100. armodel/tests/test_armodel/models/test_ar_ref.py +7 -5
  101. armodel/tests/test_armodel/models/test_bsw_module_template.py +5 -1
  102. armodel/tests/test_armodel/models/test_common_structure.py +11 -5
  103. armodel/tests/test_armodel/models/test_data_dictionary.py +2 -2
  104. armodel/tests/test_armodel/models/test_data_prototype.py +7 -3
  105. armodel/tests/test_armodel/models/test_datatype.py +21 -7
  106. armodel/tests/test_armodel/models/test_general_structure.py +12 -2
  107. armodel/tests/test_armodel/models/test_implementation.py +3 -2
  108. armodel/tests/test_armodel/models/test_m2_msr.py +4 -2
  109. armodel/tests/test_armodel/models/test_port_interface.py +16 -6
  110. armodel/tests/test_armodel/models/test_port_prototype.py +1 -1
  111. armodel/tests/test_armodel/parser/test_parse_bswmd.py +1 -1
  112. armodel/tests/test_armodel/parser/test_sw_components.py +2 -2
  113. armodel/tests/test_armodel/parser/test_system.py +30 -0
  114. armodel/writer/abstract_arxml_writer.py +5 -2
  115. armodel/writer/arxml_writer.py +100 -67
  116. {armodel-1.6.2.dist-info → armodel-1.6.3.dist-info}/METADATA +366 -356
  117. armodel-1.6.3.dist-info/RECORD +148 -0
  118. {armodel-1.6.2.dist-info → armodel-1.6.3.dist-info}/WHEEL +1 -1
  119. armodel/lib/data_analyzer.py +0 -34
  120. armodel/models/ar_package.py +0 -641
  121. armodel/models/ar_ref.py +0 -25
  122. armodel/models/calibration.py +0 -119
  123. armodel/models/common_structure.py +0 -272
  124. armodel/models/communication.py +0 -17
  125. armodel/models/data_def_properties.py +0 -16
  126. armodel/models/data_dictionary.py +0 -59
  127. armodel/models/data_prototype.py +0 -103
  128. armodel/models/ecuc_parameter_def_template.py +0 -0
  129. armodel/models/end_to_end_protection.py +0 -67
  130. armodel/models/fibex/fibex_core.py +0 -341
  131. armodel/models/fibex/lin_topology.py +0 -7
  132. armodel/models/implementation.py +0 -135
  133. armodel/models/internal_behavior.py +0 -63
  134. armodel/models/m2/autosar_templates/common_structure/constants.py +0 -0
  135. armodel/models/m2/autosar_templates/common_structure/implementation.py +0 -21
  136. armodel/models/m2/autosar_templates/generic_structure/__init__.py +0 -0
  137. armodel/models/m2/autosar_templates/sw_component_template/__init__.py +0 -0
  138. armodel/models/m2/autosar_templates/sw_component_template/data_type/__init__.py +0 -0
  139. armodel/models/m2/autosar_templates/sw_component_template/port_interface.py +0 -236
  140. armodel/models/m2/msr/__init__.py +0 -0
  141. armodel/models/m2/msr/asam_hdo/__init__.py +0 -0
  142. armodel/models/m2/msr/data_dictionary/__init__.py +0 -0
  143. armodel/models/m2/msr/documentation/__init__.py +0 -0
  144. armodel/models/mode_declaration.py +0 -8
  145. armodel/models/port_interface.py +0 -165
  146. armodel/models/port_prototype.py +0 -6
  147. armodel/models/service_mapping.py +0 -11
  148. armodel/models/system_template/__init__.py +0 -0
  149. armodel/models/system_template/network_management.py +0 -7
  150. armodel/models/system_template/transport_protocols.py +0 -7
  151. armodel/models/unit.py +0 -14
  152. armodel-1.6.2.dist-info/RECORD +0 -142
  153. /armodel/models/{m2 → M2/AUTOSARTemplates/SWComponentTemplate}/__init__.py +0 -0
  154. /armodel/models/{m2/autosar_templates → M2/AUTOSARTemplates}/__init__.py +0 -0
  155. {armodel-1.6.2.dist-info → armodel-1.6.3.dist-info}/LICENSE +0 -0
  156. {armodel-1.6.2.dist-info → armodel-1.6.3.dist-info}/entry_points.txt +0 -0
  157. {armodel-1.6.2.dist-info → armodel-1.6.3.dist-info}/top_level.txt +0 -0
@@ -2,35 +2,63 @@ import xml.etree.cElementTree as ET
2
2
 
3
3
  from typing import List
4
4
 
5
- from armodel.models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataType
6
-
7
-
8
-
9
- from ..models.m2.msr.data_dictionary.auxillary_objects import SwAddrMethod
10
- from ..models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps
11
- from ..models.m2.msr.asam_hdo.units import PhysicalDimension
12
- from ..models.m2.msr.documentation.block_elements import DocumentationBlock
13
- from ..models.m2_msr import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
14
-
15
- from ..models.m2.autosar_templates.common_structure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
16
- from ..models.m2.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
17
- from ..models.m2.autosar_templates.generic_structure.abstract_structure import AnyInstanceRef
18
- from ..models.m2.autosar_templates.sw_component_template.components import PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
19
- from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
20
- from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior import RunnableEntityArgument, SynchronousServerCallPoint
21
- from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.server_call import ServerCallPoint
22
- from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.data_elements import ParameterAccess, VariableAccess
23
- from ..models.m2.autosar_templates.sw_component_template.composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwConnector
24
- from ..models.m2.autosar_templates.sw_component_template.composition.instance_refs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
25
- from ..models.m2.autosar_templates.sw_component_template.port_interface.instance_refs import ApplicationCompositeElementInPortInterfaceInstanceRef
26
- from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.instance_refs_usage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
27
- from ..models.m2.autosar_templates.system_template.instance_refs import VariableDataPrototypeInSystemInstanceRef
28
- from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
29
- from ..models.m2.autosar_templates.system_template.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
30
- from ..models.m2.autosar_templates.system_template import System, SystemMapping
31
- from ..models.m2.autosar_templates.system_template.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
32
- from ..models.m2.autosar_templates.system_template.transport_protocols import CanTpConfig
33
- from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
5
+ from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup, SwRecordLayoutV
6
+
7
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
8
+
9
+ from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
10
+
11
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
12
+
13
+ from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import InternalConstrs, PhysConstrs
14
+ from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis
15
+ from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
16
+ from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
17
+ from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
18
+ from ..models.M2.MSR.AsamHdo.SpecialData import Sdg
19
+ from ..models.M2.MSR.AsamHdo.AdminData import AdminData
20
+ from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
21
+ from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph
22
+ from ..models.M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
23
+ from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
24
+ from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension
25
+ from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
26
+ from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
27
+ from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
28
+ from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
29
+
30
+ from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
31
+ from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
32
+ from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code, Implementation
33
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
34
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment
35
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
36
+ from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
37
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup
38
+ from ..models.M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
39
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
40
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
41
+ from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
42
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
43
+ from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
44
+ from ..models.M2.AUTOSARTemplates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
45
+ from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
46
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
47
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
48
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntityArgument, SynchronousServerCallPoint
49
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
50
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
51
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwConnector
52
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
53
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface.instance_refs import ApplicationCompositeElementInPortInterfaceInstanceRef
54
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
55
+ from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
56
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
57
+ from ..models.M2.AUTOSARTemplates.SystemTemplate.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
58
+ from ..models.M2.AUTOSARTemplates.SystemTemplate import System, SystemMapping
59
+ from ..models.M2.AUTOSARTemplates.SystemTemplate.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
60
+ from ..models.M2.AUTOSARTemplates.SystemTemplate.transport_protocols import CanTpConfig
61
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
34
62
 
35
63
  from ..models.fibex.fibex_4_multiplatform import Gateway, ISignalMapping
36
64
  from ..models.fibex.can_communication import CanFrame, CanFrameTriggering, RxIdentifierRange
@@ -38,34 +66,31 @@ from ..models.fibex.fibex_core.core_communication import FrameTriggering, IPdu,
38
66
  from ..models.fibex.lin_communication import LinFrameTriggering, LinUnconditionalFrame
39
67
  from ..models.fibex.fibex_core.core_topology import AbstractCanCluster, CanCluster, EcuInstance, CanPhysicalChannel, CommunicationCluster, LinCluster, LinPhysicalChannel, PhysicalChannel
40
68
 
41
- from ..models.internal_behavior import IncludedDataTypeSet, InternalBehavior
69
+ from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
42
70
  from ..models.timing import EOCExecutableEntityRef, ExecutionOrderConstraint, SwcTiming, TimingExtension
43
- from ..models.data_def_properties import ValueList
44
- from ..models.multilanguage_data import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
45
- from ..models.record_layout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
46
- from ..models.service_mapping import RoleBasedPortAssignment
47
- from ..models.service_needs import NvBlockNeeds, RoleBasedDataAssignment
48
- from ..models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
49
- from ..models.bsw_module_template import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleDescription, BswModuleEntity, BswModuleEntry, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
50
- from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
71
+ from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
72
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment
73
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds
74
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
75
+ from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
76
+ from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
51
77
  from ..models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
52
- from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
53
- from ..models.ar_ref import RefType
54
- from ..models.calibration import SwAxisGrouped, SwAxisIndividual, SwCalprmAxis, SwCalprmAxisSet, SwValueCont, SwValues
55
- from ..models.common_structure import IncludedModeDeclarationGroupSet, ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype
56
- from ..models.communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
57
- from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, BaseTypeDirectDefinition, DataTypeMappingSet, SwBaseType
58
- from ..models.general_structure import ARElement, AdminData, Identifiable, Limit, MultilanguageReferrable, Referrable, Sdg, SwcBswMapping, SwcBswRunnableMapping
59
-
60
- from ..models.annotation import Annotation
61
- from ..models.end_to_end_protection import EndToEndDescription, EndToEndProtection, EndToEndProtectionSet, EndToEndProtectionVariablePrototype
62
- from ..models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, PortInterface, SenderReceiverInterface, TriggerInterface
63
- from ..models.m2.msr.asam_hdo.units import Unit
64
- from ..models.implementation import AutosarEngineeringObject, BswImplementation, Code, EngineeringObject, Implementation, SwcImplementation
65
- from ..models.common_structure import ExecutableEntity, ResourceConsumption
78
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
79
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
80
+ from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
81
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
82
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
83
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
84
+
85
+ from ..models.M2.MSR.Documentation.Annotation import Annotation
86
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
87
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, PortInterface, SenderReceiverInterface, TriggerInterface
88
+ from ..models.M2.MSR.AsamHdo.Units import Unit
89
+ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
90
+ from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
66
91
  from ..models.sw_component import RunnableEntity, SwcInternalBehavior, TimingEvent
67
- from ..models.ar_object import ARLiteral
68
- from ..models.global_constraints import DataConstr, InternalConstrs, PhysConstrs
92
+ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
93
+ from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
69
94
 
70
95
  from .abstract_arxml_writer import AbstractARXMLWriter
71
96
  class ARXMLWriter(AbstractARXMLWriter):
@@ -678,10 +703,10 @@ class ARXMLWriter(AbstractARXMLWriter):
678
703
  raise NotImplementedError("Unsupported ApplicationDataType <%s>" % type(data_type))
679
704
 
680
705
  def writeBaseTypeDirectDefinition(self, element: ET.Element, base_type_definition: BaseTypeDirectDefinition):
681
- self.setChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE", base_type_definition.base_type_size)
682
- self.setChildElementOptionalLiteral(element, "BASE-TYPE-ENCODING", base_type_definition.base_type_encoding)
683
- self.setChildElementOptionalNumericalValue(element, "MEM-ALIGNMENT", base_type_definition.mem_alignment)
684
- self.setChildElementOptionalLiteral(element, "NATIVE-DECLARATION", base_type_definition.native_declaration)
706
+ self.setChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE", base_type_definition.baseTypeSize)
707
+ self.setChildElementOptionalLiteral(element, "BASE-TYPE-ENCODING", base_type_definition.baseTypeEncoding)
708
+ self.setChildElementOptionalNumericalValue(element, "MEM-ALIGNMENT", base_type_definition.memAlignment)
709
+ self.setChildElementOptionalLiteral(element, "NATIVE-DECLARATION", base_type_definition.nativeDeclaration)
685
710
 
686
711
  def writeSwBaseType(self, element: ET.Element, base_type: SwBaseType):
687
712
  data_type_tag = ET.SubElement(element, "SW-BASE-TYPE")
@@ -1165,7 +1190,7 @@ class ARXMLWriter(AbstractARXMLWriter):
1165
1190
 
1166
1191
  def writeRoleBasedPortAssignment(self, element: ET.Element, assignment: RoleBasedPortAssignment):
1167
1192
  child_element = ET.SubElement(element, "ROLE-BASED-PORT-ASSIGNMENT")
1168
- self.setChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF", assignment.port_prototype_ref)
1193
+ self.setChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF", assignment.portPrototypeRef)
1169
1194
  self.setChildElementOptionalLiteral(child_element, "ROLE", assignment.role)
1170
1195
 
1171
1196
  def writeSwcServiceDependencyAssignedData(self, element: ET.Element, dependency: SwcServiceDependency):
@@ -1358,18 +1383,18 @@ class ARXMLWriter(AbstractARXMLWriter):
1358
1383
  child_element = ET.SubElement(element, key)
1359
1384
  self.setChildElementOptionalLiteral(child_element, "CATEGORY", desc.category)
1360
1385
  self.writeEndToEndDescriptionDataId(child_element, desc)
1361
- self.setChildElementOptionalNumericalValue(child_element, "DATA-ID-MODE", desc.dataIdMode)
1362
- self.setChildElementOptionalNumericalValue(child_element, "MAX-DELTA-COUNTER-INIT", desc.maxDeltaCounterInit)
1363
- self.setChildElementOptionalNumericalValue(child_element, "CRC-OFFSET", desc.crcOffset)
1364
- self.setChildElementOptionalNumericalValue(child_element, "COUNTER-OFFSET", desc.counterOffset)
1386
+ self.setChildElementOptionalNumericalValue(child_element, "DATA-ID-MODE", desc.getDataIdMode())
1387
+ self.setChildElementOptionalNumericalValue(child_element, "MAX-DELTA-COUNTER-INIT", desc.getMaxDeltaCounterInit())
1388
+ self.setChildElementOptionalNumericalValue(child_element, "CRC-OFFSET", desc.getCrcOffset())
1389
+ self.setChildElementOptionalNumericalValue(child_element, "COUNTER-OFFSET", desc.getCounterOffset())
1365
1390
 
1366
1391
  def setVariableDataPrototypeInSystemInstanceRef(self, element: ET.Element, key: str, iref: VariableDataPrototypeInSystemInstanceRef):
1367
1392
  if iref is not None:
1368
1393
  child_element = ET.SubElement(element, key)
1369
- self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPONENT-REF", iref.context_component_refs)
1370
- self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPOSITION-REF", iref.context_composition_ref)
1371
- self.setChildElementOptionalRefType(child_element, "CONTEXT-PORT-REF", iref.context_port_ref)
1372
- self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", iref.target_data_prototype_ref)
1394
+ #self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPONENT-REF", iref.getContextComponentRefs()) # TODO
1395
+ self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPOSITION-REF", iref.getContextCompositionRef())
1396
+ self.setChildElementOptionalRefType(child_element, "CONTEXT-PORT-REF", iref.getContextPortRef())
1397
+ self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", iref.getTargetDataPrototypeRef())
1373
1398
 
1374
1399
  def setEndToEndProtectionVariablePrototype(self, element: ET.Element, key: str, prototype: EndToEndProtectionVariablePrototype):
1375
1400
  if prototype is not None:
@@ -2595,6 +2620,14 @@ class ARXMLWriter(AbstractARXMLWriter):
2595
2620
  self.writeGateway(element, ar_element)
2596
2621
  elif isinstance(ar_element, ISignal):
2597
2622
  self.writeISignal(element, ar_element)
2623
+ elif isinstance(ar_element, System):
2624
+ self.writeSystem(element, ar_element)
2625
+ elif isinstance(ar_element, EcuInstance):
2626
+ self.writeEcuInstance(element, ar_element)
2627
+ elif isinstance(ar_element, ISignalIPdu):
2628
+ self.writeISignalIPdu(element, ar_element)
2629
+ elif isinstance(ar_element, SystemSignal):
2630
+ self.writeSystemSignal(element, ar_element)
2598
2631
  else:
2599
2632
  raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
2600
2633