armodel 1.7.3__py3-none-any.whl → 1.7.5__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/SystemTemplate/NetworkManagement.py

@@ -3,7 +3,7 @@ from typing import List
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import RxIdentifierRange
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType, ARBoolean
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, Integer, PositiveInteger, RefType, ARBoolean, TimeValue
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class NmClusterCoupling(ARObject, metaclass = ABCMeta):
@@ -210,7 +210,7 @@ class NmCluster(Identifiable, metaclass=ABCMeta):
         self.communicationClusterRef = None
         self.nmChannelId = None
         self.nmChannelSleepMaster = None
-        self._nmNodes = []                       # type: List[NmNode]
+        self.nmNodes = []                       # type: List[NmNode]
         self.nmNodeDetectionEnabled = None
         self.nmNodeIdEnabled = None
         self.nmPncParticipation = None
@@ -240,14 +240,24 @@ class NmCluster(Identifiable, metaclass=ABCMeta):
 
     def createCanNmNode(self, short_name: str) -> CanNmNode:
         if (short_name not in self.elements):
-            cluster = CanNmNode(self, short_name)
-            self.elements[short_name] = cluster
-            self._nmNodes.append(cluster)
-        return self.elements[short_name]
+            node = CanNmNode(self, short_name)
+            self.addElement(node)
+            self.nmNodes.append(node)
+        return self.getElement(short_name)
+    
+    def readUdpNmNode(self, short_name: str) -> UdpNmNode:
+        if (short_name not in self.elements):
+            node = UdpNmNode(self, short_name)
+            self.addElement(node)
+            self.nmNodes.append(node)
+        return self.getElement(short_name)
     
     def getCanNmNodes(self) -> List[CanNmNode]:
         return list(sorted(filter(lambda a: isinstance(a, CanNmNode), self.elements.values()), key= lambda o:o.short_name))
     
+    def getUdpNmNodes(self) -> List[UdpNmNode]:
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmNode), self.elements.values()), key= lambda o:o.short_name))
+    
     def getNmNodes(self) -> List[NmNode]:
         return list(sorted(filter(lambda a: isinstance(a, NmNode), self.elements.values()), key= lambda o:o.short_name))
 
@@ -514,10 +524,7 @@ class NmEcu(Identifiable):
 
     def setNmUserDataEnabled(self, value):
         self.nmUserDataEnabled = value
-        return self
-
-
-    
+        return self   
 
 class NmConfig(FibexElement):
     def __init__(self, parent: ARObject, short_name: str):
@@ -529,12 +536,21 @@ class NmConfig(FibexElement):
     def createCanNmCluster(self, short_name: str) -> CanNmCluster:
         if (short_name not in self.elements):
             cluster = CanNmCluster(self, short_name)
-            self.elements[short_name] = cluster
-        return self.elements[short_name]
+            self.addElement(cluster)
+        return self.getElement(short_name)
     
+    def createUdpNmCluster(self, short_name: str) -> UdpNmCluster:
+        if (short_name not in self.elements):
+            cluster = UdpNmCluster(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+
     def getCanNmClusters(self) -> List[CanNmCluster]:
         return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements.values()), key= lambda o:o.short_name))
     
+    def getUdpNmClusters(self) -> List[UdpNmCluster]:
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements.values()), key= lambda o:o.short_name))
+    
     def getNmClusters(self) -> List[NmCluster]:
         return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements.values()), key= lambda o:o.short_name))
     
@@ -550,4 +566,110 @@ class NmConfig(FibexElement):
 
     def addNmIfEcus(self, value):
         self.nmIfEcus.append(value)
-        return self
+        return self
+    
+class UdpNmCluster(NmCluster):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.nmCbvPosition = None                           # type: Integer
+        self.nmImmediateNmCycleTime = None                  # type: TimeValue
+        self.nmImmediateNmTransmissions = None              # type: PositiveInteger
+        self.nmMessageTimeoutTime = None                    # type: TimeValue
+        self.nmMsgCycleTime = None                          # type: TimeValue
+        self.nmNetworkTimeout = None                        # type: TimeValue
+        self.nmNidPosition = None                           # type: Integer
+        self.nmRemoteSleepIndicationTime = None             # type: TimeValue
+        self.nmRepeatMessageTime = None                     # type: TimeValue
+        self.nmWaitBusSleepTime = None                      # type: TimeValue
+        self.vlanRef = None                                 # type: RefType
+
+    def getNmCbvPosition(self):
+        return self.nmCbvPosition
+
+    def setNmCbvPosition(self, value):
+        if value is not None:
+            self.nmCbvPosition = value
+        return self
+
+    def getNmImmediateNmCycleTime(self):
+        return self.nmImmediateNmCycleTime
+
+    def setNmImmediateNmCycleTime(self, value):
+        if value is not None:
+            self.nmImmediateNmCycleTime = value
+        return self
+
+    def getNmImmediateNmTransmissions(self):
+        return self.nmImmediateNmTransmissions
+
+    def setNmImmediateNmTransmissions(self, value):
+        if value is not None:
+            self.nmImmediateNmTransmissions = value
+        return self
+
+    def getNmMessageTimeoutTime(self):
+        return self.nmMessageTimeoutTime
+
+    def setNmMessageTimeoutTime(self, value):
+        if value is not None:
+            self.nmMessageTimeoutTime = value
+        return self
+
+    def getNmMsgCycleTime(self):
+        return self.nmMsgCycleTime
+
+    def setNmMsgCycleTime(self, value):
+        if value is not None:
+            self.nmMsgCycleTime = value
+        return self
+
+    def getNmNetworkTimeout(self):
+        return self.nmNetworkTimeout
+
+    def setNmNetworkTimeout(self, value):
+        if value is not None:
+            self.nmNetworkTimeout = value
+        return self
+
+    def getNmNidPosition(self):
+        return self.nmNidPosition
+
+    def setNmNidPosition(self, value):
+        if value is not None:
+            self.nmNidPosition = value
+        return self
+
+    def getNmRemoteSleepIndicationTime(self):
+        return self.nmRemoteSleepIndicationTime
+
+    def setNmRemoteSleepIndicationTime(self, value):
+        if value is not None:
+            self.nmRemoteSleepIndicationTime = value
+        return self
+
+    def getNmRepeatMessageTime(self):
+        return self.nmRepeatMessageTime
+
+    def setNmRepeatMessageTime(self, value):
+        if value is not None:
+            self.nmRepeatMessageTime = value
+        return self
+
+    def getNmWaitBusSleepTime(self):
+        return self.nmWaitBusSleepTime
+
+    def setNmWaitBusSleepTime(self, value):
+        if value is not None:
+            self.nmWaitBusSleepTime = value
+        return self
+
+    def getVlanRef(self):
+        return self.vlanRef
+
+    def setVlanRef(self, value):
+        if value is not None:
+            self.vlanRef = value
+        return self
+
+        

armodel/models/M2/AUTOSARTemplates/SystemTemplate/TransportProtocols.py

@@ -1,6 +1,30 @@
+from typing import List
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class CanTpConfig(FibexElement):
     def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
+        super().__init__(parent, short_name)
+
+class DoIpTpConfig(FibexElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.doIpLogicAddresses = []                                # type: List[DoIpLogicAddress]
+        self.tpConnections = []                                     # typeL List[DoIpTpConnection]
+
+    def getDoIpLogicAddresses(self):
+        return self.doIpLogicAddresses
+
+    def addDoIpLogicAddress(self, value):
+        if value is not None:
+            self.doIpLogicAddresses.append(value)
+        return self
+
+    def getTpConnections(self):
+        return self.tpConnections
+
+    def addTpConnection(self, value):
+        if value is not None:
+            self.tpConnections.append(value)
+        return self

armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py

@@ -277,7 +277,7 @@ class System(ARElement):
         self.clientIdDefinitionSetRefs = []                 # type: List[RefType]
         self.containerIPduHeaderByteOrder = None
         self.ecuExtractVersion = None
-        self.fibexElements = []
+        self.fibexElements = []                             # type: List[RefType]
         self.interpolationRoutineMappingSetRefs = []        # type: List[RefType]
         self.j1939SharedAddressClusters = []
         self.mappings = []                                  # type: List[SystemMapping]
@@ -310,10 +310,11 @@ class System(ARElement):
         return self
 
     def getFibexElementRefs(self):
-        return self.fibexElements
+        return sorted(self.fibexElements, key= lambda i: i.getShortValue())
 
     def addFibexElementRef(self, value):
-        self.fibexElements.append(value)
+        if value is not None:
+            self.fibexElements.append(value)
         return self
 
     def getInterpolationRoutineMappingSetRefs(self):

armodel/models/M2/MSR/AsamHdo/BaseTypes.py

@@ -71,7 +71,6 @@ class BaseType(ARElement, metaclass=ABCMeta):
         self.baseTypeDefinition = value
         return self
 
-
 class SwBaseType(BaseType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/M2/MSR/DataDictionary/RecordLayout.py

@@ -114,7 +114,7 @@ class SwRecordLayoutGroup(ARObject):
         self.shortLabel = None                          # type: ARLiteral
         self.swGenericAxisParamTypeRef = None           # type: RefType
         self.swRecordLayoutComponent = None             # type: ARLiteral
-        self.swRecordLayoutGroupAxis = None             # type: ARNumerical
+        self.swRecordLayoutGroupAxis = None             # type: AxisIndexType
         self.swRecordLayoutGroupContentType = None      # type: SwRecordLayoutGroupContent
         self.swRecordLayoutGroupFrom = None             # type: ARLiteral
         self.swRecordLayoutGroupIndex = None            # type: ARLiteral

armodel/models/__init__.py

@@ -34,6 +34,7 @@ from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
 from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
+from .M2.AUTOSARTemplates.DiagnosticExtract.DiagnosticContribution import *
 from .M2.AUTOSARTemplates.SWComponentTemplate import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.Communication import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.Components import *
@@ -52,6 +53,7 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall imp
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
 from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.DiagnosticConnection import *
 from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
 from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
 from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
@@ -59,7 +61,11 @@ from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *

armodel/parser/abstract_arxml_parser.py

@@ -154,12 +154,14 @@ class AbstractARXMLParser:
             time_value.setValue(child_element.text)
         return time_value
 
+    '''
     def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementLiteral(short_name, element, key)
         bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.value = self._convertStringToBooleanValue(literal._value)
         return bool_value
+    '''
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)