armodel 1.8.4__py3-none-any.whl → 1.8.6__py3-none-any.whl

armodel/tests/test_armodel/models/test_port_interface.py

@@ -1,21 +1,19 @@
 import pytest
 
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import PackageableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype, DataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import VariableDataPrototype
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ArgumentDataPrototype, ClientServerInterface, ClientServerOperation, DataInterface, NvDataInterface, ParameterInterface, PortInterface, SenderReceiverInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ArgumentDataPrototype, ClientServerInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerOperation, DataInterface, NvDataInterface
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ParameterInterface, PortInterface, SenderReceiverInterface
 
 
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
@@ -125,8 +123,8 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
 
         assert (prototype.getParent() == ar_root)
         assert (prototype.getShortName() == "ArgumentDataPrototype")
-        assert (prototype.getDirection() == None)
-        assert (prototype.getServerArgumentImplPolicy() == None)
+        assert (prototype.getDirection() is None)
+        assert (prototype.getServerArgumentImplPolicy() is None)
 
     def test_ApplicationError(self):
         document = AUTOSAR.getInstance()
@@ -155,7 +153,8 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_PortInterface:
         assert (isinstance(operation, ClientServerOperation))
         assert (operation.short_name == "client_server_operation")
 
-        prototype = operation.createArgumentDataPrototype("argument_data_prototype1")
+        prototype = operation.createArgumentDataPrototype(
+            "argument_data_prototype1")
         assert (prototype.short_name == "argument_data_prototype1")
 
         assert (len(operation.getArguments()) == 1)

armodel/tests/test_armodel/models/test_port_prototype.py

@@ -2,13 +2,14 @@ import pytest
 
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import PPortComSpec, RPortComSpec
 
-class Test_PortProtype:
+
+class Test_PortPrototype:
     def test_PPortComSpec(self):
         with pytest.raises(NotImplementedError) as err:
             PPortComSpec()
-        assert(str(err.value) == "PPortComSpec is an abstract class.")
+        assert (str(err.value) == "PPortComSpec is an abstract class.")
 
     def test_RPortComSpec(self):
         with pytest.raises(NotImplementedError) as err:
             RPortComSpec()
-        assert(str(err.value) == "RPortComSpec is an abstract class.")
+        assert (str(err.value) == "RPortComSpec is an abstract class.")

armodel/tests/test_armodel/parser/test_sw_components.py

@@ -1,11 +1,13 @@
 import filecmp
+import xml.etree.ElementTree as ET
 
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import SwcInternalBehavior
 from ....models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
 from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType, CompositionSwComponentType
 from ....writer.arxml_writer import ARXMLWriter
 from ....parser.arxml_parser import ARXMLParser
-from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
+from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR, AUTOSARDoc
 
 
 class TestSWComponents:
@@ -372,3 +374,111 @@ class TestSWComponents:
 
         assert (filecmp.cmp("test_files/AUTOSAR_MOD_AISpecification_DataConstr_LifeCycle_Standard.arxml",
                             "data/generated_AUTOSAR_MOD_AISpecification_DataConstr_LifeCycle_Standard.arxml", shallow=False) is True)
