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

armodel/tests/test_armodel/models/test_datatype.py

@@ -1,13 +1,13 @@
 import pytest
 
-from .... import AUTOSAR
-from ....models import datatype
-from ....models.common_structure import ImplementationDataTypeElement
-from ....models.data_prototype import ApplicationRecordElement
-from ....models.datatype import AbstractImplementationDataType, ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AtpType, AutosarDataType, BaseType, DataTypeMap, DataTypeMappingSet, ImplementationDataType, ImplementationProps, SymbolProps
+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 .... import AUTOSAR
 class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
     def test_ImplementationProps(self):
         with pytest.raises(NotImplementedError) as err:
@@ -28,7 +28,7 @@ class Test_M2_AUTOSARTemplates_CommonStructure_Implementation:
 
         assert(prototype._parent == ar_root)
         assert(prototype.short_name == "SymbolProps")
-        assert(prototype.symbol == "")
+        assert(prototype.symbol == None)
 
 class Test_M2_MSR_AsamHdo_BaseTypes:
     def test_BaseType(self):
@@ -227,7 +227,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.symbol_props == None)
+        assert(data_type.symbolProps == None)
         assert(data_type._type_emitter == None)
 
         element = data_type.createImplementationDataTypeElement("ImplementationDataTypeElement")

armodel/tests/test_armodel/models/test_port_interface.py

@@ -2,7 +2,7 @@ import pytest
 
 from ....models.ar_package import AUTOSAR
 from ....models.ar_ref import RefType
-from ....models.data_prototype import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+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

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,5 +1,5 @@
 import filecmp
-from ....models.sw_component import CompositionSwComponentType
+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

armodel/writer/abstract_arxml_writer.py

@@ -1,3 +1,4 @@
+import sys
 from abc import ABCMeta
 import re
 from xml.dom import minidom
@@ -111,7 +112,10 @@ class AbstractARXMLWriter:
         return xml
 
     def saveToFile(self, filename, root: ET.Element):
-        xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
+        if sys.version_info <= (3,9):
+            xml = ET.tostring(root, encoding = "UTF-8", short_empty_elements = False)
+        else:
+            xml = ET.tostring(root, encoding = "UTF-8", xml_declaration = True, short_empty_elements = False)
         
         dom = minidom.parseString(xml.decode())
         xml = dom.toprettyxml(indent = "  ", encoding = "UTF-8")

armodel/writer/arxml_writer.py

@@ -2,6 +2,10 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
+from armodel.models.m2.autosar_templates.common_structure.implementation_data_types import ImplementationDataType
+
+
+
 from ..models.m2.msr.data_dictionary.auxillary_objects import SwAddrMethod
 from ..models.m2.msr.data_dictionary.data_def_properties import SwDataDefProps
 from ..models.m2.msr.asam_hdo.units import PhysicalDimension
@@ -9,16 +13,24 @@ from ..models.m2.msr.documentation.block_elements import DocumentationBlock
 from ..models.m2_msr import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
 
 from ..models.m2.autosar_templates.common_structure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
-from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
+from ..models.m2.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.m2.autosar_templates.generic_structure.abstract_structure import AnyInstanceRef
+from ..models.m2.autosar_templates.sw_component_template.components import PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
+from ..models.m2.autosar_templates.sw_component_template.components.instance_refs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior import RunnableEntityArgument, SynchronousServerCallPoint
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.server_call import ServerCallPoint
 from ..models.m2.autosar_templates.sw_component_template.swc_internal_behavior.data_elements import ParameterAccess, VariableAccess
-from ..models.m2.autosar_templates.ecuc_description_template import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.m2.autosar_templates.sw_component_template.composition import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwConnector
+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 PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
 from ..models.m2.autosar_templates.system_template.data_mapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
 from ..models.m2.autosar_templates.system_template import System, SystemMapping
 from ..models.m2.autosar_templates.system_template.network_management import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
 from ..models.m2.autosar_templates.system_template.transport_protocols import CanTpConfig
-from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
+from ..models.m2.autosar_templates.sw_component_template.communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
 
 from ..models.fibex.fibex_4_multiplatform import Gateway, ISignalMapping
 from ..models.fibex.can_communication import CanFrame, CanFrameTriggering, RxIdentifierRange
@@ -33,20 +45,18 @@ from ..models.multilanguage_data import MultiLanguageOverviewParagraph, MultiLan
 from ..models.record_layout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.service_mapping import RoleBasedPortAssignment
 from ..models.service_needs import NvBlockNeeds, RoleBasedDataAssignment
