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

armodel/cli/uuid_checker_cli.py

@@ -57,6 +57,7 @@ def perform_uuid_duplicate_check(args):
             parser.load(filename, document)
 
         with open(args.OUTPUT, 'w') as f_out:
+            logger.info("Writing the duplicate UUIDs to <%s>", args.OUTPUT)
             for uuid in document.getDuplicateUUIDs():
                 ar_objects = document.getARObjectByUUID(uuid)
                 if len(ar_objects) > 1:

armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py

@@ -11,7 +11,7 @@ from ...M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
 from ...M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
 from ...M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
 from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Referrable
+from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, CollectableElement, Referrable
 from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationDataType, DataTypeMap
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwComponentType, CompositionSwComponentType, PortPrototype
@@ -206,9 +206,14 @@ class AbstractAUTOSAR(CollectableElement):
     def getRootSwCompositionPrototype(self):
         return self.rootSwCompositionPrototype
 
-    def setRootSwCompositionPrototype(self, value):
+    def setRootSwCompositionPrototype(self, value: ARElement):
         if value is not None:
-            self.rootSwCompositionPrototype = value
+            if self.rootSwCompositionPrototype is not None:
+                if value.getShortName() != self.rootSwCompositionPrototype.getShortName():
+                    raise ValueError("RootSwCompositionPrototype already set to <%s>, cannot set to <%s>."
+                                     % (self.rootSwCompositionPrototype.getShortName(), value.getShortName()))
+            else:
+                self.rootSwCompositionPrototype = value
         return self
 
     def addImplementationBehaviorMap(self, impl: str, behavior: str) -> Implementation:

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py

@@ -143,8 +143,9 @@ class ARPackage(Identifiable, CollectableElement):
         return self.arPackages[short_name]
 
     def getElement(self, short_name: str, type=None) -> Referrable:
-        if (short_name in self.arPackages):
-            return self.arPackages[short_name]
+        if type is ARPackage or type is None:
+            if short_name in self.arPackages:
+                return self.arPackages[short_name]
         return CollectableElement.getElement(self, short_name, type)
 
     def createEcuAbstractionSwComponentType(self, short_name: str) -> EcuAbstractionSwComponentType:

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py

@@ -303,14 +303,14 @@ class AtomicSwComponentType(SwComponentType, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.internalBehavior = None                        # type: SwcInternalBehavior
-        self.symbolProps = None                             # type: SymbolProps
+        self.internalBehavior: SwcInternalBehavior = None
+        self.symbolProps: SymbolProps = None
 
     def getInternalBehavior(self):
         return self.internalBehavior
 
     def createSwcInternalBehavior(self, short_name) -> SwcInternalBehavior:
-        if (not self.IsElementExists(short_name)):
+        if (not self.IsElementExists(short_name, SwcInternalBehavior)):
             behavior = SwcInternalBehavior(self, short_name)
             self.addElement(behavior)
             self.internalBehavior = behavior

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/__init__.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef, RPortInCompositionInstanceRef
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import RPortInCompositionInstanceRef
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
@@ -11,40 +12,34 @@ class SwComponentPrototype(Identifiable):
 
         self.typeTRef = None                       # type: RefType
 
-    def getTypeTRef(self):
+    def getTypeTRef(self) -> RefType:
         return self.typeTRef
 
-    def setTypeTRef(self, value):
+    def setTypeTRef(self, value: RefType):
         self.typeTRef = value
         return self
 
-class SwConnector(Identifiable, metaclass = ABCMeta):
+
+class SwConnector(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.mappingRef = None                      # type: RefType
+        self.mappingRef: RefType = None
 
-    def getMappingRef(self):
+    def getMappingRef(self) -> RefType:
         return self.mappingRef
 
-    def setMappingRef(self, value):
+    def setMappingRef(self, value: RefType):
         self.mappingRef = value
         return self
 
+
 class AssemblySwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.mappingRef = None          # type: RefType
-        self.providerIRef = None        # type: PPortInCompositionInstanceRef
-        self.requesterIRef = None       # type: RPortInCompositionInstanceRef
-
-    def getMappingRef(self):
-        return self.mappingRef
-
-    def setMappingRef(self, value):
-        self.mappingRef = value
-        return self
+        self.providerIRef: PPortInCompositionInstanceRef = None
+        self.requesterIRef: RPortInCompositionInstanceRef = None
 
     def getProviderIRef(self) -> PPortInCompositionInstanceRef:
         return self.providerIRef
@@ -60,24 +55,25 @@ class AssemblySwConnector(SwConnector):
         self.requesterIRef = value
         return self
 
+
 class DelegationSwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        self.innerPortIRref = None                          # type: PortInCompositionTypeInstanceRef
-        self.outerPortRef = None                            # type: RefType
+        self.innerPortIRref: PortInCompositionTypeInstanceRef = None
+        self.outerPortRef: RefType = None
 
-    def getInnerPortIRref(self):
+    def getInnerPortIRref(self) -> PortInCompositionTypeInstanceRef:
         return self.innerPortIRref
 
-    def setInnerPortIRref(self, value):
+    def setInnerPortIRref(self, value: PortInCompositionTypeInstanceRef):
         self.innerPortIRref = value
         return self
 
-    def getOuterPortRef(self):
+    def getOuterPortRef(self) -> RefType:
         return self.outerPortRef
 
-    def setOuterPortRef(self, value):
+    def setOuterPortRef(self, value: RefType):
         self.outerPortRef = value
         return self
 
@@ -86,20 +82,19 @@ class PassThroughSwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.providedOuterPortRef = None                    # type: RefType
-        self.requiredOuterPortRef = None                    # type: RefType
+        self.providedOuterPortRef: RefType = None
+        self.requiredOuterPortRef: RefType = None
 
-    def getProvidedOuterPortRef(self):
+    def getProvidedOuterPortRef(self) -> RefType:
         return self.providedOuterPortRef
 
-    def setProvidedOuterPortRef(self, value):
+    def setProvidedOuterPortRef(self, value: RefType):
         self.providedOuterPortRef = value
         return self
 
-    def getRequiredOuterPortRef(self):
+    def getRequiredOuterPortRef(self) -> RefType:
         return self.requiredOuterPortRef
 
-    def setRequiredOuterPortRef(self, value):
+    def setRequiredOuterPortRef(self, value: RefType):
         self.requiredOuterPortRef = value
         return self
-        

armodel/parser/arxml_parser.py

@@ -101,7 +101,7 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import POperationInAtomicSwcInstanceRef, PPortInCompositionInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import ROperationInAtomicSwcInstanceRef, RPortInCompositionInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, ModeSwitchedAckRequest, 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
@@ -1968,6 +1968,9 @@ class ARXMLParser(AbstractARXMLParser):
         com_spec.setInitValue(self.getInitValue(element)) \
                 .setParameterRef(self.getChildElementOptionalRefType(element, "PARAMETER-REF"))
         return com_spec
+
+    def getNvProvideComSpec(self, element: ET.Element) -> NvRequireComSpec:
+        pass
     
     def getQueuedReceiverComSpec(self, element: ET.Element) -> QueuedReceiverComSpec:
         com_spec = QueuedReceiverComSpec()
@@ -2009,6 +2012,8 @@ class ARXMLParser(AbstractARXMLParser):
                 parent.addRequiredComSpec(self.getModeSwitchReceiverComSpec(child_element))
             elif tag_name == "PARAMETER-REQUIRE-COM-SPEC":
                 parent.addRequiredComSpec(self.getParameterRequireComSpec(child_element))
+            elif tag_name == "NV-PROVIDE-COM-SPEC":
+                parent.addRequiredComSpec(self.getNvProvideComSpec(child_element))
             else:
                 self.raiseError("Unsupported RequiredComSpec <%s>" % tag_name)
 
@@ -5214,18 +5219,19 @@ class ARXMLParser(AbstractARXMLParser):
             group.addISignalIPduRef(ref_type)
 
     def readSenderReceiverToSignalMapping(self, element: ET.Element, mapping: SenderReceiverToSignalMapping):
-        mapping.setCommunicationDirection(self.getChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION")) \
-               .setDataElementIRef(self.getVariableDataPrototypeInSystemInstanceRef(self.find(element, "DATA-ELEMENT-IREF"))) \
-               .setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        mapping.setCommunicationDirection(self.getChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION"))
+        mapping.setDataElementIRef(self.getVariableDataPrototypeInSystemInstanceRef(self.find(element, "DATA-ELEMENT-IREF")))
+        mapping.setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        self.logger.debug("Read SenderReceiverToSignalMapping <%s>" % mapping.getSystemSignalRef().getValue())
     
     def readSenderRecCompositeTypeMapping(self, element: ET.Element, mapping: SenderRecCompositeTypeMapping):
         self.readARObjectAttributes(element, mapping)
 
     def readSenderRecRecordElementMapping(self, element: ET.Element, mapping: SenderRecRecordElementMapping):
         self.readARObjectAttributes(element, mapping)
-        mapping.setApplicationRecordElementRef(self.getChildElementOptionalRefType(element, "APPLICATION-RECORD-ELEMENT-REF")) \
-               .setImplementationRecordElementRef(self.getChildElementOptionalRefType(element, "IMPLEMENTATION-RECORD-ELEMENT-REF")) \
-               .setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
+        mapping.setApplicationRecordElementRef(self.getChildElementOptionalRefType(element, "APPLICATION-RECORD-ELEMENT-REF"))
+        mapping.setImplementationRecordElementRef(self.getChildElementOptionalRefType(element, "IMPLEMENTATION-RECORD-ELEMENT-REF"))
+        mapping.setSystemSignalRef(self.getChildElementOptionalRefType(element, "SYSTEM-SIGNAL-REF"))
 
     def readSenderRecArrayTypeMappingRecordElementMapping(self, element: ET.Element, mapping: SenderRecRecordTypeMapping):
         for child_element in self.findall(element, "RECORD-ELEMENT-MAPPINGS/*"):
@@ -5342,7 +5348,10 @@ class ARXMLParser(AbstractARXMLParser):
             self.readIdentifiable(child_element, prototype)
             prototype.setFlatMapRef(self.getChildElementOptionalRefType(child_element, "FLAT-MAP-REF")) \
                      .setSoftwareCompositionTRef(self.getChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF"))
-            AUTOSAR.getInstance().setRootSwCompositionPrototype(prototype)
+            try:
+                AUTOSAR.getInstance().setRootSwCompositionPrototype(prototype)
+            except ValueError as e:
+                self.raiseWarning("%s" % e)
 
     def readSystemFibexElementRefs(self, element: ET.Element, system: System):
         for ref in self.getChildElementRefTypeList(element, "FIBEX-ELEMENTS/FIBEX-ELEMENT-REF-CONDITIONAL/FIBEX-ELEMENT-REF"):

armodel/tests/test_armodel/models/test_data_dictionary.py

@@ -3,27 +3,28 @@ import pytest
 from ....models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
+
 class Test_M2_MSR_DataDictionary_DataDefProperties:
     def test_SwDataDefProps(self):
         props = SwDataDefProps()
 
-        assert(isinstance(props, ARObject))
-        assert(isinstance(props, SwDataDefProps))
+        assert (isinstance(props, ARObject))
+        assert (isinstance(props, SwDataDefProps))
 
-        assert(props.baseTypeRef == None)
-        assert(props.compuMethodRef == None)
-        assert(props.dataConstrRef == None)                 
-        assert(props.implementationDataTypeRef == None)
-        assert(props.swImplPolicy == None)
-        assert(props.swCalibrationAccess == None)
-        assert(props.swPointerTargetProps == None)
+        assert (props.baseTypeRef is None)
+        assert (props.compuMethodRef is None)
+        assert (props.dataConstrRef is None)
+        assert (props.implementationDataTypeRef is None)
+        assert (props.swImplPolicy is None)
+        assert (props.swCalibrationAccess is None)
+        assert (props.swPointerTargetProps is None)
 
     def test_SwPointerTargetProps(self):
         props = SwPointerTargetProps()
 
-        assert(isinstance(props, ARObject))
-        assert(isinstance(props, SwPointerTargetProps))
+        assert (isinstance(props, ARObject))
+        assert (isinstance(props, SwPointerTargetProps))
 
-        assert(props.getFunctionPointerSignatureRef() == None)
-        assert(props.getSwDataDefProps() == None)
-        assert(props.getTargetCategory() == None)
+        assert (props.getFunctionPointerSignatureRef() is None)
+        assert (props.getSwDataDefProps() is None)
+        assert (props.getTargetCategory() is None)

armodel/tests/test_armodel/models/test_data_prototype.py

@@ -1,14 +1,16 @@
 import pytest
 
+from .... import AUTOSAR
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from .... import AUTOSAR
-from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AtpPrototype, AutosarDataPrototype, DataPrototype, VariableDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationCompositeElementDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationRecordElement
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import AtpPrototype, AutosarDataPrototype
+from ....models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import DataPrototype, VariableDataPrototype
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
 
+
 class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
 
     def test_AtpPrototype(self):
@@ -16,75 +18,76 @@ class Test_M2_AUTOSARTemplates_SWComponentTemplate_Datatype_DataPrototypes:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             AtpPrototype(ar_root, "prototype")
-        assert(str(err.value) == "AtpPrototype is an abstract class.")
+        assert (str(err.value) == "AtpPrototype is an abstract class.")
 
     def test_DataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             DataPrototype(ar_root, "prototype")
-        assert(str(err.value) == "DataPrototype is an abstract class.")
+        assert (str(err.value) == "DataPrototype is an abstract class.")
 
     def test_AutosarDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
             AutosarDataPrototype(ar_root, "prototype")
-        assert(str(err.value) == "AutosarDataPrototype is an abstract class.")
+        assert (str(err.value) == "AutosarDataPrototype is an abstract class.")
 
     def test_VariableDataPrototype(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = VariableDataPrototype(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, AutosarDataPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, AutosarDataPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
 
-        assert(prototype.parent == ar_root)
-        assert(prototype.short_name == "prototype")
-        assert(prototype.typeTRef is None)
+        assert (prototype.parent == ar_root)
+        assert (prototype.short_name == "prototype")
+        assert (prototype.typeTRef is None)
 
     def test_ApplicationCompositeElementDataPrototype(self):
         with pytest.raises(NotImplementedError) as err:
             document = AUTOSAR.getInstance()
             ar_root = document.createARPackage("AUTOSAR")
-            ApplicationCompositeElementDataPrototype(ar_root, "application_composition_element_data_prototype")
-        assert(str(err.value) == "ApplicationCompositeElementDataPrototype is an abstract class.")
+            ApplicationCompositeElementDataPrototype(
+                ar_root, "application_composition_element_data_prototype")
+        assert (str(err.value) == "ApplicationCompositeElementDataPrototype is an abstract class.")
 
     def test_ApplicationArrayElement(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = ApplicationArrayElement(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, ApplicationCompositeElementDataPrototype))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
-        assert(isinstance(prototype, ApplicationArrayElement))
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, ApplicationCompositeElementDataPrototype))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ApplicationArrayElement))
 
     def test_ApplicationRecordElement(self):
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         prototype = ApplicationRecordElement(ar_root, "prototype")
 