+
+
+class TestSwComponentsWithSameName:
+    def test_read_same_package_and_sw_component_name(self):
+        parser = ARXMLParser()
+        parser.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
+        xml_content = """
+            <AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_00049.xsd" T="2025-05-08T10:56:35+03:00">
+                <AR-PACKAGES>
+                    <AR-PACKAGE>
+                        <SHORT-NAME>Components</SHORT-NAME>
+                        <ELEMENTS>
+                            <APPLICATION-SW-COMPONENT-TYPE T="2025-05-08T21:49:46+03:00">
+                            <SHORT-NAME>DUPLICATE_NAME</SHORT-NAME>
+                            <INTERNAL-BEHAVIORS>
+                                <SWC-INTERNAL-BEHAVIOR T="2025-06-13T08:49:08+03:00">
+                                <SHORT-NAME>DUPLICATE_NAME</SHORT-NAME>
+                                <RUNNABLES>
+                                    <RUNNABLE-ENTITY T="2025-06-13T08:49:24+03:00">
+                                    <SHORT-NAME>RunnableInit</SHORT-NAME>
+                                    <MINIMUM-START-INTERVAL>0.0</MINIMUM-START-INTERVAL>
+                                    <CAN-BE-INVOKED-CONCURRENTLY>false</CAN-BE-INVOKED-CONCURRENTLY>
+                                    <SYMBOL>RunnableInit</SYMBOL>
+                                    </RUNNABLE-ENTITY>
+                                </RUNNABLES>
+                                </SWC-INTERNAL-BEHAVIOR>
+                            </INTERNAL-BEHAVIORS>
+                            </APPLICATION-SW-COMPONENT-TYPE>
+                        </ELEMENTS>
+                        <AR-PACKAGES>
+                            <AR-PACKAGE>
+                                <SHORT-NAME>DUPLICATE_NAME</SHORT-NAME>
+                            </AR-PACKAGE>
+                            <AR-PACKAGE>
+                                <SHORT-NAME>NewPackage</SHORT-NAME>
+                            </AR-PACKAGE>
+                        </AR-PACKAGES>
+                    </AR-PACKAGE>
+                    <AR-PACKAGE>
+                        <SHORT-NAME>Implementation</SHORT-NAME>
+                        <ELEMENTS>
+                        <SW-ADDR-METHOD>
+                        <SHORT-NAME>CODE</SHORT-NAME>
+                        <MEMORY-ALLOCATION-KEYWORD-POLICY>ADDR-METHOD-SHORT-NAME</MEMORY-ALLOCATION-KEYWORD-POLICY>
+                        <SECTION-TYPE>CODE</SECTION-TYPE>
+                        </SW-ADDR-METHOD>
+                        <SWC-IMPLEMENTATION>
+                        <SHORT-NAME>DUPLICATE_NAME</SHORT-NAME>
+                        <CODE-DESCRIPTORS>
+                            <CODE>
+                            <SHORT-NAME>CODE</SHORT-NAME>
+                            <ARTIFACT-DESCRIPTORS>
+                                <AUTOSAR-ENGINEERING-OBJECT>
+                                <SHORT-LABEL>CODE</SHORT-LABEL>
+                                <CATEGORY>SWSRC</CATEGORY>
+                                </AUTOSAR-ENGINEERING-OBJECT>
+                            </ARTIFACT-DESCRIPTORS>
+                            </CODE>
+                        </CODE-DESCRIPTORS>
+                        <PROGRAMMING-LANGUAGE>C</PROGRAMMING-LANGUAGE>
+                        <RESOURCE-CONSUMPTION>
+                            <SHORT-NAME>ResourceConsumption</SHORT-NAME>
+                            <MEMORY-SECTIONS>
+                                <MEMORY-SECTION>
+                                    <SHORT-NAME>CODE</SHORT-NAME>
+                                    <SIZE>0</SIZE>
+                                    <SW-ADDRMETHOD-REF DEST="SW-ADDR-METHOD">/AUTOSAR_MemMap/SwAddrMethods/CODE</SW-ADDRMETHOD-REF>
+                                </MEMORY-SECTION>
+                            </MEMORY-SECTIONS>
+                        </RESOURCE-CONSUMPTION>
+                        <SW-VERSION>1.0.0</SW-VERSION>
+                        <VENDOR-ID>0</VENDOR-ID>
+                        <BEHAVIOR-REF DEST="SWC-INTERNAL-BEHAVIOR">/Components/DUPLICATE_NAME/DUPLICATE_NAME</BEHAVIOR-REF>
+                        </SWC-IMPLEMENTATION>
+                    </ELEMENTS>
+                    </AR-PACKAGE>
+                </AR-PACKAGES>
+            </AUTOSAR>
+        """ # noqa E501
+
+        # prepare the XML content
+        element = ET.fromstring(xml_content)
+
+        document = AUTOSARDoc()
+        parser.readARPackages(element, document)
+        assert len(document.getARPackages()) == 2
+        assert document.getARPackages()[0].getShortName() == "Components"
+        assert document.getARPackages()[1].getShortName() == "Implementation"
+        assert len(document.getARPackages()[0].getElements()) == 1
+        
+        sw_component: AtomicSwComponentType = document.getARPackages()[0].getElement("DUPLICATE_NAME", AtomicSwComponentType)
+        assert sw_component is not None
+        assert sw_component.getShortName() == "DUPLICATE_NAME"
+        
+        internal_behavior: SwcInternalBehavior = sw_component.getInternalBehavior()
+        # Check if the internal behavior is present
+        assert internal_behavior is not None
+        assert internal_behavior.getShortName() == "DUPLICATE_NAME"
+        
+        # Check if the runnable is present
+        assert len(internal_behavior.getRunnableEntities()) == 1
+        runnables = internal_behavior.getRunnableEntities()
+
+        # Check the first runnable
+        runnable = runnables[0]
+        assert runnable is not None
+        assert runnable.getShortName() == "RunnableInit"
+        

