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

armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcBswMapping.py

@@ -14,22 +14,64 @@ class SwcBswRunnableMapping(ARObject):
         '''
         super().__init__()
 
-        self.bswEntityRef   = None        # type: RefType
+        self.bswEntityRef = None        # type: RefType
         self.swcRunnableRef = None        # type: RefType
 
+    def getBswEntityRef(self):
+        return self.bswEntityRef
+
+    def setBswEntityRef(self, value):
+        self.bswEntityRef = value
+        return self
+
+    def getSwcRunnableRef(self):
+        return self.swcRunnableRef
+
+    def setSwcRunnableRef(self, value):
+        self.swcRunnableRef = value
+        return self
 
 class SwcBswMapping(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.bswBehaviorRef = None              # type: RefType
-        self._runnableMappings = []
+        self.runnableMappings = []              # type: List[SwcBswRunnableMapping]
         self.swcBehaviorRef = None              # type: RefType
         self.synchronizedModeGroups = []
         self.synchronizedTriggers = []
 
-    def addRunnableMapping(self, mapping: SwcBswRunnableMapping):
-        self._runnableMappings.append(mapping)
+    def getBswBehaviorRef(self):
+        return self.bswBehaviorRef
+
+    def setBswBehaviorRef(self, value):
+        self.bswBehaviorRef = value
+        return self
+
+    def getRunnableMappings(self):
+        return self.runnableMappings
+
+    def addRunnableMapping(self, value):
+        self.runnableMappings.append(value)
+        return self
+
+    def getSwcBehaviorRef(self):
+        return self.swcBehaviorRef
+
+    def setSwcBehaviorRef(self, value):
+        self.swcBehaviorRef = value
+        return self
+
+    def getSynchronizedModeGroups(self):
+        return self.synchronizedModeGroups
+
+    def setSynchronizedModeGroups(self, value):
+        self.synchronizedModeGroups = value
+        return self
+
+    def getSynchronizedTriggers(self):
+        return self.synchronizedTriggers
 
-    def getRunnableMappings(self) -> List[SwcBswRunnableMapping]:
-        return self._runnableMappings
+    def setSynchronizedTriggers(self, value):
+        self.synchronizedTriggers = value
+        return self

armodel/models/M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py

@@ -42,7 +42,7 @@ class AnyInstanceRef(ARObject):
         super().__init__()
 
         self.baseRef = None                             # type: RefType
-        self.contextElementRef = None                   # type: RefType
+        self.contextElementRefs = []                    # type: List[RefType]
         self.targetRef = None                           # type: RefType
 
     def getBaseRef(self) -> RefType:
@@ -52,11 +52,11 @@ class AnyInstanceRef(ARObject):
         self.baseRef = value
         return self
 
-    def getContextElementRef(self) -> RefType:
-        return self.contextElementRef
+    def getContextElementRefs(self) -> List[RefType]:
+        return self.contextElementRefs
 
-    def setContextElementRef(self, value: RefType):
-        self.contextElementRef = value
+    def addContextElementRef(self, value: RefType):
+        self.contextElementRefs.append(value)
         return self
 
     def getTargetRef(self) -> RefType:

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py

@@ -1,7 +1,5 @@
 from typing import Dict, List
 
-
-
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Identifier, RefType, ReferrableSubtypesEnum
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
 from .....M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
@@ -16,6 +14,7 @@ from .....M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
 from .....M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
 from .....M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 from .....M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
+from .....M2.AUTOSARTemplates.CommonStructure.FlatMap import FlatMap
 from .....M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Identifiable, Referrable
@@ -34,7 +33,7 @@ from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcIm
 from .....M2.AUTOSARTemplates.CommonStructure import ConstantSpecification
 from .....M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from .....M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucModuleConfigurationValues, EcucValueCollection
-from .....M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerInterface, ModeSwitchInterface, ParameterInterface, SenderReceiverInterface, TriggerInterface
+from .....M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerInterface, ModeSwitchInterface, ParameterInterface, PortInterfaceMappingSet, SenderReceiverInterface, TriggerInterface
 from .....M2.AUTOSARTemplates.SystemTemplate import System
 from .....M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import NmConfig
 from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
@@ -189,6 +188,12 @@ class ARPackage(Identifiable, CollectableElement):
             set = LifeCycleInfoSet(self, short_name)
             self.addElement(set)
         return self.getElement(short_name)
+    
+    def createFlatMap(self, short_name: str) -> FlatMap:
+        if (short_name not in self.elements):
+            set = FlatMap(self, short_name)
+            self.addElement(set)
+        return self.getElement(short_name)
 
     def createClientServerInterface(self, short_name: str) -> ClientServerInterface:
         if (short_name not in self.elements):
@@ -459,6 +464,18 @@ class ARPackage(Identifiable, CollectableElement):
             element = System(self, short_name)
             self.addElement(element)
         return self.getElement(short_name)
+    
+    def createFlatMap(self, short_name: str) -> FlatMap:
+        if (short_name not in self.elements):
+            map = FlatMap(self, short_name)
+            self.addElement(map)
+        return self.getElement(short_name)
+    
+    def createPortInterfaceMappingSet(self, short_name: str) -> PortInterfaceMappingSet:
+        if (short_name not in self.elements):
+            map = PortInterfaceMappingSet(self, short_name)
+            self.addElement(map)
+        return self.getElement(short_name)
 
     def getApplicationPrimitiveDataTypes(self) -> List[ApplicationPrimitiveDataType]:
         return list(sorted(filter(lambda a: isinstance(a, ApplicationPrimitiveDataType), self.elements.values()), key= lambda o:o.short_name))

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py

@@ -13,6 +13,7 @@ class Referrable(ARObject, metaclass = ABCMeta):
 
         if type(self) == Referrable:
             raise NotImplementedError("Referrable is an abstract class.")
+        
         ARObject.__init__(self)
 
         self.parent = parent
@@ -61,6 +62,7 @@ class CollectableElement(ARObject, metaclass = ABCMeta):
     def __init__(self):
         if type(self) == CollectableElement:
             raise NotImplementedError("CollectableElement is an abstract class.")
+        
         self.elements = {}              # type: dict[str, Referrable]
 
     def getTotalElement(self) -> int:
@@ -87,6 +89,7 @@ class Identifiable(MultilanguageReferrable, CollectableElement, metaclass = ABCM
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == Identifiable:
             raise NotImplementedError("Identifiable is an abstract class.")
+        
         MultilanguageReferrable.__init__(self, parent, short_name)
         CollectableElement.__init__(self)
 

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py

@@ -340,6 +340,35 @@ class Identifier(ARLiteral):
     def __init__(self):
         super().__init__()
 
+class CIdentifier(ARLiteral):
+    '''
+        This datatype represents a string, that follows the rules of C-identifiers.
+        
+        Tags:
+            * xml.xsd.customType=C-IDENTIFIER
+            * xml.xsd.pattern=[a-zA-Z_][a-zA-Z0-9_]*
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+        self.blueprintValue = None
+        self.namePattern = None
+
+    def getBlueprintValue(self):
+        return self.blueprintValue
+
+    def setBlueprintValue(self, value):
+        self.blueprintValue = value
+        return self
+
+    def getNamePattern(self):
+        return self.namePattern
+
+    def setNamePattern(self, value):
+        self.namePattern = value
+        return self
+
 class RevisionLabelString(ARLiteral):
     '''
         This primitive represents an internal AUTOSAR revision label which identifies an engineering object. It
@@ -404,4 +433,29 @@ class RefType(ARObject):
 
 class TRefType(RefType):
     def __init__(self):
-        super().__init__()
+        super().__init__()
+
+class DiagRequirementIdString(ARLiteral):
+    '''
+        This string denotes an Identifier for a requirement.
+
+        Tags:
+            * xml.xsd.customType=DIAG-REQUIREMENT-ID-STRING
+            * xml.xsd.pattern=[0-9a-zA-Z_\-]+
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+
+class ArgumentDirectionEnum(AREnum):
+    IN  = "in"
+    INOUT = "inout"
+    OUT = "out"
+
+    def __init__(self):
+        super().__init__((
+            ArgumentDirectionEnum.IN,
+            ArgumentDirectionEnum.INOUT,
+            ArgumentDirectionEnum.OUT  
+        ))

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