-from ..models.data_prototype import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
+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.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, DataReceivedEvent, EcuAbstractionSwComponentType, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, PortAPIOption, PortGroup, RTEEvent, ServiceDependency, ServiceSwComponentType, SwcModeSwitchEvent, SwcServiceDependency
+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.ar_ref import AnyInstanceRef, ApplicationCompositeElementInPortInterfaceInstanceRef, AutosarParameterRef, AutosarVariableRef, InnerPortGroupInCompositionInstanceRef, POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef, ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef, RefType, VariableDataPrototypeInSystemInstanceRef
+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
 from ..models.communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, BaseTypeDirectDefinition, DataTypeMappingSet, ImplementationDataType, SwBaseType
+from ..models.datatype import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType, BaseTypeDirectDefinition, DataTypeMappingSet, SwBaseType
 from ..models.general_structure import ARElement, AdminData, Identifiable, Limit, MultilanguageReferrable, Referrable, Sdg, SwcBswMapping, SwcBswRunnableMapping
 
-from ..models.port_prototype import PPortPrototype, PortPrototype, RPortPrototype
-from ..models.sw_component import AssemblySwConnector, CompositionSwComponentType, DelegationSwConnector, SwComponentPrototype, SwComponentType, SwConnector
 from ..models.annotation import Annotation
 from ..models.end_to_end_protection import EndToEndDescription, EndToEndProtection, EndToEndProtectionSet, EndToEndProtectionVariablePrototype
 from ..models.m2.autosar_templates.sw_component_template.port_interface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, PortInterface, SenderReceiverInterface, TriggerInterface
@@ -331,7 +341,14 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeClientComSpec")
         child_element = ET.SubElement(element, "CLIENT-COM-SPEC")
         self.setARObjectAttributes(child_element, com_spec)
-        self.setChildElementOptionalRefType(child_element, "OPERATION-REF", com_spec.operationRef)
+        self.setChildElementOptionalRefType(child_element, "OPERATION-REF", com_spec.getOperationRef())
+
+    def writeParameterRequireComSpec(self, element: ET.Element, com_spec: ParameterRequireComSpec):
+        self.logger.debug("writeParameterRequireComSpec")
+        child_element = ET.SubElement(element, "PARAMETER-REQUIRE-COM-SPEC")
+        self.setARObjectAttributes(child_element, com_spec)
+        self.setChildElementOptionalRefType(child_element, "PARAMETER-REF", com_spec.parameter_ref)
+        self.setInitValue(child_element, com_spec.init_value)
 
     def writeModeSwitchReceiverComSpec(self, element: ET.Element, com_spec: ModeSwitchReceiverComSpec):
         self.logger.debug("writeModeSwitchReceiverComSpec")
@@ -348,6 +365,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeClientComSpec(element, com_spec)
         elif isinstance(com_spec, ModeSwitchReceiverComSpec):
             self.writeModeSwitchReceiverComSpec(element, com_spec)
+        elif isinstance(com_spec, ParameterRequireComSpec):
+            self.writeParameterRequireComSpec(element, com_spec)
         else:
             raise ValueError("Unsupported RPortComSpec %s" % type(com_spec))
     
@@ -363,7 +382,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             for com_spec in com_specs:
                 self.writePPortComSpec(com_specs_tag, com_spec)
 
-        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.provided_interface_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.getProvidedInterfaceTRef())
 
     def writeRPortPrototype(self, ports_tag: ET.Element, prototype: RPortPrototype):
         self.logger.debug("writeRPortPrototype %s" % prototype.short_name)
@@ -374,7 +393,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             com_specs_tag = ET.SubElement(prototype_tag, "REQUIRED-COM-SPECS")
             for com_spec in com_specs:
                 self.writeRPortComSpec(com_specs_tag, com_spec)
-        self.setChildElementOptionalRefType(prototype_tag, "REQUIRED-INTERFACE-TREF", prototype.required_interface_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "REQUIRED-INTERFACE-TREF", prototype.getRequiredInterfaceTRef())
     
     def writePortPrototypes(self, ports_tag: ET.Element, port_prototypes: List[PortPrototype]):
         for port_prototype in port_prototypes:
@@ -387,8 +406,8 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def writeInnerGroupIRef(self, element: ET.Element, inner_group_iref: InnerPortGroupInCompositionInstanceRef):
         child_element = ET.SubElement(element, "INNER-GROUP-IREF")
