armodel 1.7.2__py3-none-any.whl → 1.7.4__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/ServiceInstances.py

@@ -1,9 +1,71 @@
 from typing import List
+
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetCommunication import SocketConnection, SocketConnectionBundle
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, PositiveInteger, RefType, TimeValue
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses import Identifiable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-'''
+class ApplicationEndpoint(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.consumedServiceInstances = []                      # type: List[ConsumedServiceInstance]
+        self.maxNumberOfConnections = None                      # type: PositiveInteger
+        self.networkEndpointRef = None                          # type: RefType
+        self.priority = None                                    # type: PositiveInteger
+        self.providedServiceInstances = []                      # type: List[ProvidedServiceInstance]
+        self.tlsCryptoMappingRef = None                         # type: RefType
+        self.tpConfiguration = None                             # type: TransportProtocolConfiguration
+
+    def getConsumedServiceInstances(self):
+        return self.consumedServiceInstances
+
+    def addConsumedServiceInstance(self, value):
+        self.consumedServiceInstances.append(value)
+        return self
+
+    def getMaxNumberOfConnections(self):
+        return self.maxNumberOfConnections
+
+    def setMaxNumberOfConnections(self, value):
+        self.maxNumberOfConnections = value
+        return self
+
+    def getNetworkEndpointRef(self):
+        return self.networkEndpointRef
+
+    def setNetworkEndpointRef(self, value):
+        self.networkEndpointRef = value
+        return self
+
+    def getPriority(self):
+        return self.priority
+
+    def setPriority(self, value):
+        self.priority = value
+        return self
+
+    def getProvidedServiceInstances(self):
+        return self.providedServiceInstances
+
+    def addProvidedServiceInstance(self, value):
+        self.providedServiceInstances.append(value)
+        return self
+
+    def getTlsCryptoMappingRef(self):
+        return self.tlsCryptoMappingRef
+
+    def setTlsCryptoMappingRef(self, value):
+        self.tlsCryptoMappingRef = value
+        return self
+
+    def getTpConfiguration(self):
+        return self.tpConfiguration
+
+    def setTpConfiguration(self, value):
+        self.tpConfiguration = value
+        return self
+
 class SocketAddress(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -18,7 +80,7 @@ class SocketAddress(Identifiable):
         self.pathMtuDiscoveryEnabled = None         # type: Boolean
         self.pduCollectionMaxBufferSize = None      # type: PositiveInteger
         self.pduCollectionTimeout = None            # type: TimeValue
-        self.staticSocketConnections = []            # type: List[StaticSocketConnection]
+        self.staticSocketConnections = []           # type: List[StaticSocketConnection]
         self.udpChecksumHandling = None             # type: UdpChecksumCalculationEnum
 
     def getAllowedIPv6ExtHeadersRef(self):
@@ -104,13 +166,40 @@ class SocketAddress(Identifiable):
     def setUdpChecksumHandling(self, value):
         self.udpChecksumHandling = value
         return self
-'''
 
 class SoAdConfig(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.connection = None                      # type: SocketConnection
-        self.connectionBundle = None                # type: SocketConnectionBundle
-        self.socketAddress = None                   # type: SocketAddress
+        self.connections = []                               # type: List[SocketConnection]
+        self.connectionBundles = []                         # type: List[SocketConnectionBundle]
+        self.socketAddresses = []                           # type: List[SocketAddress]
+
+    def getConnections(self):
+        return self.connections
+
+    def setConnections(self, value):
+        self.connections = value
+        return self
+
+    def getConnectionBundles(self):
+        return self.connectionBundles
+    
+    def createSocketConnectionBundle(self, short_name:str) -> SocketConnectionBundle:
+        bundle = SocketConnectionBundle(self, short_name)
+        self.connectionBundles.append(bundle)
+        return bundle
+
+    def setConnectionBundles(self, value):
+        self.connectionBundles = value
+        return self
+
+    def getSocketAddresses(self):
+        return self.socketAddresses
+
+    def createSocketAddress(self, short_name:str) -> SocketAddress:
+        address = SocketAddress(self, short_name)
+        self.socketAddresses.append(address)
+        return address
+
 

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py

@@ -2,13 +2,15 @@ from abc import ABCMeta
 from enum import Enum
 from typing import List
 
+
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, Boolean, PositiveInteger, RefType, ARLiteral, TimeValue
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from ......M2.AUTOSARTemplates.SWComponentTemplate.Communication import HandleInvalidEnum
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, Boolean, PositiveInteger, RefType, ARLiteral, TimeValue
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import NetworkEndpoint
 
 class PhysicalChannel (Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -80,7 +82,39 @@ class CanPhysicalChannel(AbstractCanPhysicalChannel):
 
 class LinPhysicalChannel(PhysicalChannel):
     def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name) 
+        super().__init__(parent, short_name)
+
+class EthernetPhysicalChannel(PhysicalChannel):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.networkEndpoints = []                              # type: List[NetworkEndpoint]
+        self.soAdConfig = None                                  # type: SoAdConfig
+        self.vlan = None                                        # type: VlanConfig
+
+    def getNetworkEndpoints(self):
+        return self.networkEndpoints
+
+    def createNetworkEndPoint(self, short_name:str) -> NetworkEndpoint:
+        if (short_name not in self.elements):
+            end_point = NetworkEndpoint(self, short_name)
+            self.addElement(end_point)
+            self.networkEndpoints.append(end_point)
+        return self.getElement(short_name)
+
+    def getSoAdConfig(self):
+        return self.soAdConfig
+
+    def setSoAdConfig(self, value):
+        self.soAdConfig = value
+        return self
+
+    def getVlan(self):
+        return self.vlan
+
+    def setVlan(self, value):
+        self.vlan = value
+        return self         
 
 class CommunicationCluster(FibexElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -109,6 +143,9 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
     def getLinPhysicalChannels(self) -> List[LinPhysicalChannel]:
         return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements.values()), key= lambda o:o.getShortName()))
     