armodel/writer/arxml_writer.py

@@ -88,7 +88,7 @@ from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identi
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Referrable, MultilanguageReferrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral, Limit
 from ..models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfo, LifeCycleInfoSet, LifeCyclePeriod
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest, NvProvideComSpec, NvRequireComSpec
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import TransformationComSpecProps, UserDefinedTransformationComSpecProps
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import TransmissionAcknowledgementRequest
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec
@@ -132,7 +132,7 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import SwcInternalBehavior, SynchronousServerCallPoint
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AutosarVariableRef import AutosarVariableRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, ParameterInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import VariableInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortDefinedArgumentValue
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import AsynchronousServerCallReturnsEvent, BackgroundEvent
@@ -409,7 +409,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         child_element = ET.SubElement(element, "NONQUEUED-SENDER-COM-SPEC")
         self.writeARObjectAttributes(child_element, com_spec)
         self.writeSenderComSpec(child_element, com_spec)
-        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
+        self.setChildValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
 
     def writeTransformationComSpecProps(self, element: ET.Element, prop: TransformationComSpecProps):
         if prop is not None:
@@ -454,7 +454,15 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalRefType(child_element, "MODE-GROUP-REF", com_spec.getModeGroupRef())
         self.setModeSwitchedAckRequest(child_element, "MODE-SWITCHED-ACK", com_spec.getModeSwitchedAck())
         self.setChildElementOptionalNumericalValue(child_element, "QUEUE-LENGTH", com_spec.getQueueLength())
-    
+
+    def writeNvProvideComSpec(self, com_specs_tag: ET.Element, com_spec: NvProvideComSpec):
+        if com_spec is not None:
+            child_element = ET.SubElement(com_specs_tag, "NV-PROVIDE-COM-SPEC")
+            self.writeARObjectAttributes(child_element, com_spec)
+            self.setChildValueSpecification(child_element, "RAM-BLOCK-INIT-VALUE", com_spec.getRamBlockInitValue())
+            self.setChildValueSpecification(child_element, "ROM-BLOCK-INIT-VALUE", com_spec.getRomBlockInitValue())
+            self.setChildElementOptionalRefType(child_element, "VARIABLE-REF", com_spec.getVariableRef())
+
     def writePPortComSpec(self, com_specs_tag: ET.Element, com_spec: PPortComSpec):
         if isinstance(com_spec, NonqueuedSenderComSpec):
             self.writeNonqueuedSenderComSpec(com_specs_tag, com_spec)
@@ -464,6 +472,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeQueuedSenderComSpec(com_specs_tag, com_spec)
         elif isinstance(com_spec, ModeSwitchSenderComSpec):
             self.writeModeSwitchSenderComSpec(com_specs_tag, com_spec)
+        elif isinstance(com_spec, NvProvideComSpec):
+            self.writeNvProvideComSpec(com_specs_tag, com_spec)
         else:
             self.notImplemented("Unsupported PPortComSpec %s" % type(com_spec))
 
@@ -559,7 +569,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeValueSpecification(value_spec_tag, value_spec)
         self.setChildElementOptionalRefType(value_spec_tag, "CONSTANT-REF", value_spec.getConstantRef())
 
-    def setValueSpecification(self, element: ET.Element, key: str, value_spec: ValueSpecification):
+    def setChildValueSpecification(self, element: ET.Element, key: str, value_spec: ValueSpecification):
         if value_spec is not None:
             child_element = ET.SubElement(element, key)
             if isinstance(value_spec, ApplicationValueSpecification):
