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

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

@@ -1,14 +1,11 @@
 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.PrimitiveTypes import ARFloat, Boolean, PositiveInteger, PositiveUnlimitedInteger, 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.Fibex4Lin.LinCommunication import LinFrameTriggering, LinScheduleTable
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import NetworkEndpoint
 
@@ -84,6 +81,41 @@ class LinPhysicalChannel(PhysicalChannel):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.busIdleTimeoutPeriod = None                        # type: TimeValue
+        # type: List[LinScheduleTable]
+        self.scheduleTables = []
+
+    def getBusIdleTimeoutPeriod(self):
+        return self.busIdleTimeoutPeriod
+
+    def setBusIdleTimeoutPeriod(self, value):
+        if value is not None:
+            self.busIdleTimeoutPeriod = value
+        return self
+
+    def getScheduleTables(self):
+        return self.scheduleTables
+
+    def createLinScheduleTable(self, short_name:str) -> LinScheduleTable:
+        if (short_name not in self.elements):
+            end_point = LinScheduleTable(self, short_name)
+            self.addElement(end_point)
+            self.scheduleTables.append(end_point)
+        return self.getElement(short_name)
+    
+class VlanConfig(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.vlanIdentifier = None                              # type: PositiveInteger
+
+    def getVlanIdentifier(self):
+        return self.vlanIdentifier
+
+    def setVlanIdentifier(self, value):
+        if value is not None:
+            self.vlanIdentifier = value
+        return self
 class EthernetPhysicalChannel(PhysicalChannel):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -112,9 +144,12 @@ class EthernetPhysicalChannel(PhysicalChannel):
     def getVlan(self):
         return self.vlan
 
-    def setVlan(self, value):
-        self.vlan = value
-        return self         
+    def createVlanConfig(self, short_name: str) -> VlanConfig:
+        if (short_name not in self.elements):
+            config = VlanConfig(self, short_name)
+            self.vlan = config
+            self.addElement(config)
+        return self.getElement(short_name)  
 
 class CommunicationCluster(FibexElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -176,8 +211,58 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
 
     def setProtocolVersion(self, value):
         self.protocolVersion = value
-        return self      
+        return self
     
+class CanClusterBusOffRecovery(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.borCounterL1ToL2 = None                            # type: PositiveInteger
+        self.borTimeL1 = None                                   # type: TimeValue
+        self.borTimeL2 = None                                   # type: TimeValue
+        self.borTimeTxEnsured = None                            # type: TimeValue
+        self.mainFunctionPeriod = None                          # type: TimeValue
+
+    def getBorCounterL1ToL2(self):
+        return self.borCounterL1ToL2
+
+    def setBorCounterL1ToL2(self, value):
+        if value is not None:
+            self.borCounterL1ToL2 = value
+        return self
+
+    def getBorTimeL1(self):
+        return self.borTimeL1
+
+    def setBorTimeL1(self, value):
+        if value is not None:
+            self.borTimeL1 = value
+        return self
+
+    def getBorTimeL2(self):
+        return self.borTimeL2
+
+    def setBorTimeL2(self, value):
+        if value is not None:
+            self.borTimeL2 = value
+        return self
+
+    def getBorTimeTxEnsured(self):
+        return self.borTimeTxEnsured
+
+    def setBorTimeTxEnsured(self, value):
+        if value is not None:
+            self.borTimeTxEnsured = value
+        return self
+
+    def getMainFunctionPeriod(self):
+        return self.mainFunctionPeriod
+
+    def setMainFunctionPeriod(self, value):
+        if value is not None:
+            self.mainFunctionPeriod = value
+        return self
+
 class AbstractCanCluster(CommunicationCluster, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == AbstractCanCluster:
@@ -185,10 +270,10 @@ class AbstractCanCluster(CommunicationCluster, metaclass = ABCMeta):
         
         super().__init__(parent, short_name)
 
-        self.busOffRecovery = None
-        self.canFdBaudrate = None
-        self.canXlBaudrate = None
-        self.speed = None
+        self.busOffRecovery = None                              # type: CanClusterBusOffRecovery
+        self.canFdBaudrate = None                               # type: PositiveUnlimitedInteger
+        self.canXlBaudrate = None                               # type: PositiveUnlimitedInteger
+        self.speed = None                                       # type: PositiveUnlimitedInteger
 
     def getBusOffRecovery(self):
         return self.busOffRecovery
@@ -257,15 +342,15 @@ class CommConnectorPort(Identifiable, metaclass = ABCMeta):
             raise NotImplementedError("CommConnectorPort is an abstract class.")
         
         super().__init__(parent, short_name)
+        
+        self.communicationDirection = None                                                  # type: CommunicationDirectionType
 
-        # type: CommunicationDirectionType
-        self.communicationDirection = None
-
-    def getCommunicationDirection(self) -> CommunicationDirectionType:
+    def getCommunicationDirection(self):
         return self.communicationDirection
 
-    def setCommunicationDirection(self, value: CommunicationDirectionType):
-        self.communicationDirection = value
+    def setCommunicationDirection(self, value):
+        if value is not None:
+            self.communicationDirection = value
         return self
 
 
@@ -280,9 +365,9 @@ class IPduSignalProcessingEnum(Enum):
 class IPduPort(CommConnectorPort):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
-
-        # type: IPduSignalProcessingEnum
-        self.iPduSignalProcessing = None
+        
+        self.iPduSignalProcessing = None                                # type: IPduSignalProcessingEnum
+        self.keyId = None                                               # type: PositiveInteger
         self.rxSecurityVerification = None                              # type: Boolean
         self.timestampRxAcceptanceWindow = None                         # type: TimeValue
         self.useAuthDataFreshness = None                                # type: Boolean
@@ -291,68 +376,90 @@ class IPduPort(CommConnectorPort):
         return self.iPduSignalProcessing
 
     def setIPduSignalProcessing(self, value):
-        self.iPduSignalProcessing = value
+        if value is not None:
+            self.iPduSignalProcessing = value
+        return self
+
+    def getKeyId(self):
+        return self.keyId
+
+    def setKeyId(self, value):
+        if value is not None:
+            self.keyId = value
         return self
 
     def getRxSecurityVerification(self):
         return self.rxSecurityVerification
 
     def setRxSecurityVerification(self, value):
-        self.rxSecurityVerification = value
+        if value is not None:
+            self.rxSecurityVerification = value
         return self
 
     def getTimestampRxAcceptanceWindow(self):
         return self.timestampRxAcceptanceWindow
 
     def setTimestampRxAcceptanceWindow(self, value):
-        self.timestampRxAcceptanceWindow = value
+        if value is not None:
+            self.timestampRxAcceptanceWindow = value
         return self
 
     def getUseAuthDataFreshness(self):
         return self.useAuthDataFreshness
 
     def setUseAuthDataFreshness(self, value):
-        self.useAuthDataFreshness = value
+        if value is not None:
+            self.useAuthDataFreshness = value
         return self
 
 class ISignalPort(CommConnectorPort):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        # type: DataFilter
-        self.dataFilter = None
+        self.dataFilter = None                                          # type: DataFilter
         self.ddsQosProfileRef = None                                    # type: RefType
-        # type: TimeValue
-        self.firstTimeout = None
-        # type: HandleInvalidEnum
-        self.handleInvalid = None
+        self.firstTimeout = None                                        # type: TimeValue
+        self.handleInvalid = None                                       # type: HandleInvalidEnum
+        self.timeout = None                                             # type: TimeValue
 
     def getDataFilter(self):
         return self.dataFilter
 
     def setDataFilter(self, value):
-        self.dataFilter = value
+        if value is not None:
+            self.dataFilter = value
         return self
 
     def getDdsQosProfileRef(self):
         return self.ddsQosProfileRef
 
     def setDdsQosProfileRef(self, value):
-        self.ddsQosProfileRef = value
+        if value is not None:
+            self.ddsQosProfileRef = value
         return self
 
     def getFirstTimeout(self):
         return self.firstTimeout
 
     def setFirstTimeout(self, value):
-        self.firstTimeout = value
+        if value is not None:
+            self.firstTimeout = value
         return self
 
     def getHandleInvalid(self):
         return self.handleInvalid
 
     def setHandleInvalid(self, value):
-        self.handleInvalid = value
+        if value is not None:
+            self.handleInvalid = value
+        return self
+
+    def getTimeout(self):
+        return self.timeout
+
+    def setTimeout(self, value):
+        if value is not None:
+            self.timeout = value
         return self
 
 class CommunicationConnector(Identifiable, metaclass = ABCMeta):

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

@@ -4,6 +4,7 @@ from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication i
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationConnector, CommunicationController
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinTopology import LinCommunicationConnector, LinMaster
 from typing import List
 
 class EcuInstance(FibexElement):
@@ -114,6 +115,12 @@ class EcuInstance(FibexElement):
             controller = EthernetCommunicationController(self, short_name)
             self.addElement(controller)
         return self.getElement(short_name)
+    
+    def createLinMaster(self, short_name: str) -> LinMaster:
+        if (short_name not in self.elements):
+            controller = LinMaster(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))
@@ -129,6 +136,12 @@ class EcuInstance(FibexElement):
             connector = EthernetCommunicationConnector(self, short_name)
             self.addElement(connector)
         return self.getElement(short_name)
+    
+    def createLinCommunicationConnector(self, short_name: str) -> LinCommunicationConnector:
+        if (short_name not in self.elements):
+            connector = LinCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
 
     def getDltConfig(self):
         return self.dltConfig

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,83 @@
+from abc import ABCMeta
+from typing import List
+
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-class CanTpConfig(FibexElement):
+class TpConfig(FibexElement, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == ARObject:
+            raise NotImplementedError("ARObject is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+        self.communicationClusterRef = None                                 # type: RefType
+
+    def getCommunicationClusterRef(self):
+        return self.communicationClusterRef
+
+    def setCommunicationClusterRef(self, value):
+        if value is not None:
+            self.communicationClusterRef = value
+        return self
+
+
+class CanTpConfig(TpConfig):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+class DoIpTpConfig(TpConfig):
     def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
+        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
+
+class LinTpConfig(TpConfig):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.tpAddresses = []                                       # type: List[TpAddress]
+        self.tpConnections = []                                     # type: List[LinTpConnection]
+        self.tpNodes = []                                           # type: List[LinTpNode]
+
+    def getTpAddresses(self):
+        return self.tpAddresses
+
+    def addTpAddress(self, value):
+        if value is not None:
+            self.tpAddresses.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
+
+    def getTpNodes(self):
+        return self.tpNodes
+
+    def setTpNode(self, value):
+        if value is not None:
+            self.tpNodes.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,12 @@ class System(ARElement):
         return self
 
     def getFibexElementRefs(self):
+        #return sorted(self.fibexElements, key= lambda i: i.getShortValue())
         return self.fibexElements
 
     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/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,6 +61,7 @@ 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 *