+    def getEthernetPhysicalChannels(self) -> List[EthernetPhysicalChannel]:
+        return list(sorted(filter(lambda a: isinstance(a, EthernetPhysicalChannel), self.elements.values()), key= lambda o:o.getShortName()))
+    
     def createCanPhysicalChannel(self, short_name: str):
         if (short_name not in self.elements):
             channel = CanPhysicalChannel(self, short_name)
@@ -120,6 +157,12 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
             channel = LinPhysicalChannel(self, short_name)
             self.addElement(channel)
         return self.getElement(short_name)
+    
+    def createEthernetPhysicalChannel(self, short_name: str):
+        if (short_name not in self.elements):
+            channel = EthernetPhysicalChannel(self, short_name)
+            self.addElement(channel)
+        return self.getElement(short_name)
 
     def getProtocolName(self):
         return self.protocolName

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/EcuInstance.py

@@ -1,4 +1,5 @@
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, RefType, TimeValue
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology import EthernetCommunicationConnector, EthernetCommunicationController
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
@@ -105,17 +106,29 @@ class EcuInstance(FibexElement):
     def createCanCommunicationController(self, short_name: str) -> CanCommunicationController:
         if (short_name not in self.elements):
             controller = CanCommunicationController(self, short_name)
-            self.elements[short_name] = controller
-        return self.elements[short_name]
+            self.addElement(controller)
+        return self.getElement(short_name)
+    
+    def createEthernetCommunicationController(self, short_name: str) -> EthernetCommunicationController:
+        if (short_name not in self.elements):
+            controller = EthernetCommunicationController(self, short_name)
+            self.addElement(controller)
+        return self.getElement(short_name)
 
     def getConnectors(self):
         return list(sorted(filter(lambda a: isinstance(a, CommunicationConnector), self.elements.values()), key= lambda o:o.short_name))
 
     def createCanCommunicationConnector(self, short_name: str) -> CanCommunicationConnector:
         if (short_name not in self.elements):
-            controller = CanCommunicationConnector(self, short_name)
-            self.elements[short_name] = controller
-        return self.elements[short_name]
+            connector = CanCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
+    
+    def createEthernetCommunicationConnector(self, short_name: str) -> EthernetCommunicationConnector:
+        if (short_name not in self.elements):
+            connector = EthernetCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
 
     def getDltConfig(self):
         return self.dltConfig

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/Timing.py

@@ -1,3 +1,4 @@
+from typing import List
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, RefType, TimeValue
@@ -109,8 +110,7 @@ class TransmissionModeTiming(ARObject):
         super().__init__()
 
         self.cyclicTiming = None                                # type: CyclicTiming
-        # type: EventControlledTiming
-        self.eventControlledTiming = None
+        self.eventControlledTiming = None                       # type: EventControlledTiming
 
     def getCyclicTiming(self):
         return self.cyclicTiming
@@ -130,16 +130,11 @@ class TransmissionModeDeclaration(ARObject):
     def __init__(self):
         super().__init__()
 
-        # type: ModeDrivenTransmissionModeCondition
-        self.modeDrivenFalseConditions = []
-        # type: ModeDrivenTransmissionModeCondition
-        self.modeDrivenTrueConditions = []
-        # type: TransmissionModeCondition
-        self.transmissionModeConditions = []
-        # type: TransmissionModeTiming
-        self.transmissionModeFalseTiming = None
-        # type: TransmissionModeTiming
-        self.transmissionModeTrueTiming = None
+        self.modeDrivenFalseConditions = []                         # type: List[ModeDrivenTransmissionModeCondition]
+        self.modeDrivenTrueConditions = []                          # type: List[ModeDrivenTransmissionModeCondition]
+        self.transmissionModeConditions = []                        # typeL List[TransmissionModeCondition]
+        self.transmissionModeFalseTiming = None                     # type: TransmissionModeTiming
+        self.transmissionModeTrueTiming = None                      # type: TransmissionModeTiming
 
     def getModeDrivenFalseConditions(self):
         return self.modeDrivenFalseConditions

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/AsamHdo/ComputationMethod.py