@@ -587,7 +597,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalBooleanValue(child_element, "HANDLE-NEVER-RECEIVED", com_spec.getHandleNeverReceived())
         self.setChildElementOptionalLiteral(child_element, "HANDLE-TIMEOUT-TYPE", com_spec.getHandleTimeoutType())
         
-        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
+        self.setChildValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
 
     def writeQueuedReceiverComSpec(self, element: ET.Element, com_spec: QueuedReceiverComSpec):
         child_element = ET.SubElement(element, "QUEUED-RECEIVER-COM-SPEC")
@@ -605,8 +615,15 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeParameterRequireComSpec")
         child_element = ET.SubElement(element, "PARAMETER-REQUIRE-COM-SPEC")
         self.writeARObjectAttributes(child_element, com_spec)
+        self.setChildValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
         self.setChildElementOptionalRefType(child_element, "PARAMETER-REF", com_spec.getParameterRef())
-        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
+
+    def writeNvRequireComSpec(self, element: ET.Element, com_spec: NvRequireComSpec):
+        self.logger.debug("writeNvRequireComSpec")
+        child_element = ET.SubElement(element, "NV-REQUIRE-COM-SPEC")
+        self.writeARObjectAttributes(child_element, com_spec)
+        self.setChildValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
+        self.setChildElementOptionalRefType(child_element, "VARIABLE-REF", com_spec.getVariableRef())
 
     def setModeSwitchReceiverComSpec(self, element: ET.Element, com_spec: ModeSwitchReceiverComSpec):
         self.logger.debug("writeModeSwitchReceiverComSpec")
@@ -627,6 +644,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setModeSwitchReceiverComSpec(element, com_spec)
         elif isinstance(com_spec, ParameterRequireComSpec):
             self.writeParameterRequireComSpec(element, com_spec)
+        elif isinstance(com_spec, NvRequireComSpec):
+            self.writeNvRequireComSpec(element, com_spec)
         else:
             raise ValueError("Unsupported RPortComSpec %s" % type(com_spec))
         
@@ -937,7 +956,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalRefType(conditional_tag, "SW-ADDR-METHOD-REF", props.getSwAddrMethodRef())
             self.setChildElementOptionalLiteral(conditional_tag, "SW-CALIBRATION-ACCESS", props.getSwCalibrationAccess())
             self.setChildElementOptionalRefType(conditional_tag, "COMPU-METHOD-REF", props.getCompuMethodRef())
