armodel 1.7.7__py3-none-any.whl → 1.7.9__py3-none-any.whl

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

@@ -8,12 +8,17 @@ from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiab
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, RefType
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import RPortComSpec, ServerComSpec
+
 
 class SymbolProps(ImplementationProps):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+
 class PortPrototype(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -83,6 +88,7 @@ class PortPrototype(Identifiable):
         self.triggerPortAnnotations.append(value)
         return self
 
+
 class AbstractProvidedPortPrototype(PortPrototype):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -91,7 +97,7 @@ class AbstractProvidedPortPrototype(PortPrototype):
 
     def _validateRPortComSpec(self, com_spec: PPortComSpec):
         if isinstance(com_spec, NonqueuedSenderComSpec):
-            if com_spec.dataElementRef == None:
+            if com_spec.dataElementRef is None:
                 raise ValueError(
                     "operation of NonqueuedSenderComSpec is invalid")
             if com_spec.dataElementRef.dest != "VARIABLE-DATA-PROTOTYPE":
@@ -170,6 +176,7 @@ class PPortPrototype(AbstractProvidedPortPrototype):
         self.providedInterfaceTRef = value
         return self
 
+
 class RPortPrototype(AbstractRequiredPortPrototype):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -191,6 +198,7 @@ class RPortPrototype(AbstractRequiredPortPrototype):
         self.requiredInterfaceTRef = value
         return self
     
+
 class PRPortPrototype(PortPrototype):
     def __init__(self, parent, short_name):
         super().__init__(parent, short_name)
@@ -220,6 +228,7 @@ class PRPortPrototype(PortPrototype):
         self.providedRequiredInterface = value
         return self
 
+
 class PortGroup(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -239,51 +248,58 @@ class PortGroup(Identifiable):
     def getOuterPortRefs(self) -> List[RefType]:
         return self._outer_port_ref
 
-class SwComponentType(ARElement, metaclass = ABCMeta):
+
+class SwComponentType(ARElement, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.ports = []                                                     # type: List[PortPrototype]
+        self.portGroups = []                                                # type: List[PortGroup]
+
+    def getPorts(self):
+        return self.ports
+
     def createPPortPrototype(self, short_name: str) -> PPortPrototype:
-        if (short_name not in self.elements):
-            prototype = PPortPrototype(self, short_name)
-            self.addElement(prototype)
-        return self.getElement(short_name)
+        prototype = PPortPrototype(self, short_name)
+        self.addElement(prototype)
+        self.ports.append(prototype)
+        return prototype
 
     def createRPortPrototype(self, short_name) -> RPortPrototype:
-        if (short_name not in self.elements):
-            prototype = RPortPrototype(self, short_name)
-            self.addElement(prototype)
-        return self.getElement(short_name)
+        prototype = RPortPrototype(self, short_name)
+        self.addElement(prototype)
+        self.ports.append(prototype)
+        return prototype
     
     def createPRPortPrototype(self, short_name) -> PRPortPrototype:
-        if (short_name not in self.elements):
-            prototype = PRPortPrototype(self, short_name)
-            self.addElement(prototype)
-        return self.getElement(short_name)
+        prototype = PRPortPrototype(self, short_name)
+        self.addElement(prototype)
+        self.ports.append(prototype)
+        return prototype
     
-    def createPortGroup(self, short_name) -> PortGroup:
-        port_group = PortGroup(self, short_name)
-        if (short_name not in self.elements):
-            self.elements[short_name] = port_group
-        return self.elements[short_name]
-
     def getPPortPrototypes(self) -> List[PPortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, PPortPrototype), self.elements.values()), key= lambda o: o.short_name))
+        return list(sorted(filter(lambda c: isinstance(c, PPortPrototype), self.ports), key=lambda o: o.short_name))
 
     def getRPortPrototypes(self) -> List[RPortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, RPortPrototype), self.elements.values()), key= lambda o: o.short_name))
+        return list(sorted(filter(lambda c: isinstance(c, RPortPrototype), self.ports), key=lambda o: o.short_name))
     
     def getPRPortPrototypes(self) -> List[PRPortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, PRPortPrototype), self.elements.values()), key= lambda o: o.short_name))
+        return list(sorted(filter(lambda c: isinstance(c, PRPortPrototype), self.ports), key=lambda o: o.short_name))
     
     def getPortPrototypes(self) -> List[PortPrototype]:
-        return list(sorted(filter(lambda c: isinstance(c, PortPrototype), self.elements.values()), key= lambda o: o.short_name))
-    
+        return list(sorted(filter(lambda c: isinstance(c, PortPrototype), self.ports), key=lambda o: o.short_name))
+
     def getPortGroups(self) -> List[PortGroup]:
-        return list(sorted(filter(lambda c: isinstance(c, PortGroup), self.elements.values()), key= lambda o: o.short_name))
+        return self.portGroups
 
+    def createPortGroup(self, short_name) -> PortGroup:
+        port_group = PortGroup(self, short_name)
+        self.addElement(port_group)
+        self.portGroups.append(port_group)
+        return port_group
+    
 
-class AtomicSwComponentType(SwComponentType, metaclass = ABCMeta):
+class AtomicSwComponentType(SwComponentType, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
@@ -316,8 +332,9 @@ class AtomicSwComponentType(SwComponentType, metaclass = ABCMeta):
         return next(filter(lambda e: isinstance(e, SwcInternalBehavior), self.elements.values()))
     '''
 
+
 class EcuAbstractionSwComponentType(AtomicSwComponentType):
-    def __init__(self, parent:ARObject, short_name: str):
+    def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.hardwareElementRefs = []                                   # List[RefType]
@@ -329,7 +346,8 @@ class EcuAbstractionSwComponentType(AtomicSwComponentType):
         if value is not None:
             self.hardwareElementRefs.append(value)
         return self
-    
+
+
 class ApplicationSwComponentType(AtomicSwComponentType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -348,7 +366,8 @@ class ComplexDeviceDriverSwComponentType(AtomicSwComponentType):
         if value is not None:
             self.hardwareElementRefs.append(value)
         return self
-    
+
+
 class NvBlockSwComponentType(AtomicSwComponentType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -371,7 +390,8 @@ class NvBlockSwComponentType(AtomicSwComponentType):
         if value is not None:
             self.nvBlockDescriptors.append(value)
         return self
-    
+
+
 class SensorActuatorSwComponentType(AtomicSwComponentType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -391,6 +411,7 @@ class CompositionSwComponentType(SwComponentType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.components = []                                    # type: List[SwComponentPrototype]
         self.constantValueMappingRefs = []                      # type: List[RefType]
         self.dataTypeMappingRefs = []                           # type: List[RefType]
         self.instantiationRTEEventProps = []                    # type: List[InstantiationRTEEventProps]
@@ -416,26 +437,29 @@ class CompositionSwComponentType(SwComponentType):
         return self.elements[short_name]
 
     def getAssemblySwConnectors(self) -> List[AssemblySwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, AssemblySwConnector), self.elements.values()), key = lambda c: c.short_name))
+        return list(sorted(filter(lambda e: isinstance(e, AssemblySwConnector), self.elements.values()), key=lambda c: c.short_name))
 
     def getDelegationSwConnectors(self) -> List[DelegationSwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, DelegationSwConnector), self.elements.values()), key = lambda c: c.short_name))
+        return list(sorted(filter(lambda e: isinstance(e, DelegationSwConnector), self.elements.values()), key=lambda c: c.short_name))
+
+    # def getSwConnectors(self) -> List[SwConnector]:
+    #    return list(sorted(filter(lambda e: isinstance(e, SwConnector), self.elements.values()), key=lambda c: c.short_name))
 
     def getSwConnectors(self) -> List[SwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, SwConnector), self.elements.values()), key = lambda c: c.short_name))
+        return list(filter(lambda e: isinstance(e, SwConnector), self.elements.values()))
 
     def createSwComponentPrototype(self, short_name: str) -> SwComponentPrototype:
-        if (short_name not in self.elements):
-            connector = SwComponentPrototype(self, short_name)
-            self.elements[short_name] = connector
-        return self.elements[short_name]
+        if (not self.IsElementExists(short_name)):
+            prototype = SwComponentPrototype(self, short_name)
+            self.addElement(prototype)
+            self.components.append(prototype)
+        return self.getElement(short_name)
 
-    def getSwComponentPrototypes(self) -> List[SwComponentPrototype]:
-        return list(filter(lambda e: isinstance(e, SwComponentPrototype), self.elements.values()))
+    def getComponents(self) -> List[SwComponentPrototype]:
+        return self.components
 
     def addDataTypeMapping(self, data_type_mapping_ref: RefType):
         self.dataTypeMappingRefs.append(data_type_mapping_ref)
 
     def getDataTypeMappings(self) -> List[RefType]:
         return self.dataTypeMappingRefs
-

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

@@ -4,6 +4,7 @@ from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveT
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
+
 class SwComponentPrototype(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/EndToEndProtection.py

@@ -4,6 +4,7 @@ from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, Na
 from ..SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
 from typing import List
 
+
 class EndToEndDescription(ARObject):
     def __init__(self):
         super().__init__()
@@ -41,7 +42,8 @@ class EndToEndDescription(ARObject):
         return self
 
     def getDataIds(self) -> List[PositiveInteger]:
-        return sorted(self.dataIds, key = lambda a: a)
+        # return sorted(self.dataIds, key = lambda a: a.getValue())
+        return self.dataIds
 
     def addDataId(self, id: PositiveInteger):
         self.dataIds.append(id)
@@ -104,6 +106,7 @@ class EndToEndProtectionVariablePrototype(ARObject):
     def getReceiverIrefs(self) -> List[VariableDataPrototypeInSystemInstanceRef]:
         return self._receiverIRefs
 
+
 class EndToEndProtectionISignalIPdu(ARObject):
     def __init__(self):
         super().__init__()
@@ -146,21 +149,25 @@ class EndToEndProtection(Identifiable):
         return self.endToEndProfile
 
     def setEndToEndProfile(self, value):
-        self.endToEndProfile = value
+        if value is not None:
+            self.endToEndProfile = value
         return self
 
     def getEndToEndProtectionISignalIPdus(self):
         return self.endToEndProtectionISignalIPdus
 
     def addEndToEndProtectionISignalIPdu(self, value):
-        self.endToEndProtectionISignalIPdus.append(value)
+        if value is not None:
+            self.endToEndProtectionISignalIPdus.append(value)
         return self
 
     def getEndToEndProtectionVariablePrototypes(self) -> List[EndToEndProtectionVariablePrototype]:
         return self.endToEndProtectionVariablePrototypes
     
-    def addEndToEndProtectionVariablePrototype(self, prototype: EndToEndProtectionVariablePrototype):
-        self.endToEndProtectionVariablePrototypes.append(prototype)
+    def addEndToEndProtectionVariablePrototype(self, value: EndToEndProtectionVariablePrototype):
+        if value is not None:
+            self.endToEndProtectionVariablePrototypes.append(value)
+        return self
 
 
 class EndToEndProtectionSet(Identifiable):
@@ -174,4 +181,4 @@ class EndToEndProtectionSet(Identifiable):
         return self.elements[short_name]
 
     def getEndToEndProtections(self) -> List[EndToEndProtection]:
-        return sorted(filter(lambda c: isinstance(c, EndToEndProtection), self.elements.values()), key= lambda e: e.short_name)
+        return sorted(filter(lambda c: isinstance(c, EndToEndProtection), self.elements.values()), key=lambda e: e.short_name)