@@ -87,7 +87,6 @@ class CompuConstTextContent(CompuConstContent):
         return self
 
 class CompuConstNumericContent(CompuConstContent):
-
     def __init__(self):
         super().__init__()
 
@@ -99,6 +98,22 @@ class CompuConstNumericContent(CompuConstContent):
     def setV(self, value):
         self.v = value
         return self
+    
+class CompuConstFormulaContent(CompuConstContent):
+    def __init__(self):
+        super().__init__()
+
+        self.vf = None
+
+    def getVf(self):
+        return self.vf
+
+    def setVf(self, value):
+        self.vf = value
+        return self
+
+
+
 
 class CompuScaleContents(ARObject, metaclass=ABCMeta):
     def __init__(self):

armodel/models/M2/MSR/CalibrationData/CalibrationValue.py

@@ -1,4 +1,6 @@
 from typing import List
+
+from ....M2.MSR.AsamHdo.Units import SingleLanguageUnitNames
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
 from ....M2.MSR.DataDictionary.DataDefProperties import ValueList
@@ -21,6 +23,35 @@ class SwValueCont(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.sw_arraysize = None         # type: ValueList
-        self.unit_ref = None             # type: RefType
-        self.sw_values_phys = None        # type: SwValues
+        self.swArraysize = None             # type: ValueList
+        self.swValuesPhys = None            # type: SwValues
+        self.unitRef = None                 # type: RefType
+        self.unitDisplayName = None         # type: SingleLanguageUnitNames
+
+    def getSwArraysize(self):
+        return self.swArraysize
+
+    def setSwArraysize(self, value):
+        self.swArraysize = value
+        return self
+
+    def getSwValuesPhys(self):
+        return self.swValuesPhys
+
+    def setSwValuesPhys(self, value):
+        self.swValuesPhys = value
+        return self
+
+    def getUnitRef(self):
+        return self.unitRef
+
+    def setUnitRef(self, value):
+        self.unitRef = value
+        return self
+
+    def getUnitDisplayName(self):
+        return self.unitDisplayName
+
+    def setUnitDisplayName(self, value):
+        self.unitDisplayName = value
+        return self

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

@@ -296,6 +296,13 @@ class ValueList(ARObject):
         self.v = None                                       # type: ARFloat
         self._vf = []                                       # type: List[ARLiteral]
 
+    def getV(self):
+        return self.v
+
+    def setV(self, value):
+        self.v = value
+        return self
+
     def addVf(self, vf: ARLiteral):
         self._vf.append(vf)
 

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

@@ -0,0 +1,33 @@
+from ....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ArgumentDirectionEnum
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+
+class SwServiceArg(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.direction = None                   # type: ArgumentDirectionEnum
+        self.swArraysize = None                 # type: ValueList
+        self.swDataDefProps = None              # type: SwDataDefProps
+
+    def getDirection(self):
+        return self.direction
+
+    def setDirection(self, value):
+        self.direction = value
+        return self
+
+    def getSwArraysize(self):
+        return self.swArraysize
+
+    def setSwArraysize(self, value):
+        self.swArraysize = value
+        return self
+
+    def getSwDataDefProps(self):
+        return self.swDataDefProps
+
+    def setSwDataDefProps(self, value):
+        self.swDataDefProps = value
+        return self

armodel/models/__init__.py

@@ -22,11 +22,14 @@ from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
 from .M2.AUTOSARTemplates.CommonStructure.Filter import *
+from .M2.AUTOSARTemplates.CommonStructure.FlatMap import *
 from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
 from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
 from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
 from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.HeapUsage import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
@@ -57,6 +60,9 @@ 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.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

@@ -133,6 +133,7 @@ class AbstractARXMLParser:
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
+            self.readARObjectAttributes(child_element, float_value)
             float_value.setValue(child_element.text)
         return float_value
     
@@ -162,7 +163,9 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if (literal == None):
+        if literal == None:
+            return None
+        if literal.getText() == "":
             return None
         bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
@@ -175,19 +178,6 @@ class AbstractARXMLParser:
             return int(m.group(1), 16)
         return int(value)
 
-    '''
-    def getChildElementNumberValue(self, short_name: str, element: ET.Element, key: str) -> int:
-        value = self.getChildElement(short_name, element, key)
-        return self._convertStringToNumberValue(value)
-    
-
-    def getChildElementOptionalNumberValue(self, element: ET.Element, key: str) -> int:
-        value = self.getChildElementOptionalValue(element, key)
-        if (value == None):
-            return None
-        return self._convertStringToNumberValue(value)
-    '''
-    
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
         if child_element == None: