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

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

@@ -72,14 +72,14 @@ class Frame(Identifiable, metaclass=ABCMeta):
         return self
 
     def createPduToFrameMapping(self, short_name: str) -> PduToFrameMapping:
-        if (short_name not in self.elements):
+        if not self.IsElementExists(short_name):
             mapping = PduToFrameMapping(self, short_name)
-            self.elements[short_name] = mapping
+            self.addElement(mapping)
             self.pduToFrameMappings.append(mapping)
-        return self.elements[short_name]
+        return self.getElement(short_name, PduToFrameMapping)
 
     def getPduToFrameMappings(self) -> List[PduToFrameMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, PduToFrameMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, PduToFrameMapping), self.elements), key=lambda o: o.short_name))
 
 
 class ContainedIPduProps(ARObject):
@@ -542,11 +542,11 @@ class NmPdu(Pdu):
         return self.iSignalToIPduMappings
 
     def createISignalToIPduMapping(self, short_name: str) -> ISignalToIPduMapping:
-        if (not self.IsElementExists(short_name)):
+        if not self.IsElementExists(short_name):
             mapping = ISignalToIPduMapping(self, short_name)
             self.addElement(mapping)
             self.iSignalToIPduMappings.append(mapping)
-        return self.getElement(short_name)
+        return self.getElement(short_name, ISignalToIPduMapping)
 
     def getNmDataInformation(self):
         return self.nmDataInformation
@@ -633,11 +633,11 @@ class ISignalIPdu(IPdu):
         return self.iSignalToPduMappings
 
     def createISignalToPduMappings(self, short_name: str) -> ISignalToIPduMapping:
-        if (short_name not in self.elements):
+        if not self.IsElementExists(short_name):
             mapping = ISignalToIPduMapping(self, short_name)
-            self.elements[short_name] = mapping
+            self.addElement(mapping)
             self.iSignalToPduMappings.append(mapping)
-        return self.elements[short_name]
+        return self.getElement(short_name, ISignalToIPduMapping)
 
     def getUnusedBitPattern(self):
         return self.unusedBitPattern
@@ -1219,7 +1219,7 @@ class SecureCommunicationPropsSet(Identifiable):
             props = SecureCommunicationAuthenticationProps(self, short_name)
             self.addElement(props)
             self.authenticationProps.append(props)
-        return self.getElement(short_name)
+        return self.getElement(short_name, SecureCommunicationAuthenticationProps)
 
     def getFreshnessProps(self):
         return self.freshnessProps
@@ -1229,4 +1229,4 @@ class SecureCommunicationPropsSet(Identifiable):
             props = SecureCommunicationFreshnessProps(self, short_name)
             self.addElement(props)
             self.freshnessProps.append(props)
-        return self.getElement(short_name)
+        return self.getElement(short_name, SecureCommunicationFreshnessProps)

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