-        self.setChildElementOptionalRefType(child_element, "CONTEXT-REF", inner_group_iref.contextRef)
-        self.setChildElementOptionalRefType(child_element, "TARGET-REF", inner_group_iref.targetRef)
+        #self.setChildElementOptionalRefType(child_element, "CONTEXT-REF", inner_group_iref.contextRef)
+        self.setChildElementOptionalRefType(child_element, "TARGET-REF", inner_group_iref.getTargetRef())
 
     def writePortGroupInnerGroupIRefs(self, element: ET.Element, parent: PortGroup):
         irefs = parent.getInnerGroupIRefs()
@@ -430,48 +449,53 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeSwComponentPrototype(self, element: ET.Element, prototype: SwComponentPrototype):
         prototype_tag = ET.SubElement(element, "SW-COMPONENT-PROTOTYPE")
         self.setIdentifiable(prototype_tag, prototype)
-        self.setChildElementOptionalRefType(prototype_tag, "TYPE-TREF", prototype.type_tref)
+        self.setChildElementOptionalRefType(prototype_tag, "TYPE-TREF", prototype.getTypeTRef())
 
     def writeSwComponentPrototypes(self, element: ET.Element, sw_component: CompositionSwComponentType):
-        components_tag = ET.SubElement(element, "COMPONENTS")
-        for prototype in sw_component.getSwComponentPrototypes():
+        prototypes = sw_component.getSwComponentPrototypes()
+        if len(prototypes) > 0:
+            components_tag = ET.SubElement(element, "COMPONENTS")
+        for prototype in prototypes:
             self.writeSwComponentPrototype(components_tag, prototype)
 
     def writeAssemblySwConnector(self, element: ET.Element, sw_connector: AssemblySwConnector):
         connector_tag = ET.SubElement(element, "ASSEMBLY-SW-CONNECTOR")
         self.setIdentifiable(connector_tag, sw_connector)
 
-        if sw_connector.provider_iref is not None:
+        if sw_connector.getProviderIRef() is not None:
             provider_iref_tag = ET.SubElement(connector_tag, "PROVIDER-IREF")
-            self.setARObjectAttributes(provider_iref_tag, sw_connector.provider_iref)
-            self.setChildElementOptionalRefType(provider_iref_tag, "CONTEXT-COMPONENT-REF", sw_connector.provider_iref.context_component_ref)
-            self.setChildElementOptionalRefType(provider_iref_tag, "TARGET-P-PORT-REF", sw_connector.provider_iref.target_p_port_ref)
+            provider_iref = sw_connector.getProviderIRef()
+            self.setARObjectAttributes(provider_iref_tag, provider_iref)
+            self.setChildElementOptionalRefType(provider_iref_tag, "CONTEXT-COMPONENT-REF", provider_iref.getContextComponentRef())
+            self.setChildElementOptionalRefType(provider_iref_tag, "TARGET-P-PORT-REF", provider_iref.getTargetPPortRef())
 
-        if sw_connector.requester_iref is not None:
+        if sw_connector.getRequesterIRef() is not None:
             requester_iref_tag = ET.SubElement(connector_tag, "REQUESTER-IREF")
-            self.setARObjectAttributes(requester_iref_tag, sw_connector.requester_iref)
-            self.setChildElementOptionalRefType(requester_iref_tag, "CONTEXT-COMPONENT-REF", sw_connector.requester_iref.context_component_ref)
-            self.setChildElementOptionalRefType(requester_iref_tag, "TARGET-R-PORT-REF", sw_connector.requester_iref.target_r_port_ref)
+            requester_iref = sw_connector.getRequesterIRef()
+            self.setARObjectAttributes(requester_iref_tag, requester_iref)
+            self.setChildElementOptionalRefType(requester_iref_tag, "CONTEXT-COMPONENT-REF", requester_iref.getContextComponentRef())
+            self.setChildElementOptionalRefType(requester_iref_tag, "TARGET-R-PORT-REF", requester_iref.getTargetRPortRef())
 
     def writeDelegationSwConnector(self, element: ET.Element, sw_connector: DelegationSwConnector):
         connector_tag = ET.SubElement(element, "DELEGATION-SW-CONNECTOR")
         self.setIdentifiable(connector_tag, sw_connector)
 
-        if sw_connector.inner_port_iref is not None:
+        if sw_connector.getInnerPortIRref() is not None:
             inner_port_iref_tag = ET.SubElement(connector_tag, "INNER-PORT-IREF")
-            if isinstance(sw_connector.inner_port_iref, PPortInCompositionInstanceRef):
+            inner_port_iref = sw_connector.getInnerPortIRref()
+            if isinstance(inner_port_iref, PPortInCompositionInstanceRef):
                 instance_ref_tag = ET.SubElement(inner_port_iref_tag, "P-PORT-IN-COMPOSITION-INSTANCE-REF")
-                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", sw_connector.inner_port_iref.context_component_ref)
-                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-P-PORT-REF", sw_connector.inner_port_iref.target_p_port_ref)
-            elif isinstance(sw_connector.inner_port_iref, RPortInCompositionInstanceRef):
+                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", inner_port_iref.getContextComponentRef())
+                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-P-PORT-REF", inner_port_iref.getTargetPPortRef())
+            elif isinstance(inner_port_iref, RPortInCompositionInstanceRef):
                 instance_ref_tag = ET.SubElement(inner_port_iref_tag, "R-PORT-IN-COMPOSITION-INSTANCE-REF")
-                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", sw_connector.inner_port_iref.context_component_ref)
-                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-R-PORT-REF", sw_connector.inner_port_iref.target_r_port_ref)
+                self.setChildElementOptionalRefType(instance_ref_tag, "CONTEXT-COMPONENT-REF", inner_port_iref.getContextComponentRef())
+                self.setChildElementOptionalRefType(instance_ref_tag, "TARGET-R-PORT-REF", inner_port_iref.getTargetRPortRef())
             else:
-                self._raiseError("Invalid inner port of DelegationSwConnector <%s>" % sw_connector.short_name)
+                self._raiseError("Invalid inner port of DelegationSwConnector <%s>" % sw_connector.getShortName())
 
-        if sw_connector.outer_port_ref is not None:
-            self.setChildElementOptionalRefType(connector_tag, "OUTER-PORT-REF", sw_connector.outer_port_ref)
+        if sw_connector.getOuterPortRef() is not None:
+            self.setChildElementOptionalRefType(connector_tag, "OUTER-PORT-REF", sw_connector.getOuterPortRef())
             #self.writeChildOptionalRefElement(requester_iref_tag, "TARGET-R-PORT-REF", sw_connector.requester_iref.target_r_port_ref)
         
     def writeSwConnector(self, element: ET.Element, sw_connector: SwConnector):
@@ -486,8 +510,13 @@ class ARXMLWriter(AbstractARXMLWriter):
         sw_connectors = sw_component.getSwConnectors()
         if len(sw_connectors) > 0:
             connectors_tag = ET.SubElement(element, "CONNECTORS")
+            # Change the implementation to compatible with AUTOSAR builder
             for sw_connector in sw_connectors:
                 self.writeSwConnector(connectors_tag, sw_connector)
+            #for sw_connector in sw_component.getAssemblySwConnectors():
+            #    self.writeSwConnector(connectors_tag, sw_connector)
+            #for sw_connector in sw_component.getDelegationSwConnectors():
+            #    self.writeSwConnector(connectors_tag, sw_connector)
 
     def writeCompositionSwComponentTypeDataTypeMappingSet(self, element: ET.Element, parent: CompositionSwComponentType):
         data_type_mappings = parent.getDataTypeMappings()
@@ -691,6 +720,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         for compu_scale in compu_scales.getCompuScales():
             child_element = ET.SubElement(compu_scales_tag, "COMPU-SCALE")
             self.setARObjectAttributes(child_element, compu_scale)
+            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", compu_scale.short_label)
             self.setChildElementOptionalLiteral(child_element, "SYMBOL", compu_scale.symbol)
             self.writeChildLimitElement(child_element, "LOWER-LIMIT", compu_scale.lowerLimit)
             self.writeChildLimitElement(child_element, "UPPER-LIMIT", compu_scale.upperLimit)
@@ -1416,9 +1446,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeSenderReceiverInterface %s" % sr_interface.short_name)
         child_element = ET.SubElement(element, "SENDER-RECEIVER-INTERFACE")
         self.setIdentifiable(child_element, sr_interface)
-        self.setChildElementOptionalBooleanValue(child_element, "IS-SERVICE", sr_interface.isService)
+        self.setChildElementOptionalBooleanValue(child_element, "IS-SERVICE", sr_interface.getIsService())
         self.writeSenderReceiverInterfaceDataElements(child_element, sr_interface)