-        assert(isinstance(prototype, ARObject))
-        assert(isinstance(prototype, ApplicationCompositeElementDataPrototype))
-        assert(isinstance(prototype, AtpFeature))
-        assert(isinstance(prototype, AtpPrototype))
-        assert(isinstance(prototype, DataPrototype))
-        assert(isinstance(prototype, Identifiable))
-        assert(isinstance(prototype, MultilanguageReferrable))
-        assert(isinstance(prototype, Referrable))
-        assert(isinstance(prototype, ApplicationRecordElement))
-
-        assert(prototype.isOptional == None)
+        assert (isinstance(prototype, ARObject))
+        assert (isinstance(prototype, ApplicationCompositeElementDataPrototype))
+        assert (isinstance(prototype, AtpFeature))
+        assert (isinstance(prototype, AtpPrototype))
+        assert (isinstance(prototype, DataPrototype))
+        assert (isinstance(prototype, Identifiable))
+        assert (isinstance(prototype, MultilanguageReferrable))
+        assert (isinstance(prototype, Referrable))
+        assert (isinstance(prototype, ApplicationRecordElement))
+
+        assert (prototype.isOptional is None)

armodel/tests/test_armodel/models/test_general_structure.py

@@ -1,15 +1,10 @@
 import pytest
 
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, PackageableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, MultilanguageReferrable, Referrable
-
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
 from ....models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 