-            self.setValueSpecification(conditional_tag, "INVALID-VALUE", props.getInvalidValue())
+            self.setChildValueSpecification(conditional_tag, "INVALID-VALUE", props.getInvalidValue())
             self.setChildElementOptionalFloatValue(conditional_tag, "STEP-SIZE", props.getStepSize())
             self.setChildElementOptionalRefType(conditional_tag, "DATA-CONSTR-REF", props.getDataConstrRef())
             self.setChildElementOptionalRefType(conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF", props.getImplementationDataTypeRef())
@@ -1122,7 +1141,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeIdentifiable(spec_tag, spec)
 
         if spec.getValueSpec() is not None:
-            self.setValueSpecification(spec_tag, "VALUE-SPEC", spec.getValueSpec())
+            self.setChildValueSpecification(spec_tag, "VALUE-SPEC", spec.getValueSpec())
                 
     def setInternalConstrs(self, element: ET.Element, constrs: InternalConstrs):
         if constrs is not None:
@@ -1345,9 +1364,19 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeIdentifiable(child_element, access)
         self.setAutosarVariableRef(child_element, "ACCESSED-VARIABLE", access.getAccessedVariableRef())
 
+    def setParameterInAtomicSWCTypeInstanceRef(self, element: ET.Element, key: str, parameter_iref: ParameterInAtomicSWCTypeInstanceRef):
+        if parameter_iref is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalRefType(child_element, "BASE-REF", parameter_iref.getBaseRef())
+            self.setChildElementOptionalRefType(child_element, "CONTEXT-DATA-PROTOTYPE-REF", parameter_iref.getContextDataPrototypeRef())
+            self.setChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF", parameter_iref.getPortPrototypeRef())
+            self.setChildElementOptionalRefType(child_element, "ROOT-PARAMETER-DATA-PROTOTYPE-REF", parameter_iref.getRootParameterDataPrototypeRef())
+            self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", parameter_iref.getTargetDataPrototypeRef())
+
     def setAutosarParameterRef(self, element: ET.Element, key: str, parameter_ref: AutosarParameterRef):
         if parameter_ref is not None:
             child_element = ET.SubElement(element, key)
+            self.setParameterInAtomicSWCTypeInstanceRef(child_element, "AUTOSAR-PARAMETER-IREF", parameter_ref.getAutosarParameterIRef())
             self.setChildElementOptionalRefType(child_element, "LOCAL-PARAMETER-REF", parameter_ref.getLocalParameterRef())
 
     def writeParameterAccess(self, element: ET.Element, parameter_access: ParameterAccess):
@@ -1592,7 +1621,7 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeParameterDataPrototype(self, element: ET.Element, prototype: ParameterDataPrototype):
         child_element = ET.SubElement(element, "PARAMETER-DATA-PROTOTYPE")
         self.writeAutosarDataPrototype(child_element, prototype)
-        self.setValueSpecification(child_element, "INIT-VALUE", prototype.getInitValue())
+        self.setChildValueSpecification(child_element, "INIT-VALUE", prototype.getInitValue())
 
     def writeSwcInternalBehaviorParameterDataPrototypes(self, element: ET.Element, key: str, parameters: List[ParameterDataPrototype]):
         if len(parameters) > 0:
@@ -1606,7 +1635,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             for argument_value in argument_values:
                 child_element = ET.SubElement(child_element, "PORT-DEFINED-ARGUMENT-VALUE")
                 if argument_value.getValue() is not None:
-                    self.setValueSpecification(child_element, "VALUE", argument_value.getValue())
+                    self.setChildValueSpecification(child_element, "VALUE", argument_value.getValue())
                 self.setChildElementOptionalRefType(child_element, "VALUE-TYPE-TREF", argument_value.getValueTypeTRef())
 
     def writeSwcInternalBehaviorPortAPIOptions(self, element: ET.Element, behavior: SwcInternalBehavior):
@@ -2075,7 +2104,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeVariableDataPrototype %s" % prototype.getShortName())
         child_element = ET.SubElement(element, "VARIABLE-DATA-PROTOTYPE")
         self.writeAutosarDataPrototype(child_element, prototype)
-        self.setValueSpecification(child_element, "INIT-VALUE", prototype.getInitValue())
+        self.setChildValueSpecification(child_element, "INIT-VALUE", prototype.getInitValue())
 
     def writeSenderReceiverInterfaceDataElements(self, element: ET.Element, sr_interface: SenderReceiverInterface):
         data_elements = sr_interface.getDataElements()
@@ -4965,7 +4994,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeIdentifiable(child_element, signal)
         self.setChildElementOptionalLiteral(child_element, "DATA-TYPE-POLICY", signal.getDataTypePolicy())
         self.setChildElementOptionalLiteral(child_element, "I-SIGNAL-TYPE", signal.getISignalType())
-        self.setValueSpecification(child_element, "INIT-VALUE", signal.getInitValue())
+        self.setChildValueSpecification(child_element, "INIT-VALUE", signal.getInitValue())
         self.setChildElementOptionalNumericalValue(child_element, "LENGTH", signal.getLength())
         self.setSwDataDefProps(child_element, "NETWORK-REPRESENTATION-PROPS", signal.getNetworkRepresentationProps())
         self.setChildElementOptionalRefType(child_element, "SYSTEM-SIGNAL-REF", signal.getSystemSignalRef())

{armodel-1.8.4.dist-info → armodel-1.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.8.4
+Version: 1.8.6
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -638,4 +638,19 @@ Fix the attribute intervalType of **Limit** is empty issue.
 2. Add the armodel-uuid-checker cli.
 3. Remove the space in the boolean type.
 
+**Version 1.8.5**
+
+1. Reorganize the SwConnector class.
+2. Raise the error if the short name of rootSwCompositionPrototype.
+3. To support the following AR Element:
+   * NvProvideComSpec
+4. Fix the duplicate short name of ARPackage and Other ARElements. 
+
+**Version 1.8.6**
+
+1. To support the following AR Element:
+   * NvProvideComSpec
+   * NvRequireComSpec
+2. To improve the following AR Element:
+   * ParameterAccess