@@ -82,7 +82,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self
 
     def getFrameTriggerings(self) -> List[FrameTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, FrameTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, FrameTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createCanFrameTriggering(self, short_name: str) -> CanFrameTriggering:
         if (short_name not in self.elements):
@@ -106,7 +106,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self.getElement(short_name)
 
     def getISignalTriggerings(self) -> List[ISignalTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, ISignalTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, ISignalTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createISignalTriggering(self, short_name: str):
         if (short_name not in self.elements):
@@ -122,7 +122,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self
     
     def getPduTriggerings(self) -> List[PduTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, PduTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, PduTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createPduTriggering(self, short_name: str):
         if (short_name not in self.elements):
@@ -268,16 +268,16 @@ class CommunicationCluster(FibexElement, metaclass=ABCMeta):
         return self
 
     def getPhysicalChannels(self) -> List[PhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, PhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, PhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def getCanPhysicalChannels(self) -> List[CanPhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, CanPhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, CanPhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def getLinPhysicalChannels(self) -> List[LinPhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements), 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()))
+        return list(sorted(filter(lambda a: isinstance(a, EthernetPhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def createCanPhysicalChannel(self, short_name: str):
         if (short_name not in self.elements):
@@ -441,16 +441,22 @@ class CommunicationController(Identifiable, metaclass=ABCMeta):
         return self
 
 
-class PncGatewayTypeEnum(Enum):
+class PncGatewayTypeEnum(AREnum):
     ENUM_ACTIVE = "active"
     ENUM_NONE = "none"
     ENUM_PASSIVE = "passive"
 
+    def __init__(self):
+        super().__init__([])
+
 
-class CommunicationDirectionType(Enum):
+class CommunicationDirectionType(AREnum):
     ENUM_IN = "in"
     ENUM_OUT = "out"
 
+    def __init__(self):
+        super().__init__([])
+
 
 class CommConnectorPort(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -618,7 +624,7 @@ class CommunicationConnector(Identifiable, metaclass=ABCMeta):
         return self
 
     def getEcuCommPortInstances(self):
-        return list(sorted(filter(lambda a: isinstance(a, CommConnectorPort), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, CommConnectorPort), self.elements), key=lambda o: o.getShortName()))
 
     def createFramePort(self, short_name) -> FramePort:
         if short_name not in self.elements:

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

@@ -104,7 +104,7 @@ class EcuInstance(FibexElement):
         return self
 
     def getCommControllers(self):
-        return list(sorted(filter(lambda a: isinstance(a, CommunicationController), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CommunicationController), self.elements), key= lambda o:o.short_name))
 
     def createCanCommunicationController(self, short_name: str) -> CanCommunicationController:
         if (not self.IsElementExists(short_name)):
@@ -131,7 +131,7 @@ class EcuInstance(FibexElement):
         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))
+        return list(sorted(filter(lambda a: isinstance(a, CommunicationConnector), self.elements), key= lambda o:o.short_name))
 
     def createCanCommunicationConnector(self, short_name: str) -> CanCommunicationConnector:
         if (not self.IsElementExists(short_name)):

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

@@ -392,13 +392,13 @@ class NmConfig(FibexElement):
         return self.getElement(short_name)
 
     def getCanNmClusters(self):                             # type: () -> List[CanNmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements), key= lambda o:o.short_name))
     
     def getUdpNmClusters(self):                             # type: () -> List[UdpNmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements), key= lambda o:o.short_name))
     
     def getNmClusters(self):                                # type: () -> List[NmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements), key= lambda o:o.short_name))
     
     def getNmClusterCouplings(self):
         return self.nmClusterCouplings
@@ -467,13 +467,13 @@ class NmCluster(Identifiable, metaclass=ABCMeta):
         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))
+        return list(sorted(filter(lambda a: isinstance(a, CanNmNode), self.elements), 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))
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmNode), self.elements), 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))
+        return list(sorted(filter(lambda a: isinstance(a, NmNode), self.elements), key= lambda o:o.short_name))
 
     def getNmNodeDetectionEnabled(self):
         return self.nmNodeDetectionEnabled

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