-        self.writeSenderReceiverInterfaceInvalidationPolicies(child_element, sr_interface)
 
     def writerBswModuleDescriptionImplementedEntry(self, element: ET.Element, desc: BswModuleDescription):
         entries = desc.getImplementedEntries()
@@ -1651,7 +1680,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setIdentifiable(child_element, type_element)
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE", type_element.getArraySize())
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE-SEMANTICS", type_element.getArraySizeSemantics())
-                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", type_element.swDataDefProps)
+                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", type_element.getSwDataDefProps())
 
     def writeImplementationDataType(self, element: ET.Element, data_type: ImplementationDataType):
         self.logger.debug("writeImplementationDataType %s" % data_type.short_name)
@@ -1670,6 +1699,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", prototype.swDataDefProps)
                 self.setChildElementOptionalRefType(child_element, "TYPE-TREF", prototype.typeTRef)
                 self.setChildElementOptionalLiteral(child_element, "DIRECTION", prototype.direction)
+                self.setChildElementOptionalLiteral(child_element, "SERVER-ARGUMENT-IMPL-POLICY", prototype.server_argument_impl_policy)
 
     def writePossibleErrorRefs(self, element: ET.Element, parent: ClientServerOperation):
         error_refs = parent.getPossbileErrorRefs()
@@ -2565,26 +2595,6 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeGateway(element, ar_element)
         elif isinstance(ar_element, ISignal):
             self.writeISignal(element, ar_element)
-        elif isinstance(ar_element, EcucValueCollection):
-            self.writeEcucValueCollection(element, ar_element)
-        elif isinstance(ar_element, EcucModuleConfigurationValues):
-            self.writeEcucModuleConfigurationValues(element, ar_element)
-        elif isinstance(ar_element, ISignalGroup):
-            self.writeISignalGroup(element, ar_element)
-        elif isinstance(ar_element, ISignalIPduGroup):
-            self.writeISignalIPduGroup(element, ar_element)
-        elif isinstance(ar_element, SystemSignal):
-            self.writeSystemSignal(element, ar_element)
-        elif isinstance(ar_element, ISignalIPdu):
-            self.writeISignalIPdu(element, ar_element)
-        elif isinstance(ar_element, EcuInstance):
-            self.writeEcuInstance(element, ar_element)
-        elif isinstance(ar_element, SystemSignalGroup):
-            self.writeSystemSignalGroup(element, ar_element)
-        elif isinstance(ar_element, System):
-            self.writeSystem(element, ar_element)
-        elif isinstance(ar_element, PhysicalDimension):
-            self.writePhysicalDimension(element, ar_element)
         else:
             raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
         

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.6.0
+Version: 1.6.1
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -349,4 +349,8 @@ Fix the attribute intervalType of **Limit** is empty issue.
    * MODE-SWITCH-POINTS
  4. Create the CLI (armodel-system-signal) to list all the system signals
 
+**Version 1.6.1**
+
+1. Organize the armodel package.
+2. Add the Get/Set method for several class.
 

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

@@ -8,42 +8,42 @@ armodel/cli/memory_section_cli.py,sha256=ky-EJyl74-F8DpIu6uafEFilfblOvEa4HqQyM5H
 armodel/cli/swc_list_cli.py,sha256=NUyOuIYhXsbSzQl1CjWdgdP83CkeAkXS_kWY4zs-XKU,2414
 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=Eiw848Qs0L3-85cF7uj5IXcudOks2rVU5-CVz-v-cm8,590
+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=mcOzVaFdeftKJZsKey98i1zGfkqoU8Y6NyBxyrIWGxg,793
+armodel/models/__init__.py,sha256=tdwxgqP9MRC-dnKnf4zIpgv7FrdZrJ3QgkCeOOOBA6E,988
 armodel/models/annotation.py,sha256=54XqgKgIzPGRfv3gVCIACKqYt1hUUG6eQDlB06A7xqs,1354
