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

armodel/parser/arxml_parser.py

@@ -2,10 +2,13 @@ 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
@@ -15,7 +18,7 @@ from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior i
 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, ModeSwitchPoint
+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.fibex.lin_communication import LinFrameTriggering
@@ -44,7 +47,7 @@ from ..models.calibration import SwAxisGrouped, SwAxisIndividual, SwCalprmAxis,
 from ..models.communication import CompositeNetworkRepresentation
 from ..models.end_to_end_protection import EndToEndDescription, EndToEndProtection, EndToEndProtectionSet, EndToEndProtectionVariablePrototype
 from ..models.service_mapping import RoleBasedPortAssignment
-from ..models.ar_package import AUTOSAR, ARPackage
+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.sw_component import AtomicSwComponentType, PortAPIOption, PortDefinedArgumentValue, ServiceDependency,  SwcServiceDependency
@@ -224,7 +227,7 @@ class ARXMLParser(AbstractARXMLParser):
             ref = self.getChildElementOptionalRefType(child_element, "BSW-MODULE-ENTRY-REF") 
             if (ref is not None):
                 parent.addImplementedEntry(ref)
-            self.logger.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.short_name)
+            self.logger.debug("ImplementedEntry <%s> of BswModuleDescription <%s> has been added", ref.value, parent.getShortName())
 
     def readModeDeclarationGroupPrototype(self, element: ET.Element, prototype: ModeDeclarationGroupPrototype):
         self.readIdentifiable(element, prototype)
@@ -243,14 +246,14 @@ class ARXMLParser(AbstractARXMLParser):
             short_name = self.getShortName(child_element)
             self.logger.debug("readRequiredModeGroup %s" % short_name)
             mode_group = parent.createProvidedModeGroup(short_name)
-            mode_group.type_tref = self.getChildElementRefType(parent.short_name, child_element, "TYPE-TREF")
+            mode_group.type_tref = self.getChildElementRefType(parent.getShortName(), child_element, "TYPE-TREF")
 
     def readCanEnterExclusiveAreaRefs(self, element: ET.Element, entity: ExecutableEntity):
         for ref in self.getChildElementRefTypeList(element, "CAN-ENTER-EXCLUSIVE-AREA-REFS/CAN-ENTER-EXCLUSIVE-AREA-REF"):
             entity.addCanEnterExclusiveAreaRef(ref)
 
     def readExecutableEntity(self, element: ET.Element, entity: ExecutableEntity):
-        self.logger.debug("readExecutableEntity %s" % entity.short_name)
+        self.logger.debug("readExecutableEntity %s" % entity.getShortName())
         self.readIdentifiable(element, entity)
         self.readCanEnterExclusiveAreaRefs(element, entity)
         entity.setMinimumStartInterval(self.getChildElementOptionalFloatValue(element, "MINIMUM-START-INTERVAL")) \
@@ -264,7 +267,7 @@ class ARXMLParser(AbstractARXMLParser):
 
     def readBswModuleEntity(self, element: ET.Element, entity: BswModuleEntity):
         self.readExecutableEntity(element, entity)
-        entity.setImplementedEntryRef(self.getChildElementRefType(entity.short_name, element, "IMPLEMENTED-ENTRY-REF"))
+        entity.setImplementedEntryRef(self.getChildElementRefType(entity.getShortName(), element, "IMPLEMENTED-ENTRY-REF"))
         self.readBswModuleEntityManagedModeGroup(element, entity)
 
     def readBswCalledEntity(self, element: ET.Element, parent: BswInternalBehavior):
@@ -283,7 +286,7 @@ class ARXMLParser(AbstractARXMLParser):
             self.readBswModuleEntity(child_element, entity)
 
     def readBswEvent(self, element: ET.Element, event: BswScheduleEvent):
-        event.startsOnEventRef = self.getChildElementRefType(event.short_name, element, "STARTS-ON-EVENT-REF")
+        event.startsOnEventRef = self.getChildElementRefType(event.getShortName(), element, "STARTS-ON-EVENT-REF")
 
     def readBswScheduleEvent(self, element, event: BswScheduleEvent):
         self.readBswEvent(element, event)
@@ -310,7 +313,7 @@ class ARXMLParser(AbstractARXMLParser):
             short_name = self.getShortName(child_element)
             self.logger.debug("readBswDataReceivedEvent %s" % short_name)
             event = parent.createBswDataReceivedEvent(short_name)
-            event.data_ref = self.getChildElementRefType(parent.short_name, child_element, "DATA-REF")
+            event.data_ref = self.getChildElementRefType(parent.getShortName(), child_element, "DATA-REF")
             # Read the Inherit BswScheduleEvent
             self.readBswScheduleEvent(child_element, event)
 
@@ -319,7 +322,7 @@ class ARXMLParser(AbstractARXMLParser):
             short_name = self.getShortName(child_element)
             self.logger.debug("readBswInternalTriggerOccurredEvent %s" % short_name)
             event = parent.createBswInternalTriggerOccurredEvent(short_name)
-            event.event_source_ref = self.getChildElementRefType(parent.short_name, child_element, "EVENT-SOURCE-REF")
+            event.event_source_ref = self.getChildElementRefType(parent.getShortName(), child_element, "EVENT-SOURCE-REF")
             # Read the Inherit BswScheduleEvent
             self.readBswScheduleEvent(child_element, event)
 
@@ -513,7 +516,7 @@ class ARXMLParser(AbstractARXMLParser):
         entry.sw_service_impl_policy = self.getChildElementOptionalLiteral(element, "SW-SERVICE-IMPL-POLICY")
 
         #self.logger.debug("readBswModuleEntry \n%s" % entry)
-        self.logger.debug("readBswModuleEntry %s" % entry.short_name)
+        self.logger.debug("readBswModuleEntry %s" % entry.getShortName())
 
     def readEngineeringObject(self, element: ET.Element, engineering_obj: EngineeringObject):
         self.readElementAttributes(element, engineering_obj)
@@ -558,7 +561,7 @@ class ARXMLParser(AbstractARXMLParser):
             memory_section.size = self.getChildElementOptionalNumericalValue(child_element, "SIZE")
             memory_section.swAddrMethodRef = self.getChildElementOptionalRefType(child_element, "SW-ADDRMETHOD-REF")
             memory_section.symbol = self.getChildElementOptionalLiteral(child_element, "SYMBOL")
-            self.logger.debug("readMemorySections %s" % memory_section.short_name)
+            self.logger.debug("readMemorySections %s" % memory_section.getShortName())
 
     def readResourceConsumption(self, element: ET.Element, impl: Implementation):
         child_element = element.find("./xmlns:RESOURCE-CONSUMPTION", self.nsmap)