@@ -0,0 +1,35 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+
+
+class AppOsTaskProxyToEcuTaskProxyMapping(Identifiable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.appTaskProxyRef = None                         # type: RefType
+        self.ecuTaskProxyRef = None                         # type: RefType
+        self.offset = None                                  # type: RefType
+
+    def getAppTaskProxyRef(self):
+        return self.appTaskProxyRef
+
+    def setAppTaskProxyRef(self, value):
+        if value is not None:
+            self.appTaskProxyRef = value
+        return self
+
+    def getEcuTaskProxyRef(self):
+        return self.ecuTaskProxyRef
+
+    def setEcuTaskProxyRef(self, value):
+        if value is not None:
+            self.ecuTaskProxyRef = value
+        return self
+
+    def getOffset(self):
+        return self.offset
+
+    def setOffset(self, value):
+        if value is not None:
+            self.offset = value
+        return self

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

@@ -3,6 +3,7 @@ from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiabl
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
 
+
 class SwcToImplMapping(Identifiable):
     def __init__(self, parent, short_name):
         super().__init__(parent, short_name)
@@ -25,3 +26,27 @@ class SwcToImplMapping(Identifiable):
         if value is not None:
             self.componentImplementationRef = value
         return self
+
+
+class ApplicationPartitionToEcuPartitionMapping(Identifiable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.applicationPartitionRefs = []                      # type: List[RefType]
+        self.ecuPartitionRef = None                             # type: RefType
+
+    def getApplicationPartitionRefs(self):
+        return self.applicationPartitionRefs
+
+    def addApplicationPartitionRef(self, value):
+        if value is not None:
+            self.applicationPartitionRefs.append(value)
+        return self
+
+    def getEcuPartitionRef(self):
+        return self.ecuPartitionRef
+
+    def setEcuPartitionRef(self, value):
+        if value is not None:
+            self.ecuPartitionRef = value
+        return self

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

@@ -0,0 +1,83 @@
+from typing import List
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+
+
+class CryptoServiceMapping(Identifiable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+
+class SecOcCryptoServiceMapping(CryptoServiceMapping):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.authenticationRef = None                           # type: RefType
+        self.cryptoServiceKeyRef = None                         # type: RefType
+        self.cryptoServiceQueueRef = None                       # type: RefType
+
+    def getAuthenticationRef(self):
+        return self.authenticationRef
+
+    def setAuthenticationRef(self, value):
+        if value is not None:
+            self.authenticationRef = value
+        return self
+
+    def getCryptoServiceKeyRef(self):
+        return self.cryptoServiceKeyRef
+
+    def setCryptoServiceKeyRef(self, value):
+        if value is not None:
+            self.cryptoServiceKeyRef = value
+        return self
+
+    def getCryptoServiceQueueRef(self):
+        return self.cryptoServiceQueueRef
+
+    def setCryptoServiceQueueRef(self, value):
+        if value is not None:
+            self.cryptoServiceQueueRef = value
+        return self
+
+
+class TlsCryptoServiceMapping(CryptoServiceMapping):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.keyExchangeRef = None                                  # type: RefType
+        self.tlsCipherSuites = []                                   # type: List[TlsCryptoCipherSuite]
+        self.useClientAuthenticationRequest = None                  # type: Boolean
+        self.useSecurityExtensionRecordSizeLimit = None             # type: Boolean
+
+    def getKeyExchangeRef(self):
+        return self.keyExchangeRef
+
+    def setKeyExchangeRef(self, value):
+        if value is not None:
+            self.keyExchangeRef = value
+        return self
+
+    def getTlsCipherSuites(self):
+        return self.tlsCipherSuites
+
+    def addTlsCipherSuite(self, value):
+        if value is not None:
+            self.tlsCipherSuites.append(value)
+        return self
+
+    def getUseClientAuthenticationRequest(self):
+        return self.useClientAuthenticationRequest
+
+    def setUseClientAuthenticationRequest(self, value):
+        if value is not None:
+            self.useClientAuthenticationRequest = value
+        return self
+
+    def getUseSecurityExtensionRecordSizeLimit(self):
+        return self.useSecurityExtensionRecordSizeLimit
+
+    def setUseSecurityExtensionRecordSizeLimit(self, value):
+        if value is not None:
+            self.useSecurityExtensionRecordSizeLimit = value
+        return self

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

@@ -1,11 +1,15 @@
 from typing import List
 
+from ....M2.AUTOSARTemplates.SystemTemplate.DataMapping import DataMapping
+from ....M2.AUTOSARTemplates.SystemTemplate.SecureCommunication import CryptoServiceMapping
+from ....M2.AUTOSARTemplates.SystemTemplate.RteEventToOsTaskMapping import AppOsTaskProxyToEcuTaskProxyMapping
 from ....M2.AUTOSARTemplates.SystemTemplate.EcuResourceMapping import ECUMapping
 from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
-from ....M2.AUTOSARTemplates.SystemTemplate.SWmapping import SwcToImplMapping
+from ....M2.AUTOSARTemplates.SystemTemplate.SWmapping import ApplicationPartitionToEcuPartitionMapping, SwcToImplMapping
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, RefType, RevisionLabelString, TRefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ByteOrderEnum, PositiveInteger, RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RevisionLabelString, TRefType
 
 
 class SwcToEcuMapping(Identifiable):
@@ -46,34 +50,67 @@ class SwcToEcuMapping(Identifiable):
         return self
 
 
+class ComManagementMapping(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.comManagementGroupRefs = []            # type: List[RefType]
+        self.comManagementPortGroupRefs = []        # type: List[RefType]
+        self.physicalChannelRef = None              # type: RefType
+
+    def getComManagementGroupRefs(self):
+        return self.comManagementGroupRefs
+
+    def addComManagementGroupRef(self, value):
+        if value is not None:
+            self.comManagementGroupRefs.append(value)
+        return self
+
+    def getComManagementPortGroupRefs(self):
+        return self.comManagementPortGroupRefs
+
+    def addComManagementPortGroupRef(self, value):
+        if value is not None:
+            self.comManagementPortGroupRefs.append(value)
+        return self
+
+    def getPhysicalChannelRef(self):
+        return self.physicalChannelRef
+
+    def setPhysicalChannelRef(self, value):
+        if value is not None:
+            self.physicalChannelRef = value
+        return self
+
+
 class SystemMapping(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.applicationPartitionToEcuPartitionMappings = []
-        self.appOsTaskProxyToEcuTaskProxyMappings = []
-        self.comManagementMappings = []
-        self.cryptoServiceMappings = []
-        self.dataMappings = []
-        self.ddsISignalToTopicMappings = []
+        self.applicationPartitionToEcuPartitionMappings = []                            # type: List[ApplicationPartitionToEcuPartitionMapping]
+        self.appOsTaskProxyToEcuTaskProxyMappings = []                                  # type: List[AppOsTaskProxyToEcuTaskProxyMapping]
+        self.comManagementMappings = []                                                 # type: List[ComManagementMapping]
+        self.cryptoServiceMappings = []                                                 # type: List[CryptoServiceMapping]
+        self.dataMappings = []                                                          # type: List[DataMapping]
+        self.ddsISignalToTopicMappings = []                                             # type: List[DdsCpISignalToDdsTopicMapping]
         self.ecuResourceMappings = []                                                   # type: List[ECUMapping]
-        self.j1939ControllerApplicationToJ1939NmNodeMappings = []
-        self.mappingConstraints = []
-        self.pncMappings = []
-        self.portElementToComResourceMappings = []
-        self.resourceEstimations = []
-        self.resourceToApplicationPartitionMappings = []
-        self.rteEventSeparations = []
-        self.rteEventToOsTaskProxyMappings = []
-        self.signalPathConstraints = []
-        self.softwareClusterToApplicationPartitionMappings = []
-        self.softwareClusterToResourceMappings = []
-        self.swClusterMappings = []
-        self.swcToApplicationPartitionMappings = []
+        self.j1939ControllerApplicationToJ1939NmNodeMappings = []                       # type: List[J1939ControllerApplicationToJ1939NmNodeMapping]
+        self.mappingConstraints = []                                                    # type: List[MappingConstraint]
+        self.pncMappings = []                                                           # type: List[PncMapping]
+        self.portElementToComResourceMappings = []                                      # type: List[PortElementToCommunicationResourceMapping]
+        self.resourceEstimations = []                                                   # type: List[EcuResourceEstimation]
+        self.resourceToApplicationPartitionMappings = []                                # type: List[CpSoftwareClusterResourceToApplicationPartitionMapping]
+        self.rteEventSeparations = []                                                   # type: List[RteEventInSystemSeparation]
+        self.rteEventToOsTaskProxyMappings = []                                         # type: List[RteEventInSystemToOsTaskProxyMapping]
+        self.signalPathConstraints = []                                                 # type: List[SignalPathConstraint]
+        self.softwareClusterToApplicationPartitionMappings = []                         # type: List[CpSoftwareClusterToApplicationPartitionMapping]
+        self.softwareClusterToResourceMappings = []                                     # type: List[CpSoftwareClusterToResourceMapping]
+        self.swClusterMappings = []                                                     # type: List[CpSoftwareClusterToEcuInstanceMapping]
+        self.swcToApplicationPartitionMappings = []                                     # type: List[SwcToApplicationPartitionMapping]
         self.swImplMappings = []                                                        # type: List[SwcToImplMapping]
         self.swMappings = []                                                            # type: List[SwcToEcuMapping]
-        self.systemSignalGroupToComResourceMappings = []
-        self.systemSignalToComResourceMappings = []
+        self.systemSignalGroupToComResourceMappings = []                                # type: List[SystemSignalGroupToCommunicationResourceMapping]
+        self.systemSignalToComResourceMappings = []                                     # type: List[SystemSignalToCommunicationResourceMapping]
 
     def getApplicationPartitionToEcuPartitionMappings(self):
         return self.applicationPartitionToEcuPartitionMappings
@@ -232,7 +269,7 @@ class SystemMapping(Identifiable):
         return self.swMappings
     
     def getSwcToEcuMappings(self) -> List[SwcToEcuMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SwcToEcuMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SwcToEcuMapping), self.elements), key=lambda o: o.short_name))
 
     def createSwcToEcuMapping(self, short_name: str) -> SwcToEcuMapping:
         if short_name not in self.elements:
@@ -286,22 +323,37 @@ class RootSwCompositionPrototype(Identifiable):
         return self
 
 
+class J1939SharedAddressCluster(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.participatingJ1939ClusterRefs = []             # type: List[RefType]
+
+    def getParticipatingJ1939ClusterRefs(self):
+        return self.participatingJ1939ClusterRefs
+
+    def addParticipatingJ1939ClusterRef(self, value):
+        if value is not None:
+            self.participatingJ1939ClusterRefs.append(value)
+        return self
+
+
 class System(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.clientIdDefinitionSetRefs = []                 # type: List[RefType]
-        self.containerIPduHeaderByteOrder = None
-        self.ecuExtractVersion = None
+        self.containerIPduHeaderByteOrder = None            # type: ByteOrderEnum
+        self.ecuExtractVersion = None                       # type: RevisionLabelString
         self.fibexElements = []                             # type: List[RefType]
         self.interpolationRoutineMappingSetRefs = []        # type: List[RefType]
-        self.j1939SharedAddressClusters = []
+        self.j1939SharedAddressClusters = []                # type: List[J1939SharedAddressCluster]
         self.mappings = []                                  # type: List[SystemMapping]
         self.pncVectorLength = None                         # type: PositiveInteger
         self.pncVectorOffset = None                         # type: PositiveInteger
         self.rootSoftwareComposition = None                 # type: RootSwCompositionPrototype
-        self.swClusters = []
-        self.systemDocumentation = []
+        self.swClusterRefs = []                             # type: List[RefType]
+        self.systemDocumentation = []                       # type: Chapter
         self.systemVersion = None                           # type: RevisionLabelString
 
     def getClientIdDefinitionSetRefs(self):
@@ -349,16 +401,16 @@ class System(ARElement):
         return self
 
     def getMappings(self) -> List[SystemMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements), key=lambda o: o.short_name))
     
     def getSystemMappings(self) -> List[SystemMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements), key=lambda o: o.short_name))
 
     def createSystemMapping(self, short_name) -> SystemMapping:
-        if (short_name not in self.elements):
+        if not self.IsElementExists(short_name):
             mapping = SystemMapping(self, short_name)
-            self.elements[short_name] = mapping
-        return self.elements[short_name]
+            self.addElement(mapping)
+        return self.getElement(short_name, SystemMapping)
     
     def getPncVectorLength(self):
         return self.pncVectorLength
@@ -384,11 +436,11 @@ class System(ARElement):
             self.rootSoftwareComposition = prototype
         return self.getElement(short_name)
 
-    def getSwClusters(self):
-        return self.swClusters
+    def getSwClusterRefs(self):
+        return self.swClusterRefs
 
-    def addSwClusters(self, value):
-        self.swClusters.append(value)
+    def addSwClusterRef(self, value):
+        self.swClusterRefs.append(value)
         return self
 
     def getSystemDocumentation(self):