-armodel/models/ar_object.py,sha256=mC-HZEpX3kVUTkvrMPZajg18NLVlXo4cJ36VzCTCiVY,5781
-armodel/models/ar_package.py,sha256=EzTdrm8MADOyL1sC3ByyrtHrjE26WBz9HM6C6psoOs4,31276
-armodel/models/ar_ref.py,sha256=v3OXxJ90zasN7ihZyBrzmk6OgT_ilmbtHNUg5BSwH2A,8300
+armodel/models/ar_object.py,sha256=FqCUl0UcQaE7i8VvkmQPmsLsUGFNLPEDMn2aH3CyuNM,5783
+armodel/models/ar_package.py,sha256=EKHzIrsy1q2w6Uso_4-5cQ2xTMMDTSUQ6Q4hp4PieYQ,32070
+armodel/models/ar_ref.py,sha256=fTt32OxTy-edQqw_WTPnp1y6UAiPhAtxr4BV07rkSzw,488
 armodel/models/bsw_module_template.py,sha256=5qyqhKyyzMrTzwarCWRM8nqjp55MNqBtxFstD7VMzTY,16292
 armodel/models/calibration.py,sha256=aSIVenVmlYKW5kQmaLTiy7kJcSe6yrvCfN8kO03Wk6Q,4087
-armodel/models/common_structure.py,sha256=Qak8KRgVbw3FkwbPgc7UV80MyBMzffUtSVk1AV9QwJ4,11741
-armodel/models/communication.py,sha256=VaBOsNgEtfvKADuleTE6FEJjKf2rUg1OxN3HIp9Jg5o,628
+armodel/models/common_structure.py,sha256=22SCULP1BFZ5G6ik9_sWgk_VpEUzz3bLq8RJX3l1k9o,9324
+armodel/models/communication.py,sha256=CafA0LKVpSpjMQ0UUdC3IcZf6ttBw6yCvqyqxTLWTXo,693
 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=VH-rLiyjKJRVyCPt82mTwo5VQrqNX6-X_bo_PUDqa4Q,8770
+armodel/models/datatype.py,sha256=d6yxMhNWbbTtu7tWGDxntWl2nCdiZM636CPxJV328Z8,6259
 armodel/models/ecuc_parameter_def_template.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/end_to_end_protection.py,sha256=Sna3HSsukFHTBj72jWXd3fRvJTEESK1wnKo_KXD5itE,2978
-armodel/models/general_structure.py,sha256=CjAeZdhlk19petpdgP-_rTc0Eu2R4AHb2Wu3NfkV94w,8659
+armodel/models/end_to_end_protection.py,sha256=Qvcqy5_eoSD8nFJd2mEee-wLtv7VvyGoPqUHkR2JMfM,3022
+armodel/models/general_structure.py,sha256=NlWnbpSQ1DJwubYkkVs5oxYxJGSRFqLVqtb_yu_WJDI,8893
 armodel/models/global_constraints.py,sha256=fBCzYaZ55SDG7shneE8dNgFm_QQxPRUUPvzIWBlNKHY,1301
 armodel/models/implementation.py,sha256=bZB1GVU-5VCsx0xATj-0XNlvMuq-pVQ2zAVN-BEy2UU,5631
-armodel/models/internal_behavior.py,sha256=FS49y0iPiG77uM-JiWYPyXkE7OP27UvOMttyNe8Jf3c,2444
-armodel/models/m2_msr.py,sha256=gEaOEDsX_ZeZtcu2as5BAnBR5GjlABDY9K0bsNhG2WU,5061
+armodel/models/internal_behavior.py,sha256=VwrA1iqsYlHK3N_tKtn85ErUKaGq2GHtys0TlVPiWds,2498
+armodel/models/m2_msr.py,sha256=6xEq67DohruwiQFYLSVxo9kW6qPweyDWUOyy6-4pAaQ,5128
 armodel/models/mode_declaration.py,sha256=YuZjSv3Iu6bdchdZLCp-iNYsSBC0dcF_mJ65ScfjGSs,240
 armodel/models/multilanguage_data.py,sha256=fCJAveAXMJQp5-Ndwqz6ti2-RVtMoZuWZJ6A55eWBQQ,1288
 armodel/models/per_instance_memory.py,sha256=KBqRZyi-FtQx25w5mlUjJbI00ZlZdPPgIeDlaIMUTgY,1188
 armodel/models/port_interface.py,sha256=h1quoa4LRhEC7aGKIUs8bbHeGTQ5vbDkC7AwUUD6U1E,7257
-armodel/models/port_prototype.py,sha256=FQ5viIDNnJ1lEQ4IcNEkeB0q7rtrJJ-zrWm5hEEoAL4,4307
+armodel/models/port_prototype.py,sha256=ZFjdo7Qlo9rFEO4ihyqoDfv_ttJ1IZMK7au5gxArXTc,413
 armodel/models/record_layout.py,sha256=6ZRzRZr89EUanrYaSGjj_UhlVHewneI3NLglqjL_KzU,4554
 armodel/models/rpt_scenario.py,sha256=WJ47kJE5BfQYKI8hHbL5TGg4mNX0xmjpToXCIwC-pNo,565
 armodel/models/service_mapping.py,sha256=cDmXPaWVnCJ0M9Bkdk_KZvkyCfMQS35ADuFPPACzm70,279