@@ -62,9 +62,22 @@ class CompositeNetworkRepresentation(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.leaf_element_iref = None           # type: ApplicationCompositeElementInPortInterfaceInstanceRef
-        self.network_representation = None      # type: SwDataDefProps
+        self.leafElementIRef = None                 # type: ApplicationCompositeElementInPortInterfaceInstanceRef
+        self.networkRepresentation = None           # type: SwDataDefProps
 
+    def getLeafElementIRef(self):
+        return self.leafElementIRef
+
+    def setLeafElementIRef(self, value):
+        self.leafElementIRef = value
+        return self
+
+    def getNetworkRepresentation(self):
+        return self.networkRepresentation
+
+    def setNetworkRepresentation(self, value):
+        self.networkRepresentation = value
+        return self
 
 class TransmissionAcknowledgementRequest(ARObject):
     def __init__(self):
@@ -205,7 +218,10 @@ class ReceiverComSpec(RPortComSpec):
         self.compositeNetworkRepresentations = []       # type: List[CompositeNetworkRepresentation]
         self.dataElementRef = None                      # type: RefType
         self.networkRepresentation = None               # type: SwDataDefProps
-        self.handleOutOfRange = None                    # type: ARLiteral
+        self.handleOutOfRange = None                    # type: HandleOutOfRangeEnum
+        self.handleOutOfRangeStatus = None              # type: HandleOutOfRangeStatusEnum
+        self.maxDeltaCounterInit = None                 # type: PositiveInteger
+        self.maxNoNewOrRepeatedData = None              # type: PositiveInteger
         self.usesEndToEndProtection = None              # type: ARBoolean     
 
     def getDataElementRef(self):
@@ -228,6 +244,28 @@ class ReceiverComSpec(RPortComSpec):
     def setHandleOutOfRange(self, value):
         self.handleOutOfRange = value
         return self
+    
+    def getHandleOutOfRangeStatus(self):
+        return self.handleOutOfRangeStatus
+
+    def setHandleOutOfRangeStatus(self, value):
+        self.handleOutOfRangeStatus = value
+        return self
+
+    def getMaxDeltaCounterInit(self):
+        return self.maxDeltaCounterInit
+
+    def setMaxDeltaCounterInit(self, value):
+        self.maxDeltaCounterInit = value
+        return self
+
+    def getMaxNoNewOrRepeatedData(self):
+        return self.maxNoNewOrRepeatedData
+
+    def setMaxNoNewOrRepeatedData(self, value):
+        self.maxNoNewOrRepeatedData = value
+        return self
+
 
     def getUsesEndToEndProtection(self):
         return self.usesEndToEndProtection

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

@@ -87,7 +87,7 @@ class AbstractProvidedPortPrototype(PortPrototype):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.provided_com_specs = []  # type: List[PPortComSpec]
+        self.providedComSpecs = []                  # type: List[PPortComSpec]
 
     def _validateRPortComSpec(self, com_spec: PPortComSpec):
         if isinstance(com_spec, NonqueuedSenderComSpec):
@@ -108,20 +108,20 @@ class AbstractProvidedPortPrototype(PortPrototype):
 
     def addProvidedComSpec(self, com_spec):
         self._validateRPortComSpec(com_spec)
-        self.provided_com_specs.append(com_spec)
+        self.providedComSpecs.append(com_spec)
 
     def getProvidedComSpecs(self) -> List[PPortComSpec]:
-        return self.provided_com_specs
+        return self.providedComSpecs
 
     def getNonqueuedSenderComSpecs(self) -> List[NonqueuedSenderComSpec]:
-        return filter(lambda c: isinstance(c, NonqueuedSenderComSpec), self.provided_com_specs)
+        return filter(lambda c: isinstance(c, NonqueuedSenderComSpec), self.providedComSpecs)
 
 
 class AbstractRequiredPortPrototype(PortPrototype):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self.required_com_specs = []  # type: List[RPortComSpec]
+        self.requiredComSpecs = []                          # type: List[RPortComSpec]
 
     def _validateRPortComSpec(self, com_spec: RPortComSpec):
         if (isinstance(com_spec, ClientComSpec)):
@@ -145,16 +145,16 @@ class AbstractRequiredPortPrototype(PortPrototype):
 
     def addRequiredComSpec(self, com_spec: RPortComSpec):
         self._validateRPortComSpec(com_spec)
-        self.required_com_specs.append(com_spec)
+        self.requiredComSpecs.append(com_spec)
 
     def getRequiredComSpecs(self) -> List[RPortComSpec]:
-        return self.required_com_specs
+        return self.requiredComSpecs
 
     def getClientComSpecs(self) -> List[ClientComSpec]:
-        return filter(lambda c: isinstance(c, ClientComSpec), self.required_com_specs)
+        return filter(lambda c: isinstance(c, ClientComSpec), self.requiredComSpecs)
 
     def getNonqueuedReceiverComSpecs(self) -> List[NonqueuedReceiverComSpec]:
-        return filter(lambda c: isinstance(c, NonqueuedReceiverComSpec), self.required_com_specs)
+        return filter(lambda c: isinstance(c, NonqueuedReceiverComSpec), self.requiredComSpecs)
 
 
 class PPortPrototype(AbstractProvidedPortPrototype):
@@ -190,6 +190,35 @@ class RPortPrototype(AbstractRequiredPortPrototype):
     def setRequiredInterfaceTRef(self, value):
         self.requiredInterfaceTRef = value
         return self
+    
+class PRPortPrototype(PortPrototype):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.providedComSpecs = []                          # type: List[PPortComSpec]
+        self.requiredComSpecs = []                          # type: List[RPortComSpec]
+        self.providedRequiredInterface = None               # type: TRefType
+
+    def getProvidedComSpecs(self):
+        return self.providedComSpecs
+
+    def addProvidedComSpec(self, value):
+        self.providedComSpecs.append(value)
+        return self
+
+    def getRequiredComSpecs(self):
+        return self.requiredComSpecs
+
+    def addRequiredComSpec(self, value):
+        self.requiredComSpecs.append(value)
+        return self
+
+    def getProvidedRequiredInterface(self):
+        return self.providedRequiredInterface
+
+    def setProvidedRequiredInterface(self, value):
+        self.providedRequiredInterface = value
+        return self
 
 class PortGroup(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -215,16 +244,22 @@ class SwComponentType(ARElement, metaclass = ABCMeta):
         super().__init__(parent, short_name)
 
     def createPPortPrototype(self, short_name: str) -> PPortPrototype:
-        prototype = PPortPrototype(self, short_name)
         if (short_name not in self.elements):
-            self.elements[short_name] = prototype
-        return self.elements[short_name]
+            prototype = PPortPrototype(self, short_name)
+            self.addElement(prototype)
+        return self.getElement(short_name)
 
     def createRPortPrototype(self, short_name) -> RPortPrototype:
-        prototype = RPortPrototype(self, short_name)
         if (short_name not in self.elements):
-            self.elements[short_name] = prototype
-        return self.elements[short_name]
+            prototype = RPortPrototype(self, short_name)
+            self.addElement(prototype)
+        return self.getElement(short_name)
+    
+    def createPRPortPrototype(self, short_name) -> PRPortPrototype:
+        if (short_name not in self.elements):
+            prototype = PRPortPrototype(self, short_name)
+            self.addElement(prototype)
+        return self.getElement(short_name)
     
     def createPortGroup(self, short_name) -> PortGroup:
         port_group = PortGroup(self, short_name)
@@ -238,6 +273,9 @@ class SwComponentType(ARElement, metaclass = ABCMeta):
     def getRPortPrototypes(self) -> List[RPortPrototype]:
         return list(sorted(filter(lambda c: isinstance(c, RPortPrototype), self.elements.values()), key= lambda o: o.short_name))
     
+    def getPRPortPrototypes(self) -> List[PRPortPrototype]:
+        return list(sorted(filter(lambda c: isinstance(c, PRPortPrototype), self.elements.values()), key= lambda o: o.short_name))
+    
     def getPortPrototypes(self) -> List[PortPrototype]:
         return list(sorted(filter(lambda c: isinstance(c, PortPrototype), self.elements.values()), key= lambda o: o.short_name))
     

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

@@ -34,9 +34,17 @@ class AssemblySwConnector(SwConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.mappingRef = None          # type: RefType
         self.providerIRef = None        # type: PPortInCompositionInstanceRef
         self.requesterIRef = None       # type: RPortInCompositionInstanceRef
 
+    def getMappingRef(self):
+        return self.mappingRef
+
+    def setMappingRef(self, value):
+        self.mappingRef = value
+        return self
+
     def getProviderIRef(self) -> PPortInCompositionInstanceRef:
         return self.providerIRef
 

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py

@@ -81,25 +81,40 @@ class ApplicationRecordDataType(ApplicationCompositeDataType):
 class DataTypeMap(ARObject):
     def __init__(self):
 
-        self.application_data_type_ref = None       # type: RefType
-        self.implementation_data_type_ref = None    # type: RefType
+        self.applicationDataTypeRef = None                  # type: RefType
+        self.implementationDataTypeRef = None               # type: RefType
 
+    def getApplicationDataTypeRef(self):
+        return self.applicationDataTypeRef
+
+    def setApplicationDataTypeRef(self, value):
+        self.applicationDataTypeRef = value
+        return self
+
+    def getImplementationDataTypeRef(self):
+        return self.implementationDataTypeRef
+
+    def setImplementationDataTypeRef(self, value):
+        self.implementationDataTypeRef = value
+        return self
 
 class DataTypeMappingSet(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-        self._dataTypeMaps = []                     # type: List[DataTypeMap]
-        self._modeRequestTypeMaps = []              # type: List[ModeRequestTypeMap]
+        self.dataTypeMaps = []                              # type: List[DataTypeMap]
+        self.modeRequestTypeMaps = []                       # type: List[ModeRequestTypeMap]
 
     def addDataTypeMap(self, type_map: DataTypeMap):
-        self._dataTypeMaps.append(type_map)
+        self.dataTypeMaps.append(type_map)
+        return self
 
     def getDataTypeMaps(self) -> List[DataTypeMap]:
-        return self._dataTypeMaps
+        return self.dataTypeMaps
 
     def addModeRequestTypeMap(self, map: ModeRequestTypeMap):
-        self._modeRequestTypeMaps.append(map)
+        self.modeRequestTypeMaps.append(map)
+        return self
 
     def getModeRequestTypeMaps(self) -> List[ModeRequestTypeMap]:
-        return self._modeRequestTypeMaps
+        return self.modeRequestTypeMaps