@@ -588,7 +591,7 @@ class ARXMLParser(AbstractARXMLParser):
     def readBswImplementation(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
         impl = parent.createBswImplementation(short_name)   
-        self.logger.debug("readBswImplementation %s" % impl.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")
@@ -597,7 +600,7 @@ class ARXMLParser(AbstractARXMLParser):
     def readSwcImplementation(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
         impl = parent.createSwcImplementation(short_name)   
-        self.logger.debug("readSwcImplementation %s" % impl.short_name)
+        self.logger.debug("readSwcImplementation %s" % impl.getShortName())
         self.readImplementation(element, impl)
         impl.behavior_ref = self.getChildElementOptionalRefType(element, "BEHAVIOR-REF")
 
@@ -790,8 +793,8 @@ class ARXMLParser(AbstractARXMLParser):
         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.short_name, child_element, "CONTEXT-P-PORT-REF")
-            parent.operation_iref.target_provided_operation_ref = self.getChildElementRefType(parent.short_name, child_element, "TARGET-PROVIDED-OPERATION-REF")
+            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")
 
     def readOperationInvokedEvent(self, element: ET.Element, parent: SwcInternalBehavior):
         short_name = self.getShortName(element)
@@ -876,7 +879,7 @@ class ARXMLParser(AbstractARXMLParser):
         short_name = self.getShortName(element)
         event = parent.createInternalTriggerOccurredEvent(short_name)
         self.readRTEEvent(element, event)
-        event.event_source_ref = self.getChildElementRefType(parent.short_name, element, "EVENT-SOURCE-REF")
+        event.event_source_ref = self.getChildElementRefType(parent.getShortName(), element, "EVENT-SOURCE-REF")
 
     def readInitEvent(self, element, parent: SwcInternalBehavior):
         short_name = self.getShortName(element)
@@ -1048,14 +1051,14 @@ class ARXMLParser(AbstractARXMLParser):
         self.readApplicationRecordElements(element, data_type)
 
     def readImplementationDataTypeElements(self, element: ET.Element, parent: ImplementationDataType):
-        for child_element in element.findall("./xmlns:SUB-ELEMENTS/xmlns:IMPLEMENTATION-DATA-TYPE-ELEMENT", self.nsmap):
+        for child_element in self.findall(element, "SUB-ELEMENTS/IMPLEMENTATION-DATA-TYPE-ELEMENT"):
             short_name = self.getShortName(child_element)
-            type_element = parent.createImplementationDataTypeElement(short_name)   # type: ImplementationDataTypeElement
+            type_element = parent.createImplementationDataTypeElement(short_name)
             self.readIdentifiable(child_element, type_element)
             type_element.setArraySize(self.getChildElementOptionalLiteral(child_element, "ARRAY-SIZE")) \
                         .setArraySizeSemantics(self.getChildElementOptionalLiteral(child_element, "ARRAY-SIZE-SEMANTICS"))
             self.readImplementationDataTypeElements(child_element, type_element)
-            type_element.swDataDefProps = self.getSwDataDefProps(child_element, "SW-DATA-DEF-PROPS")
+            type_element.setSwDataDefProps(self.getSwDataDefProps(child_element, "SW-DATA-DEF-PROPS"))
 
     def readImplementationDataType(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)
@@ -1063,26 +1066,34 @@ class ARXMLParser(AbstractARXMLParser):
         self.readAutosarDataType(element, data_type)
         self.readImplementationDataTypeElements(element, data_type)
         data_type.setTypeEmitter(self.getChildElementOptionalLiteral(element, "TYPE-EMITTER"))
+        
+        
+        '''
         if (data_type.getCategory().getValue() == ImplementationDataType.CATEGORY_ARRAY):
             if (len(data_type.getImplementationDataTypeElements()) < 1):
-                self._raiseError("Array Sub-Element of <%s> do not defined." % data_type.short_name)
+                self._raiseError("Array Sub-Element of <%s> do not defined." % data_type.getShortName())
 
             array_sub_element = data_type.getImplementationDataTypeElements()[0]
-            if (array_sub_element.category.getValue() == ImplementationDataType.CATEGORY_TYPE_REFERENCE):
+            if (array_sub_element.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_REFERENCE):
                 data_type.setArrayElementType(array_sub_element.swDataDefProps.implementationDataTypeRef.value)
-            elif (array_sub_element.category.getValue() == ImplementationDataType.CATEGORY_TYPE_VALUE):  # TODO: fix 
+            elif (array_sub_element.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_VALUE):  # TODO: fix 
                 return
             else:
-                self._raiseError("The category <%s> of array sub-element <%s> does not support." % (array_sub_element.category.value, data_type.short_name))
+                self._raiseError("The category <%s> of array sub-element <%s> does not support." % (
+                    array_sub_element.getCategory().getValue(), data_type.getShortName()))
         elif (data_type.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_STRUCTURE):
-            if (len(data_type.getImplementationDataTypeElements()) < 1):
-                self._raiseError("Structure Sub-Element of <%s> do not defined." % data_type.short_name)
+            if len(data_type.getImplementationDataTypeElements()) < 1:
+                self._raiseError("Structure Sub-Element of <%s> do not defined." % data_type.getShortName())
             self.readImplementationDataTypeSymbolProps(element, data_type)
             struct_sub_element = data_type.getImplementationDataTypeElements()[0]
-            if (struct_sub_element.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_REFERENCE):
+            if struct_sub_element.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_REFERENCE:
                 data_type.setStructElementType(struct_sub_element.getSwDataDefProps().getImplementationDataTypeRef().getValue())
+            #elif struct_sub_element.getCategory().getValue() == ImplementationDataType.CATEGORY_TYPE_VALUE:
+            #    return
             else:
-                self._raiseError("The category <%s> of structure sub-element <%s> does not support." % (struct_sub_element.category.value, data_type.short_name))
+                self._raiseError("The category <%s> of structure sub-element <%s> does not support." % (
+                    struct_sub_element.getCategory().getValue(), data_type.getShortName()))
+        '''
 
     def readBaseTypeDirectDefinition(self, element: ET.Element, definition: BaseTypeDirectDefinition):
         definition.base_type_size = self.getChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE")
@@ -2212,7 +2223,7 @@ class ARXMLParser(AbstractARXMLParser):
                .setNmRangeConfig(self.getChildElementRxIdentifierRange(element, "NM-RANGE-CONFIG"))
 
     def readNmClusterNmNodes(self, element: ET.Element, parent: NmCluster):
-        self.logger.debug("readNmConfigNmNodes %s" % parent.short_name)
+        self.logger.debug("readNmConfigNmNodes %s" % parent.getShortName())
         for child_element in self.findall(element, "NM-NODES/*"):
             tag_name = self.getTagName(child_element)
             if tag_name == "CAN-NM-NODE":
@@ -2359,7 +2370,7 @@ class ARXMLParser(AbstractARXMLParser):
             ref = self.getChildElementOptionalRefType(child_element, "ECUC-MODULE-CONFIGURATION-VALUES-REF") 
             if (ref is not None):
                 parent.addEcucValueRef(ref)
-            self.logger.debug("EcucValue <%s> of EcucValueCollection <%s> has been added", ref.value, parent.short_name)
+            self.logger.debug("EcucValue <%s> of EcucValueCollection <%s> has been added", ref.value, parent.getShortName())
 
     def readEcucValueCollection(self, element: ET.Element, parent: ARPackage):
         short_name = self.getShortName(element)

armodel/parser/connector_xlsx_parser.py

@@ -5,11 +5,13 @@ from openpyxl.worksheet.worksheet import Worksheet
 import openpyxl
 import re
 
+from ..models.m2.autosar_templates.generic_structure.ar_package 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.sw_component import CompositionSwComponentType
-from ..models.ar_package import AUTOSAR, ARPackage
+from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 
 class ConnectorXls:
 

armodel/report/connector_xls_report.py

@@ -1,5 +1,6 @@
+from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
 from .excel_report import ExcelReporter
-from ..models import AUTOSAR, ARPackage, CompositionSwComponentType
+from ..models import AUTOSAR, CompositionSwComponentType
 from ..models import PPortInCompositionInstanceRef, RPortInCompositionInstanceRef
 from typing import List
 

armodel/tests/test_armodel/models/test_ar_package.py

@@ -3,7 +3,7 @@ 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.ar_package import AUTOSAR
+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

armodel/tests/test_armodel/models/test_datatype.py

@@ -226,7 +226,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_ImplementationDataTypes:
 
         assert(data_type._parent == ar_root)
         assert(data_type.short_name == "ImplementationDataType")
-        assert(data_type.sub_elements == [])
+        assert(data_type.subElements == [])
         assert(data_type.symbolProps == None)
         assert(data_type._type_emitter == None)
 

armodel/tests/test_armodel/models/test_general_structure.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.ar_package import AUTOSAR
+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
 
 class TestGeneralStructure:

armodel/tests/test_armodel/models/test_implementation.py

@@ -1,6 +1,6 @@
 
 from ....models.implementation import AutosarEngineeringObject, Code
-from ....models.ar_package import AUTOSAR
+from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 
 
 class TestImplementation:

armodel/tests/test_armodel/models/test_port_interface.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ....models.ar_package import AUTOSAR
+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

armodel/tests/test_armodel/parser/test_parse_bswmd.py

@@ -1,6 +1,8 @@
 import filecmp
 
-from .... import AUTOSAR, ARPackage
+from ....models.m2.autosar_templates.generic_structure.ar_package import ARPackage
+
+from .... import AUTOSAR
 from .... import ARXMLParser, ARXMLWriter
 
 import logging

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -2,7 +2,7 @@ import filecmp
 from ....models.m2.autosar_templates.sw_component_template.composition import CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
-from ....models.ar_package import AUTOSAR
+from ....models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 
 class TestSWComponents:
     def setup_method(self):

armodel/writer/arxml_writer.py

@@ -47,9 +47,9 @@ from ..models.service_mapping import RoleBasedPortAssignment
 from ..models.service_needs import NvBlockNeeds, RoleBasedDataAssignment
 from ..models.m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
 from ..models.bsw_module_template import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleDescription, BswModuleEntity, BswModuleEntry, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
-from ..models.ar_package import AUTOSAR
+from ..models.m2.autosar_templates.autosar_top_level_structure import AUTOSAR
 from ..models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
-from ..models.ar_package import ARPackage
+from ..models.m2.autosar_templates.generic_structure.ar_package import ARPackage
 from ..models.ar_ref import RefType
 from ..models.calibration import SwAxisGrouped, SwAxisIndividual, SwCalprmAxis, SwCalprmAxisSet, SwValueCont, SwValues
 from ..models.common_structure import IncludedModeDeclarationGroupSet, ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype

{armodel-1.6.1.dist-info → armodel-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.6.1
+Version: 1.6.2
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa

{armodel-1.6.1.dist-info → armodel-1.6.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
 armodel/__init__.py,sha256=GVXg600GzbcLT2-Lrepuz6mjT6_BsVNmi2eDiz85NiA,67
 armodel/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/cli/arxml_dump_cli.py,sha256=eIn1PD5H8AlaF_hEJshUhtw0weM44rVa-mMwNFUrqZY,9961
-armodel/cli/arxml_format_cli.py,sha256=9Ys_3DlcVwV2vDGcE6FAwmVfyx2dKLlIdLi17Fla-Jk,2066
+armodel/cli/arxml_dump_cli.py,sha256=vRPZ98BBMbLJK4ySbFJJ2nJI-A8XFZROZ7QT6p9lIHk,10312
+armodel/cli/arxml_format_cli.py,sha256=76IBQo6t9fqL1WXjsdoONuX9FSqapb1WuM1yDJobpfM,2004
 armodel/cli/connector2xlsx_cli.py,sha256=bPxJ53znVpluabEbjqN58RX8a9dvlf-cF5o7ncjqTyw,2125
-armodel/cli/connector_update_cli.py,sha256=j8T2N-gxHM6CD5Vb44X24HyuhvXwNDIniUkdJ7Dsluc,2286
+armodel/cli/connector_update_cli.py,sha256=kEySXg4El5Eez6wnSvCugmOsDzdqbTiRzAfX8Fy8E6g,2324
 armodel/cli/memory_section_cli.py,sha256=ky-EJyl74-F8DpIu6uafEFilfblOvEa4HqQyM5HhqyI,2139
-armodel/cli/swc_list_cli.py,sha256=NUyOuIYhXsbSzQl1CjWdgdP83CkeAkXS_kWY4zs-XKU,2414
+armodel/cli/swc_list_cli.py,sha256=TSzKmxjaPZs499jY4WX5pQ4UZ924m5yqmriQbAsvOTY,2403
 armodel/cli/system_signal_cli.py,sha256=4u474E1yd1CGBPiALL-ZXpDatXpUrD6qyXsR-au2yp0,2101
 armodel/data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/data_models/sw_connector.py,sha256=ZU1B3AI84vpSSSpQaGR6CMc3qZGnhbK1Z-SQGvwYA9o,584
 armodel/lib/__init__.py,sha256=5629DkORqTomt16J6VL40o5hFv86-9SRB1240OJWTts,142
 armodel/lib/cli_args_parser.py,sha256=WiTC3wy_fZYloA1AjPqCvvOA_26V_y5toun0qfV51cw,1207
 armodel/lib/data_analyzer.py,sha256=y4ViEGPi_xRKD7hw1ptkGl0_UfhnNdgNzf2YjbOhpjM,1159
-armodel/lib/sw_component.py,sha256=y4ViEGPi_xRKD7hw1ptkGl0_UfhnNdgNzf2YjbOhpjM,1159
-armodel/lib/system_signal.py,sha256=uzII_GM_-kwzvFeDOGD2HrC_gunsmhJPD1xwbVofa7c,1241
-armodel/models/__init__.py,sha256=tdwxgqP9MRC-dnKnf4zIpgv7FrdZrJ3QgkCeOOOBA6E,988
+armodel/lib/sw_component.py,sha256=L4k3iH4i5Z09zeaHxIHjK-xbMH_0PDcOflh4ACJ9WfE,1232
+armodel/lib/system_signal.py,sha256=292yH9yybuCK4GKf7rpECsy27Ds6YRSoYm89yYIKgfw,1352
+armodel/models/__init__.py,sha256=bS1Xj5vu2R_gWy8IE17i4faxmdYdqtsBXphv058Mnyo,1026
 armodel/models/annotation.py,sha256=54XqgKgIzPGRfv3gVCIACKqYt1hUUG6eQDlB06A7xqs,1354
 armodel/models/ar_object.py,sha256=FqCUl0UcQaE7i8VvkmQPmsLsUGFNLPEDMn2aH3CyuNM,5783
 armodel/models/ar_package.py,sha256=EKHzIrsy1q2w6Uso_4-5cQ2xTMMDTSUQ6Q4hp4PieYQ,32070
@@ -26,7 +26,7 @@ armodel/models/communication.py,sha256=CafA0LKVpSpjMQ0UUdC3IcZf6ttBw6yCvqyqxTLWT
 armodel/models/data_def_properties.py,sha256=Mhmucm3k_f12IV5BqH3KlJ5SdmIrlmqnmrQPb5gqamA,470
 armodel/models/data_dictionary.py,sha256=1gbRyvWp5QD0Z-2kxNrqa1qrab5kEZTMcNdWscdmth0,2513
 armodel/models/data_prototype.py,sha256=Sq0nizgUKzc6kG3PKVfIE4e_l4UMsDi2m34tm7TVph4,3622
-armodel/models/datatype.py,sha256=d6yxMhNWbbTtu7tWGDxntWl2nCdiZM636CPxJV328Z8,6259
+armodel/models/datatype.py,sha256=zujOOmC0Di6bD-facMEetPcsuXpwY7AB5Fz0KD4zlrc,6327
 armodel/models/ecuc_parameter_def_template.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/end_to_end_protection.py,sha256=Qvcqy5_eoSD8nFJd2mEee-wLtv7VvyGoPqUHkR2JMfM,3022
 armodel/models/general_structure.py,sha256=NlWnbpSQ1DJwubYkkVs5oxYxJGSRFqLVqtb_yu_WJDI,8893
@@ -59,13 +59,15 @@ armodel/models/fibex/fibex_core/core_communication.py,sha256=Wyoag9k-uLNRSagGX2B
 armodel/models/fibex/fibex_core/core_topology.py,sha256=ZaRivNXDOvdXlW4Z1EIYhzh_BGk87UOHgmc8ZjYegNk,7044
 armodel/models/m2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/m2/autosar_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+armodel/models/m2/autosar_templates/autosar_top_level_structure.py,sha256=ETQNNosMeyLZ9Jgx1YI--5yieyeFK_m538Ii6vzrFyE,4855
 armodel/models/m2/autosar_templates/ecuc_description_template.py,sha256=i3iKNzibMX4BeL95nUbBTLIH8LSHv7TQ3sGsUqQcbhw,9078
 armodel/models/m2/autosar_templates/common_structure/__init__.py,sha256=OHaKJ0UGd_Ni9F11LHMpc8ILTNgxKuJ9QQnuQDSZ_lw,5804
 armodel/models/m2/autosar_templates/common_structure/constants.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/m2/autosar_templates/common_structure/implementation.py,sha256=KbgskqCO1970U4kUGvfnhThf9eh2ruO8Uz_NsU-Sh7I,646
-armodel/models/m2/autosar_templates/common_structure/implementation_data_types.py,sha256=czXitc6bHGvybkGm0yiSKYXj6lTzu2aecVaR7zXeJfA,5503
+armodel/models/m2/autosar_templates/common_structure/implementation_data_types.py,sha256=1Pca5SMQOWOLd-szP7xpc-KbTPUOERrhCYe1DNqi49o,5771
 armodel/models/m2/autosar_templates/generic_structure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/m2/autosar_templates/generic_structure/abstract_structure.py,sha256=Sad_Bt9d1um5zC8T6cRyNhzIDCGDjd48dSO01cH--hg,1948
+armodel/models/m2/autosar_templates/generic_structure/ar_package.py,sha256=94NHRTq_BU1CmoRw0pWEprrhpa_193iqTtYmu5OyevY,27587
 armodel/models/m2/autosar_templates/sw_component_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/m2/autosar_templates/sw_component_template/communication.py,sha256=_Y51VV0nquCBBVA21uzw7zcresFow6857JcvTyfEHJM,11205
 armodel/models/m2/autosar_templates/sw_component_template/port_interface.py,sha256=XRBp3ZuBbFGFs3BWpF5VsjhuGoDgs1sEuJ7IRI6WET4,9249
@@ -75,7 +77,7 @@ armodel/models/m2/autosar_templates/sw_component_template/composition/__init__.p
 armodel/models/m2/autosar_templates/sw_component_template/composition/instance_refs.py,sha256=_djnWMHLGYw2C5bjAgopoqwG3r2IG-d9kMZk4cbXtyY,4889
 armodel/models/m2/autosar_templates/sw_component_template/data_type/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/m2/autosar_templates/sw_component_template/data_type/data_prototypes.py,sha256=tGi_fL8zU1Ewe7rssiKSb_EetkPaGKMVdk0eTBAC-yg,3621
-armodel/models/m2/autosar_templates/sw_component_template/port_interface/__init__.py,sha256=h-EB1vrZrHi0XQuuV0S6AAtXg-Pz7Gjl-2MQqFPvHiE,9955
+armodel/models/m2/autosar_templates/sw_component_template/port_interface/__init__.py,sha256=MHrDO2xbZ3c2guKWapLSoFJs2_qWabPXYYD5Rmkz4G0,9955
 armodel/models/m2/autosar_templates/sw_component_template/port_interface/instance_refs.py,sha256=P-2ST0LTTXk6Fghh2mATPE5-h2pF55YcKW_2eQUQIvA,1332
 armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/__init__.py,sha256=I4BP4XjWbOwafMXWpTUZ4iQ2Liu_HQaDKyLzQ86KqUs,9452
 armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/access_count.py,sha256=o6BLmmYiqc5U5mb7YtzS74U1FIhDDPt1XgJBiib5VkA,460
@@ -101,40 +103,40 @@ armodel/models/system_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 armodel/models/system_template/network_management.py,sha256=ztMxX4zDFBFEiXmR3zne23Lc_rNuaXQbCJS4eL61VZ0,218
 armodel/models/system_template/transport_protocols.py,sha256=en2Pl3eThqDY5DJ7d8sT0vxLwUQsu88Mn7l2VzcHDZg,221
 armodel/parser/__init__.py,sha256=wFcqh5unmDvKvf4R8vWkeertAXwWxAuOOEsbsM4mOHs,78
-armodel/parser/abstract_arxml_parser.py,sha256=9OT6j4W3gRCgwgplQf3d87w7kiJVMYW0ZD71VQpvI_k,10823
-armodel/parser/arxml_parser.py,sha256=Ag8PJnftG0_ME4RGHhjyezZPzZZtyIxT-xjAYRQ08WM,175357
-armodel/parser/connector_xlsx_parser.py,sha256=5KDaHykqL0NszftFG0V5CgmgiRi4Bsg7wJnlRg2pc2k,10087
+armodel/parser/abstract_arxml_parser.py,sha256=vFJ3hc0mI1wXVC_9IFXf9nxFT4y8NacJIGwxI6gHj8E,10861
+armodel/parser/arxml_parser.py,sha256=JXx7Gxc1dejIasi_miyVlrQoQ9jwg4Un5pjYFg5Li_w,175840
+armodel/parser/connector_xlsx_parser.py,sha256=1w-1iIpIgPXTnQUS5mCoJm2lEAktwX2Gg5JaNzxq6Co,10198
 armodel/parser/excel_parser.py,sha256=-Ws0eDvGna9LPQC9T8bgMg3Zq84v04aSuSxZUlZx1Wo,698
 armodel/parser/file_parser.py,sha256=SEPj3YsYdsz8iBvxdeDIs63NC-NQLftoIm4yPoHheEc,1410
 armodel/report/__init__.py,sha256=EId0Ph3qYyzkKHKplJrs00ToxHeSjQVvhLwrSoV-SBw,52
-armodel/report/connector_xls_report.py,sha256=7GsvFWo_lfZRKCLAV-a17kC8-3KKSMAR1wGOnp9Cqlo,3876
+armodel/report/connector_xls_report.py,sha256=y8BXiqDh-r4UYWLl1UQrCu_NqYbjvsjjBLQdBGRIljk,3947
 armodel/report/excel_report.py,sha256=Iome8wALpOFZyZkMCG5DPSAFkfv4pU0y_BZXHVSdonc,1412
 armodel/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/models/test_ar_object.py,sha256=YLuEYmxk4KqmYGef6ru20i838raHgHrwVgnZQwi5_OU,4941
-armodel/tests/test_armodel/models/test_ar_package.py,sha256=amawnatYtITWZAgIvY9WIwvT0to_iFz11Rw77VG0QnU,14808
+armodel/tests/test_armodel/models/test_ar_package.py,sha256=fOqVe5a11sDPLjHwYSgRb0Y9SpWKRW67aLPmDI2Qn8w,14846
 armodel/tests/test_armodel/models/test_ar_ref.py,sha256=h5XVmdZeVv3aqCaefai9MKI9PwE7YNt-FKGnmZJmc58,3519
 armodel/tests/test_armodel/models/test_bsw_module_template.py,sha256=nUMH7t6dJOXdATt8dfEnLotRUhSUQAYpUCianE0F_ao,2071
 armodel/tests/test_armodel/models/test_common_structure.py,sha256=ZPUA8txjwI16Jwxi9rH_5kcR3qQc4hLjdH7ql2iW7s8,3552
 armodel/tests/test_armodel/models/test_data_dictionary.py,sha256=Z_nn9JK7cJOPjst0ih4qj0212LIsHiJ-YUTfJOPEOvw,1106
 armodel/tests/test_armodel/models/test_data_prototype.py,sha256=ev8jFNFVFjkckkZP_dzj4oM49W-8CJJoucQB-0xActk,4259
-armodel/tests/test_armodel/models/test_datatype.py,sha256=hcuCcqmyi5p8-pHho4KnrAKIWiA00dlf-cHhodgPUJI,12035
-armodel/tests/test_armodel/models/test_general_structure.py,sha256=E8kiGQY_2Lj9lUhLNTHzBgu-xnGl8gO3faNueJFeHJE,2220
-armodel/tests/test_armodel/models/test_implementation.py,sha256=RBIuwvVjiSfAmqytZpT53SJd1AJzwHuH0KdAACoZ2Ik,912
+armodel/tests/test_armodel/models/test_datatype.py,sha256=LDi92RzIK9Fzs3T30btodBecpwo-GK_eLTK43Wo1K9E,12034
+armodel/tests/test_armodel/models/test_general_structure.py,sha256=QQKLcarnYDpA56LAdis_rr1PyLtiV-q4YLqfVvN1OIk,2258
+armodel/tests/test_armodel/models/test_implementation.py,sha256=O0H18jgbrRwmnUE5tjrcHwoZ8puI4zNsPqqnAPlwn6E,950
 armodel/tests/test_armodel/models/test_m2_msr.py,sha256=pMWQS4O7FUMrbZcaCR0WF7lYj2m3jvq3AoR4ZbS7Ntg,2650
-armodel/tests/test_armodel/models/test_port_interface.py,sha256=6yD1dOERLv9lnlRUv4JnqJiTWaKnekcYFy2iktOuc4I,9201
+armodel/tests/test_armodel/models/test_port_interface.py,sha256=o6dqy-4tvz3-9qyefR79OwwoYYeDjwPCvM7ahbzXx2w,9239
 armodel/tests/test_armodel/models/test_port_prototype.py,sha256=wV_QjAg4fb9MfeiwDWldzJiHeNpAcZq5vPZ4rWB2Pn0,494
 armodel/tests/test_armodel/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/parser/test_arxml_parser.py,sha256=4-4DKdHIZN50wiM0tzzP-nejY74aEtAWhURwYxDGrWw,747
-armodel/tests/test_armodel/parser/test_parse_bswmd.py,sha256=z7ROVjFFDjk7eIKUwRc1HHUZFIqvSPoTyFAy1IABdC0,10182
-armodel/tests/test_armodel/parser/test_sw_components.py,sha256=OMJ7HEel8TmUEo50Hn3gEc8jdSV0StUOs_ThMENJXGM,4150
+armodel/tests/test_armodel/parser/test_parse_bswmd.py,sha256=hh3R2L6QJOl4N9oY5fmy2REQm0KYpPoyY67tUcxf1PI,10257
+armodel/tests/test_armodel/parser/test_sw_components.py,sha256=Mm8eteRFmVHF2VDvCYoxpMGtoya66-zxdq1ZUz4lvOE,4188
 armodel/writer/__init__.py,sha256=eXr3qhGzFIvHNBin22x-Tk2JM6QwRgx1jwrluDKAlzQ,37
 armodel/writer/abstract_arxml_writer.py,sha256=QoBAlVwt8D7Mpsd5t3Cg0foi-vyLlfaeSOqykn3O9u4,5235
-armodel/writer/arxml_writer.py,sha256=qJ_QgY-cy5y3X0oz1iBwpTPHvJdWz0c1AnYHfDkhxXU,170548
-armodel-1.6.1.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.6.1.dist-info/METADATA,sha256=NrMjj0hjnot7yF6rs0h3rAmCvdgaxtY3BoXvR0EkPIU,10573
-armodel-1.6.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.6.1.dist-info/entry_points.txt,sha256=7n_GwPbHcnqMTnKCnPjjjo3s_uo_vaFrjtZQeDQtHHM,397
-armodel-1.6.1.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.6.1.dist-info/RECORD,,
+armodel/writer/arxml_writer.py,sha256=Zi_L-bRfKs3msa2kIxx_A9xjpa144QGIB8JvWzDDk3k,170625
+armodel-1.6.2.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
+armodel-1.6.2.dist-info/METADATA,sha256=j10Pbt8SKB8z1wZBqpkVKS1iME1y_tdYkTOSGtxpaBQ,10573
+armodel-1.6.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+armodel-1.6.2.dist-info/entry_points.txt,sha256=7n_GwPbHcnqMTnKCnPjjjo3s_uo_vaFrjtZQeDQtHHM,397
+armodel-1.6.2.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
+armodel-1.6.2.dist-info/RECORD,,