-armodel/models/service_needs.py,sha256=W9dsu2Z9oIPXYJab7sFht3lY7QPe0ozHMQNhrvBX1ec,2553
-armodel/models/sw_component.py,sha256=wLIMH7KbjxXLogeZCc2F6tuwGOptOyvRvchuvBjgm7k,23454
+armodel/models/service_needs.py,sha256=cB8X7gXsuVKREf6sMFKPW95tctSiFZwaM8j6jd6III8,2653
+armodel/models/sw_component.py,sha256=fyWy11QXok7tb9Ng5zjJxzijhU1JqNxhWG-JOW5YY-Q,17105
 armodel/models/timing.py,sha256=7XQQli9Dxd6A5-F6NFcGOnEJ-W2y0kYBE3X0bbNdf1A,3289
 armodel/models/unit.py,sha256=uTAHK2LzmQimlQKcWFFrFJJhYAcAlOcsMtvLEQ42EE8,397
 armodel/models/fibex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,22 +59,34 @@ 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/ecuc_description_template.py,sha256=tJ89Gjl9obJZ3ydAqbLcFNWwmIWwG_Md2EHpqACcBiY,9009
+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/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/sw_component_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/m2/autosar_templates/sw_component_template/communication.py,sha256=HYSlbD-hnIInLQM3_Cm2pR_3tEZIO7j7OLsTaJ_njFM,9970
+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
-armodel/models/m2/autosar_templates/sw_component_template/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/m2/autosar_templates/sw_component_template/components/instance_refs.py,sha256=Qcx9Fv7K-claBef50DF30fF15zsTzbBsSypD-SrM3s8,4810
+armodel/models/m2/autosar_templates/sw_component_template/components/__init__.py,sha256=dx6AExOZvsVw6--aueCxNsqZ57PdHaXdPEJCjGeV0_E,9945
+armodel/models/m2/autosar_templates/sw_component_template/components/instance_refs.py,sha256=0eLTmX08Qda7AT3mePELoo-o2IaVRTs_P6p9alJTIAo,5712
+armodel/models/m2/autosar_templates/sw_component_template/composition/__init__.py,sha256=aOE1VA4UfLfA-3xZnDKogBAdQQ4u5SNAq4bybViUY4g,5968
+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/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
-armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/data_elements.py,sha256=WlZ05n4Fjk-P4AWA2NduZ0tgGQxbtpVkkLdM7HErdsE,1806
-armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/mode_declaration_group.py,sha256=zKoCLnmSUPboqNbAvXxMdWT-W9ciX8cjGdFyCZra3GM,1235
-armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/server_call.py,sha256=Gj4dkDk21AiSJCnUdqViIMEb5ypCSCs0AH5a7jOYt8w,787
+armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/data_elements.py,sha256=hHuSHdS2dCpy9XpSq-2WCvj8fbOtBiU4xwHdb8mR5GU,1612
+armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/instance_refs_usage.py,sha256=Btx00UnxqF_2Cfih9KwZc39403OemMSaqVFqNtNUtSI,5598
+armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/mode_declaration_group.py,sha256=_u9bQ4tuZ5_dW29dNIVYmEkFWFwfCBycjH_4sgmaLFM,1210
+armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/server_call.py,sha256=0sFJoX_Mu_S3AZ7EFMyuVEUmo4Md5O0SSf_eJO0Y1BE,814
 armodel/models/m2/autosar_templates/sw_component_template/swc_internal_behavior/trigger.py,sha256=Cwklr56BunDgNEhlge6k2cbudTM2rEt0ka82VSL3a-4,286
 armodel/models/m2/autosar_templates/system_template/__init__.py,sha256=gHp7PG7rcf4g6B0QtQwDooP6K7IrD3ZkP4YEYkPe6l0,10443
 armodel/models/m2/autosar_templates/system_template/data_mapping.py,sha256=wwyRA840YUcfKkeZREqlh2pqOC6unSqPnS7bI0HM9eg,2479