armodel/tests/test_armodel/models/test_implementation.py

@@ -9,7 +9,7 @@ class TestImplementation:
         document = AUTOSAR.getInstance()
         ar_root = document.createARPackage("AUTOSAR")
         code = Code(ar_root, "code")
-        assert(code.short_name == "code")
+        assert (code.short_name == "code")
 
         data = [
             ["Autosar::include::BswM.h", "SWHDR"],
@@ -22,6 +22,6 @@ class TestImplementation:
                            .setCategory(item[1])
             code.addArtifactDescriptor(engineering_obj)
 
-        assert(len(code.getArtifactDescriptors()) == 2)
-        assert(len(code.getArtifactDescriptors("SWHDR")) == 1)
-        assert(len(code.getArtifactDescriptors("SWSRC")) == 1)
+        assert (len(code.getArtifactDescriptors()) == 2)
+        assert (len(code.getArtifactDescriptors("SWHDR")) == 1)
+        assert (len(code.getArtifactDescriptors("SWSRC")) == 1)

armodel/tests/test_armodel/models/test_m2_msr.py

@@ -1,79 +1,79 @@
 import pytest
 
-from ....models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent, CompuContent, CompuScale
-
 from .... import AUTOSAR
+from ....models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstNumericContent, CompuConstTextContent
+from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuContent, CompuScale, CompuScales
 from ....models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....models.M2.MSR.AsamHdo.ComputationMethod import CompuScales
+
 
 class Test_M2_MSR_AsamHdo_ComputationMethod:
     def test_CompuContent(self):
         with pytest.raises(NotImplementedError) as err:
             CompuContent()
-        assert(str(err.value) == "CompuContent is an abstract class.")
+        assert (str(err.value) == "CompuContent is an abstract class.")
 
     def test_Compu(self):
         compu = Compu()
 
-        assert(isinstance(compu, ARObject))
-        assert(isinstance(compu, Compu))
+        assert (isinstance(compu, ARObject))
+        assert (isinstance(compu, Compu))
 
-        assert(compu.compuContent == None)
-        assert(compu.compuDefaultValue == None)
+        assert (compu.compuContent is None)
+        assert (compu.compuDefaultValue is None)
 
     def test_CompuConstContent(self):
         with pytest.raises(NotImplementedError) as err:
             CompuConstContent()
-        assert(str(err.value) == "CompuConstContent is an abstract class.")
+        assert (str(err.value) == "CompuConstContent is an abstract class.")
 
     def test_CompuConstTextContent(self):
         content = CompuConstTextContent()
 
-        assert(isinstance(content, ARObject))
-        assert(isinstance(content, CompuConstContent))
-        assert(isinstance(content, CompuConstTextContent))
+        assert (isinstance(content, ARObject))
+        assert (isinstance(content, CompuConstContent))
+        assert (isinstance(content, CompuConstTextContent))
 
-        assert(content.vt == None)
+        assert (content.vt is None)
 
     def test_CompuConstNumericContent(self):
         content = CompuConstNumericContent()
 
-        assert(isinstance(content, ARObject))
-        assert(isinstance(content, CompuConstContent))
-        assert(isinstance(content, CompuConstNumericContent))
+        assert (isinstance(content, ARObject))
+        assert (isinstance(content, CompuConstContent))
+        assert (isinstance(content, CompuConstNumericContent))
 
-        assert(content.v == None)
+        assert (content.v is None)
 
     def test_CompuConst(self):
         compu_const = CompuConst()
 
-        assert(isinstance(compu_const, ARObject))
-        assert(isinstance(compu_const, CompuConst))
+        assert (isinstance(compu_const, ARObject))
+        assert (isinstance(compu_const, CompuConst))
 
-        assert(compu_const.compuConstContentType == None)
+        assert (compu_const.compuConstContentType is None)
 
     def test_CompuScale(self):
         compu_scale = CompuScale()
 
-        assert(isinstance(compu_scale, ARObject))
-        assert(isinstance(compu_scale, CompuScale))
+        assert (isinstance(compu_scale, ARObject))
+        assert (isinstance(compu_scale, CompuScale))
 
-        assert(compu_scale.compuContent == None)
-        assert(compu_scale.lowerLimit == None)
-        assert(compu_scale.upperLimit == None)
-        assert(compu_scale.compuInverseValue == None)
-        assert(compu_scale.compuScaleContents == None)
+        assert (compu_scale.compuContent is None)
+        assert (compu_scale.lowerLimit is None)
+        assert (compu_scale.upperLimit is None)
+        assert (compu_scale.compuInverseValue is None)
+        assert (compu_scale.compuScaleContents is None)
 
     def test_CompuScales(self):
         compu_scales = CompuScales()
 
-        assert(isinstance(compu_scales, ARObject))
-        assert(isinstance(compu_scales, CompuScales))
+        assert (isinstance(compu_scales, ARObject))
+        assert (isinstance(compu_scales, CompuScales))
 
-        assert(len(compu_scales.compuScales) == 0)
+        assert (len(compu_scales.compuScales) == 0)
 
         compu_scale = CompuScale()
         compu_scales.addCompuScale(compu_scale)
 
-        assert(len(compu_scales.getCompuScales()) == 1)
-        assert(compu_scales.getCompuScales()[0] == compu_scale)
+        assert (len(compu_scales.getCompuScales()) == 1)
+        assert (compu_scales.getCompuScales()[0] == compu_scale)

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-1.8.4.dist-info → armodel-1.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.8.4
+Version: 1.8.5
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -638,4 +638,11 @@ 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. 
 

{armodel-1.8.4.dist-info → armodel-1.8.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ armodel/cli/format_xml_cli.py,sha256=FGOmC78qFxl5zeaC8tAWZUcFu6CicJbGfCsQCA7ekfA
 armodel/cli/memory_section_cli.py,sha256=YPhnfP9dd8yjPG_F32FaKhnCGVmLIK-WH33Jbup31O8,2179
 armodel/cli/swc_list_cli.py,sha256=yrObi-imM3X6M8R5y5KrZlAdq2IE4mltP9-aH_iwlqk,2441
 armodel/cli/system_signal_cli.py,sha256=nOVVMZtcSHytmZ8ln-zwu4mhY4Oi9i13RbMyS-RdlEQ,2141
-armodel/cli/uuid_checker_cli.py,sha256=7n-R4qO-5zuY4tyksghK5bBWOdHSCD1DkyvjMADupU0,3143
+armodel/cli/uuid_checker_cli.py,sha256=rqYGHJgKL90D1e3ool5sj0lqoKJocFJbdPGc2zRlnoc,3220
 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
@@ -18,7 +18,7 @@ armodel/lib/sw_component.py,sha256=spUeVR8ftzqf9h-pilh17qQg8amYqcqh39XKYql3HO4,1
 armodel/lib/system_signal.py,sha256=E3FNiUGRUZovTCclCkabkVPpScMIACOXERUpbAuBTv8,1397
 armodel/models/__init__.py,sha256=Oj9ea8HUVNZ9I_BUiH72LT23rGSJAwx5lcdmW_8O9fM,6017
 armodel/models/M2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py,sha256=wWZqSULMHcrCv5wcuBBpzT4zk-DykK2a6Yfl7IQ0tgk,11719
+armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py,sha256=chlS6CGFWpxIa5qLfJXNY_CjFGBBGp1aJcKotsa4Nxs,12137
 armodel/models/M2/AUTOSARTemplates/ECUCDescriptionTemplate.py,sha256=m9EMGnfdOeRbSFYcGabrCtOpZvb6uy2o03GoQ_MFpLQ,12261
 armodel/models/M2/AUTOSARTemplates/ECUCParameterDefTemplate.py,sha256=umY2aFmJepGOsmOTtfWTYeqY5KPb7bw4E0oazAUA7Wk,51238
 armodel/models/M2/AUTOSARTemplates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,7 +61,7 @@ armodel/models/M2/AUTOSARTemplates/EcuResourceTemplate/__init__.py,sha256=iYL0HC
 armodel/models/M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py,sha256=Nv04EsHvXy2B70ssXUt1jUqQScqTjcHYrsopvaNb52s,3002
 armodel/models/M2/AUTOSARTemplates/GenericStructure/LifeCycles.py,sha256=DxbxvW-Qb08Whw9eTTAGWiT5JzXsapP-9XmmmIDkGmI,5138
 armodel/models/M2/AUTOSARTemplates/GenericStructure/__init__.py,sha256=ovguP4wzQEDNguczwiZnhMm4dRRVcvnzmHrfQtlRCNQ,15
-armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py,sha256=sMsvUklWiELqzxveSB_PmOwZ9kx5YC52xcTCajwiYDc,44341
+armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py,sha256=Yil9JEHNmLHT9BgF8aU2TkQQl3znDWXoBpDIqaYRUsU,44394
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ArObject.py,sha256=upjY_vPc1r1JujHy1YCTAwQKeWw0TO1Ju3L-yDlPjp0,551
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ElementCollection.py,sha256=-btGbRzkRmvBhKui8RnNV5jwCQnFEFTY4mjTilF4zJk,2567
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/EngineeringObject.py,sha256=GAlpyZhgyJSNyMpGMDqF7wd7bpzQtpWhB-2wYUvQbYw,1718
@@ -75,9 +75,9 @@ armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SoftwareComponentDocument
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcImplementation.py,sha256=ExFASEiGd3qBbHARe_p2ZlaS9YFaJ9oy68ytbeh7qVI,1259
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/InstanceRefs.py,sha256=t4a16t4-ebvsY9k6JKXB-ZmgLy8vP1ri-Jqjqgngd14,5796
-armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py,sha256=2hYgBMecD7GaZDSY6eSnquftHFV73l0ief1zy_tXuI8,18758
+armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py,sha256=gpOu_ruYHTbsWypCrcLTReAKnQmBE6omTbOOwN_cj6w,18714
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/InstanceRefs.py,sha256=srGGmPcgQUNeUioEIsMao0MQUlua8X0UG01ipLyEvSs,4971
-armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/__init__.py,sha256=ZXf_EFGNfAX3TzgN66_wlca5pycBeu2g17XQlaM_2Ck,3642
+armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Composition/__init__.py,sha256=tQ1hfQ2U3-mP7cUCcGNAmF8oYTOqPuodoUZe0zoBMEE,3503
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/DataPrototypes.py,sha256=oDth96-xAxdOKqWLvt-k4AzFtyC4wodLrzS_YVC2c88,5138
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py,sha256=J24KjT-8QkKHlAdRkXTjItibKthy9HnQIiaTipV5qJo,5162
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -163,7 +163,7 @@ armodel/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 armodel/models/utils/uuid_mgr.py,sha256=riuiZo6uaJpWK1dRDx3Fl86Apk1gHpv_ZtfATmGCId4,926
 armodel/parser/__init__.py,sha256=wFcqh5unmDvKvf4R8vWkeertAXwWxAuOOEsbsM4mOHs,78
 armodel/parser/abstract_arxml_parser.py,sha256=suBQkFeHIDzd2oV_BmLJJiYR_NTkDGFZyqraWX6Ici4,14295
-armodel/parser/arxml_parser.py,sha256=qab1NsgnYt2dH6Eom0gBC7n2HYcwv46x5te1VR0cH3U,391330
+armodel/parser/arxml_parser.py,sha256=exwfE-bDbvNvzOLMfrsMcmQwxLagaNa5YTdMhBs5aP4,391786
 armodel/parser/connector_xlsx_parser.py,sha256=0YW0WGOeDFdSNEY_Xh8Hi-Zlv4e4ctaLUh9pibj2-1w,10312
 armodel/parser/excel_parser.py,sha256=-Ws0eDvGna9LPQC9T8bgMg3Zq84v04aSuSxZUlZx1Wo,698
 armodel/parser/file_parser.py,sha256=eexNNjO1hXd_jOVgj_zh-58v8hJ4Cf_m42WrhGohsIs,1527
@@ -180,14 +180,14 @@ armodel/tests/test_armodel/models/test_ar_package.py,sha256=nrwEabE58OHTNQf2p5lN
 armodel/tests/test_armodel/models/test_ar_ref.py,sha256=cB-07JEXGCNqVSnecR4IMTxUUGfdwYyMQI2A37nAe5M,3992
 armodel/tests/test_armodel/models/test_bsw_module_template.py,sha256=lcQPGVOGoBAV-zVCfr_JjGIVTNkfnnqikoxs6W6udxg,2542
 armodel/tests/test_armodel/models/test_common_structure.py,sha256=E-R9GywmEsYKl4YL5dKUUbbNK0jXgIZ-pY0qxF7Y3Jo,4105
-armodel/tests/test_armodel/models/test_data_dictionary.py,sha256=4xY0QgHhU2_K762i8qoJOXFFitMzWYL090roQDrWkYo,1154
-armodel/tests/test_armodel/models/test_data_prototype.py,sha256=PVIvVItwWcdGyqfn_5JJHBK7H6-C1543-XHQ0djq4LQ,4550
+armodel/tests/test_armodel/models/test_data_dictionary.py,sha256=e23uuarWa2wEbTjKoa3Zt6HBX_ixs5HRC_MYLpq6S2Q,1155
+armodel/tests/test_armodel/models/test_data_prototype.py,sha256=p5jaBH6YHIzt_sdHcAe7TxmjVPruF98i3DW30n-e-RU,4843
 armodel/tests/test_armodel/models/test_datatype.py,sha256=t_NpOh6EI-JWGnT53tWMA5NPNB_VyGVzo_517qGTrro,13006
-armodel/tests/test_armodel/models/test_general_structure.py,sha256=aY7oFNYTwj4G7A6fbi9g4LtjL6vTBmYoP15Z3R91UWs,2713
-armodel/tests/test_armodel/models/test_implementation.py,sha256=Z1UdwFCN9StTlTXoL1hUdkJcAQDS9KI3os9-wxkGMpk,1083
-armodel/tests/test_armodel/models/test_m2_msr.py,sha256=OI53I90YB-FQ6Vn3pBRIoRWsW5bIEzSwsKjSZeRXZ-E,2777
-armodel/tests/test_armodel/models/test_port_interface.py,sha256=CQd7YxBeMDuliqx0SQ1IZ32yGKrUQo6mZcqyI6qQepk,9727
-armodel/tests/test_armodel/models/test_port_prototype.py,sha256=eJMfvimtniRIhqA57bL1qMfp0_D9J9LrM-5GtGVl6OM,533
+armodel/tests/test_armodel/models/test_general_structure.py,sha256=2wkSPbCpR519J3F7jCCx-kMoXebYQ-HSDe_boSKFQ7Q,2703
+armodel/tests/test_armodel/models/test_implementation.py,sha256=N3XgSNx7B_8fvL3dmzGlXhaT-SGEaDfyc8idfhZjqY8,1089
+armodel/tests/test_armodel/models/test_m2_msr.py,sha256=3LsI7dYcT9z4BbCClMAwvSJkNUkXUQvEo9IkQ2-sYTU,2808
+armodel/tests/test_armodel/models/test_port_interface.py,sha256=ZSt8ELgV3NNHRxTVgpqirTOADRwDPHkIWurUPe5X-4c,9972
+armodel/tests/test_armodel/models/test_port_prototype.py,sha256=iaJ0Bie4_sYGnIGelWDXf7Oia7QDoysTMmFuQvqK4KQ,539
 armodel/tests/test_armodel/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/parser/test_arxml_parser.py,sha256=G87rUosLoMSfQZji37w6x8p-Nz0KMf_sXwVSNpGjLYQ,2612
 armodel/tests/test_armodel/parser/test_bsw_module_descriiption.py,sha256=LSrXnk0NIC5-YdHeM0CCFZmmbnTmXs3-rToimDzdd0Y,11675
@@ -195,7 +195,7 @@ armodel/tests/test_armodel/parser/test_implementation_data_type.py,sha256=3-LxYv
 armodel/tests/test_armodel/parser/test_parse_bswmd.py,sha256=Dju0afdFi7MqrP0BCBzOIILlIgLL6ux4lhoXmvtwZ8U,10499
 armodel/tests/test_armodel/parser/test_rte_event.py,sha256=GxhMNNANx_EZ_-jDRgZkd5lOn7treRPzNLYdQC6DMv4,8951
 armodel/tests/test_armodel/parser/test_runnable_entity.py,sha256=1irri1yDI0P8kE7_XQPzjAmOphovtJwtPns9qT2ieQk,8583
-armodel/tests/test_armodel/parser/test_sw_components.py,sha256=M-T26txeupgZwfCq89QkPga-3m7OSZ9DOqZtgPpZvSY,20950
+armodel/tests/test_armodel/parser/test_sw_components.py,sha256=ALaKHVd8CZcJn0u00jLz_4DR0-smo7DfJbfgdTdr9Ok,26838
 armodel/tests/test_armodel/parser/test_system.py,sha256=islzROEJGx5PoR9GkjJHopYPu8hEs7iSGhQviajYoxk,908
 armodel/transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/transformer/abstract.py,sha256=y6oATVcdu7I34RTb1PxGqgz7QdvcWcL2rCctEZMeo2E,108
@@ -203,9 +203,9 @@ armodel/transformer/admin_data.py,sha256=k5LnDz8F2WoBgNw71agEjWaMnGITrAzB-mp5iJ0
 armodel/writer/__init__.py,sha256=eXr3qhGzFIvHNBin22x-Tk2JM6QwRgx1jwrluDKAlzQ,37
 armodel/writer/abstract_arxml_writer.py,sha256=fmSC2beb_2Q_LW-nCbaOem85xX5616FW_sFPlJaflFw,6401
 armodel/writer/arxml_writer.py,sha256=dQcrTa5kxKNGwCR2G22DAAkKSdUxAL3bRNWS4E2FeHM,404843
-armodel-1.8.4.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.8.4.dist-info/METADATA,sha256=EbGQNSGeg-FNmFqTtO1vja_xT0biiZpY28HYMoPeIWc,18124
-armodel-1.8.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.8.4.dist-info/entry_points.txt,sha256=24xz9yK6gjxZ2IlHB23zY3_8M8rwrqAkWgElNBquUdA,550
-armodel-1.8.4.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.8.4.dist-info/RECORD,,
+armodel-1.8.5.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
+armodel-1.8.5.dist-info/METADATA,sha256=Nhm5GkjecH2QgP-6XylUI9cNJ1l0Q3RIrs09_y1ZnUY,18385
+armodel-1.8.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+armodel-1.8.5.dist-info/entry_points.txt,sha256=24xz9yK6gjxZ2IlHB23zY3_8M8rwrqAkWgElNBquUdA,550
+armodel-1.8.5.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
+armodel-1.8.5.dist-info/RECORD,,