+armodel/models/m2/autosar_templates/system_template/instance_refs.py,sha256=wSrg0gBCZwjBp0mC8b6YmEEnXWBFRrEj0JITzO39gPs,1603
 armodel/models/m2/autosar_templates/system_template/network_management.py,sha256=bIllBikQdg9pDI43Dq6U3Pmn4W7grHlOUhVamnLWYYg,17061
 armodel/models/m2/autosar_templates/system_template/transport_protocols.py,sha256=yHipIJ6z5BBSI8YRCwk0x4ub84PkhGIRxfqFznvqRk8,244
 armodel/models/m2/msr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -88,11 +100,12 @@ armodel/models/m2/msr/documentation/block_elements.py,sha256=NjarQwu756rTDHVHCHA
 armodel/models/system_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=whzCLvAstuSlm6scgcCId7AUxSX8z8PV8AIKSNWMkGo,37
+armodel/parser/__init__.py,sha256=wFcqh5unmDvKvf4R8vWkeertAXwWxAuOOEsbsM4mOHs,78
 armodel/parser/abstract_arxml_parser.py,sha256=9OT6j4W3gRCgwgplQf3d87w7kiJVMYW0ZD71VQpvI_k,10823
-armodel/parser/arxml_parser.py,sha256=ra7S5pi1xMQyeeJdogOWsOnFwHo-y4vk0DAcgAhCDts,170648
+armodel/parser/arxml_parser.py,sha256=Ag8PJnftG0_ME4RGHhjyezZPzZZtyIxT-xjAYRQ08WM,175357
 armodel/parser/connector_xlsx_parser.py,sha256=5KDaHykqL0NszftFG0V5CgmgiRi4Bsg7wJnlRg2pc2k,10087
 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/excel_report.py,sha256=Iome8wALpOFZyZkMCG5DPSAFkfv4pU0y_BZXHVSdonc,1412
@@ -100,28 +113,28 @@ 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=R6-UDCMvw4C4NO3VvQ3KSnlBmSzPbfO1Cpbdy4EzaOM,14566
-armodel/tests/test_armodel/models/test_ar_ref.py,sha256=LijRdytwSg0U4JbypVTTNSLkY8AVAdLhnDh8PEAe4sU,3252
+armodel/tests/test_armodel/models/test_ar_package.py,sha256=amawnatYtITWZAgIvY9WIwvT0to_iFz11Rw77VG0QnU,14808
+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=1JaR1epyXea2hXHTLESLNccokDfqfhQCG1wPdzLuMhc,3447
+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=LMfu_oqmMHiWvSLzdC_KozneheymbYh-V0RLWHuJaPk,4205
-armodel/tests/test_armodel/models/test_datatype.py,sha256=n9_bQXMLRgz3C_NEqhRqWiPnhcGrFgQLFsdW-gVuhCs,11815
+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_m2_msr.py,sha256=pMWQS4O7FUMrbZcaCR0WF7lYj2m3jvq3AoR4ZbS7Ntg,2650
-armodel/tests/test_armodel/models/test_port_interface.py,sha256=6kczQnOFgYwyoDHRHLa-fs-cFX69safceazak4lrqxc,9147
+armodel/tests/test_armodel/models/test_port_interface.py,sha256=6yD1dOERLv9lnlRUv4JnqJiTWaKnekcYFy2iktOuc4I,9201
 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=U8cwXGPR13ruoH8jBlWLLKuNIpG34DAZ1Vl2XXN-QNM,4108
+armodel/tests/test_armodel/parser/test_sw_components.py,sha256=OMJ7HEel8TmUEo50Hn3gEc8jdSV0StUOs_ThMENJXGM,4150
 armodel/writer/__init__.py,sha256=eXr3qhGzFIvHNBin22x-Tk2JM6QwRgx1jwrluDKAlzQ,37
-armodel/writer/abstract_arxml_writer.py,sha256=WUE8dIvoMagb9P-2JpdbY5aRg0Ub10N9ncvD8E03AFA,5078
-armodel/writer/arxml_writer.py,sha256=SDdA9ejb07HWKmSjESlJiBmNxK-PkyG1rcuq2WkTz5c,169527
-armodel-1.6.0.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.6.0.dist-info/METADATA,sha256=I5GoD0qcKRHqR71okee_dMqiAtb6N_JnS7mwQukbNlo,10472
-armodel-1.6.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.6.0.dist-info/entry_points.txt,sha256=7n_GwPbHcnqMTnKCnPjjjo3s_uo_vaFrjtZQeDQtHHM,397
-armodel-1.6.0.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.6.0.dist-info/RECORD,,
+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,,