armodel 1.6.1__py3-none-any.whl → 1.6.3__py3-none-any.whl

armodel/models/{m2/autosar_templates/sw_component_template/components → M2/AUTOSARTemplates/SWComponentTemplate/Components}/__init__.py

@@ -1,14 +1,16 @@
+from . import *
+
 from abc import ABCMeta
 from typing import List
 
-
-
-from .....ar_ref import RefType, TRefType
-from .....general_structure import ARElement, Identifiable
-from .....ar_object import ARBoolean, ARObject
-from ...common_structure.implementation import ImplementationProps
-from ..communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
-from .instance_refs import InnerPortGroupInCompositionInstanceRef
+from ...CommonStructure.Implementation import ImplementationProps
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, RefType
+from ..Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
+from .InstanceRefs import InnerPortGroupInCompositionInstanceRef
 
 class SymbolProps(ImplementationProps):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/{m2/autosar_templates/sw_component_template/composition/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Composition/InstanceRefs.py}

@@ -1,8 +1,8 @@
 
 from abc import ABCMeta
 
-from .....ar_ref import RefType
-from ...generic_structure.abstract_structure import AtpInstanceRef
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ...GenericStructure.AbstractStructure import AtpInstanceRef
 
 
 class PortInCompositionTypeInstanceRef(AtpInstanceRef, metaclass = ABCMeta):

armodel/models/{m2/autosar_templates/sw_component_template/composition → M2/AUTOSARTemplates/SWComponentTemplate/Composition}/__init__.py

@@ -1,11 +1,11 @@
 from abc import ABCMeta
 from typing import List
 
-from ..components import SwComponentType
-from ..composition.instance_refs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef, RPortInCompositionInstanceRef
-from .....ar_ref import RefType
-from .....ar_object import ARObject
-from .....general_structure import Identifiable
+from ..Components import SwComponentType
+from .InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef, RPortInCompositionInstanceRef
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 
 class SwComponentPrototype(Identifiable):

armodel/models/{m2/autosar_templates/sw_component_template/data_type/data_prototypes.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/DataPrototypes.py}

@@ -1,10 +1,12 @@
 from abc import ABCMeta
 
-from .....ar_object import ARNumerical
-from .....ar_ref import RefType
-from ....msr.data_dictionary.data_def_properties import SwDataDefProps
-from ...common_structure import ValueSpecification
-from .....general_structure import AtpFeature, ARObject
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, TRefType
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from ...CommonStructure import ValueSpecification
+from ...GenericStructure.AbstractStructure import AtpFeature
 
 class AtpPrototype(AtpFeature, metaclass = ABCMeta):
     def __init__(self, parent:ARObject, short_name: str):
@@ -36,7 +38,7 @@ class AutosarDataPrototype(DataPrototype, metaclass = ABCMeta):
 
         super().__init__(parent, short_name)
 
-        self.typeTRef = None           
+        self.typeTRef = None                # type:     TRefType
 
     def getTypeTRef(self):
         return self.typeTRef
@@ -76,7 +78,7 @@ class ApplicationCompositeElementDataPrototype(DataPrototype, metaclass = ABCMet
 
 
 class ApplicationArrayElement(ApplicationCompositeElementDataPrototype):
-    def __init__(self, parent:ARObject, short_name: str):
+    def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.arraySizeHandling = None               # type: str
@@ -84,6 +86,22 @@ class ApplicationArrayElement(ApplicationCompositeElementDataPrototype):
         self.indexDataTypeRef = None                # type: RefType
         self.maxNumberOfElements = None             # type: ARNumerical
 
+    def setArraySizeHandling(self, handling: str):
+        self.arraySizeHandling = handling
+        return self
+    
+    def setArraySizeSemantics(self, semantics: str):
+        self.arraySizeSemantics = semantics
+        return self
+    
+    def setIndexDataTypeRef(self, ref: RefType):
+        self.indexDataTypeRef = ref
+        return self
+    
+    def setMaxNumberOfElements(self, number: ARNumerical):
+        self.maxNumberOfElements = number
+        return self
+    
 class ApplicationRecordElement(ApplicationCompositeElementDataPrototype):
     def __init__(self, parent:ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/{datatype.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py}

@@ -1,46 +1,12 @@
-from abc import ABCMeta
 from typing import List
-
-from .ar_object import ARLiteral, ARNumerical
-from .ar_ref import RefType
-from .general_structure import ARElement, ARObject
-from .m2.autosar_templates.sw_component_template.data_type.data_prototypes import ApplicationCompositeElementDataPrototype, ApplicationRecordElement
-from .common_structure import ModeRequestTypeMap
-
-class BaseTypeDefinition(ARObject):
-    def __init__(self):
-        super().__init__()
-    
-class BaseTypeDirectDefinition(BaseTypeDefinition):
-    def __init__(self):
-        super().__init__()
-
-        self.base_type_encoding = None
-        self.base_type_size = None                  # type: ARNumerical
-        self.byteOrder = None                       # type: str
-        self.mem_alignment = None                   # type: ARNumerical
-        self.native_declaration = None      
-
-class BaseType(ARElement, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == BaseType:
-            raise NotImplementedError("BaseType is an abstract class.")
-
-        super().__init__(parent, short_name)
-
-        self.baseTypeDefinition = BaseTypeDirectDefinition()
-
-class SwBaseType(BaseType):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-class AtpType(ARElement, metaclass=ABCMeta):
-    def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == AtpType:
-            raise NotImplementedError("AtpType is an abstract class.")
-
-        super().__init__(parent, short_name)
-
+from ...CommonStructure.ModeDeclaration import ModeRequestTypeMap
+from ...GenericStructure.AbstractStructure import AtpType
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
+from ...SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationRecordElement
+from ....MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from abc import ABCMeta
 
 class AutosarDataType(AtpType, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -58,6 +24,7 @@ class AutosarDataType(AtpType, metaclass = ABCMeta):
         self.swDataDefProps = value
         return self
 
+
 class ApplicationDataType(AutosarDataType, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == ApplicationDataType:
@@ -78,30 +45,6 @@ class ApplicationCompositeDataType(ApplicationDataType, metaclass=ABCMeta):
 
         super().__init__(parent, short_name)
 
-class ApplicationArrayElement(ApplicationCompositeElementDataPrototype):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.arraySizeHandling = None               # type: str
-        self.arraySizeSemantics = None              # type: str
-        self.indexDataTypeRef = None                # type: RefType
-        self.maxNumberOfElements = None             # type: ARNumerical
-
-    def setArraySizeHandling(self, handling: str):
-        self.arraySizeHandling = handling
-        return self
-    
-    def setArraySizeSemantics(self, semantics: str):
-        self.arraySizeSemantics = semantics
-        return self
-    
-    def setIndexDataTypeRef(self, ref: RefType):
-        self.indexDataTypeRef = ref
-        return self
-    
-    def setMaxNumberOfElements(self, number: ARNumerical):
-        self.maxNumberOfElements = number
-        return self
 
 class ApplicationArrayDataType(ApplicationCompositeDataType):
     def __init__(self, parent: ARObject, short_name: str):
@@ -116,7 +59,8 @@ class ApplicationArrayDataType(ApplicationCompositeDataType):
             self.elements[short_name] = array_element
             self.element = self.elements[short_name]
         return self.elements[short_name]
-    
+
+
 class ApplicationRecordDataType(ApplicationCompositeDataType):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -134,17 +78,17 @@ class ApplicationRecordDataType(ApplicationCompositeDataType):
         return self.record_elements
 
 
-
-
 class DataTypeMap(ARObject):
     def __init__(self):
+
         self.application_data_type_ref = None       # type: RefType
         self.implementation_data_type_ref = None    # type: RefType
 
+
 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]
 
@@ -153,11 +97,9 @@ class DataTypeMappingSet(ARElement):
 
     def getDataTypeMaps(self) -> List[DataTypeMap]:
         return self._dataTypeMaps
-    
+
     def addModeRequestTypeMap(self, map: ModeRequestTypeMap):
         self._modeRequestTypeMaps.append(map)
 
     def getModeRequestTypeMaps(self) -> List[ModeRequestTypeMap]:
-        return self._modeRequestTypeMaps
-    
-
+        return self._modeRequestTypeMaps

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

@@ -0,0 +1 @@
+from . import *

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

@@ -0,0 +1,177 @@
+from ..GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, NameToken, PositiveInteger, RefType
+from ..SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
+from typing import List
+
+class EndToEndDescription(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.category = None                # type: NameToken
+        self.counterOffset = None           # type: PositiveInteger
+        self.crcOffset = None               # type: PositiveInteger
+        self.dataIds = []                   # type: List[PositiveInteger]
+        self.dataIdMode = None              # type: PositiveInteger
+        self.dataIdNibbleOffset = None      # type: PositiveInteger
+        self.dataLength = None              # type: PositiveInteger
+        self.maxDeltaCounterInit = None     # type: PositiveInteger
+        self.maxNoNewOrRepeatedData = None  # type: int
+        self.syncCounterInit = None         # type: PositiveInteger
+
+    def getCategory(self):
+        return self.category
+
+    def setCategory(self, value):
+        self.category = value
+        return self
+
+    def getCounterOffset(self):
+        return self.counterOffset
+
+    def setCounterOffset(self, value):
+        self.counterOffset = value
+        return self
+
+    def getCrcOffset(self):
+        return self.crcOffset
+
+    def setCrcOffset(self, value):
+        self.crcOffset = value
+        return self
+
+    def getDataIds(self) -> List[PositiveInteger]:
+        return sorted(self.dataIds, key = lambda a: a)
+
+    def addDataId(self, id: PositiveInteger):
+        self.dataIds.append(id)
+        return self
+
+    def getDataIdMode(self):
+        return self.dataIdMode
+
+    def setDataIdMode(self, value):
+        self.dataIdMode = value
+        return self
+
+    def getDataIdNibbleOffset(self):
+        return self.dataIdNibbleOffset
+
+    def setDataIdNibbleOffset(self, value):
+        self.dataIdNibbleOffset = value
+        return self
+
+    def getDataLength(self):
+        return self.dataLength
+
+    def setDataLength(self, value):
+        self.dataLength = 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 getSyncCounterInit(self):
+        return self.syncCounterInit
+
+    def setSyncCounterInit(self, value):
+        self.syncCounterInit = value
+        return self
+
+
+class EndToEndProtectionVariablePrototype(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self._receiverIRefs = []            # type: List[VariableDataPrototypeInSystemInstanceRef]
+        self.senderIRef = None             # type: VariableDataPrototypeInSystemInstanceRef
+        self.shortLabel = None              # type: str
+
+    def addReceiverIref(self, iref: VariableDataPrototypeInSystemInstanceRef):
+        self._receiverIRefs.append(iref)
+
+    def getReceiverIrefs(self) -> List[VariableDataPrototypeInSystemInstanceRef]:
+        return self._receiverIRefs
+
+class EndToEndProtectionISignalIPdu(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.dataOffset = None                              # type: Integer
+        self.iSignalGroupRef = None                         # type: RefType
+        self.iSignalIPduRef = None                          # type: RefType
+
+    def getDataOffset(self):
+        return self.dataOffset
+
+    def setDataOffset(self, value):
+        self.dataOffset = value
+        return self
+
+    def getISignalGroupRef(self):
+        return self.iSignalGroupRef
+
+    def setISignalGroupRef(self, value):
+        self.iSignalGroupRef = value
+        return self
+
+    def getISignalIPduRef(self):
+        return self.iSignalIPduRef
+
+    def setISignalIPduRef(self, value):
+        self.iSignalIPduRef = value
+        return self
+
+
+class EndToEndProtection(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.endToEndProfile = None                         # type: EndToEndDescription
+        self.endToEndProtectionISignalIPdus = []            # type: List[EndToEndProtectionISignalIPdu]
+        self.endToEndProtectionVariablePrototypes = []      # type: List[EndToEndProtectionVariablePrototype]
+
+    def getEndToEndProfile(self):
+        return self.endToEndProfile
+
+    def setEndToEndProfile(self, value):
+        self.endToEndProfile = value
+        return self
+
+    def getEndToEndProtectionISignalIPdus(self):
+        return self.endToEndProtectionISignalIPdus
+
+    def addEndToEndProtectionISignalIPdu(self, value):
+        self.endToEndProtectionISignalIPdus.append(value)
+        return self
+
+    def getEndToEndProtectionVariablePrototypes(self) -> List[EndToEndProtectionVariablePrototype]:
+        return self.endToEndProtectionVariablePrototypes
+    
+    def addEndToEndProtectionVariablePrototype(self, prototype: EndToEndProtectionVariablePrototype):
+        self.endToEndProtectionVariablePrototypes.append(prototype)
+
+
+class EndToEndProtectionSet(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+    def createEndToEndProtection(self, short_name: str) -> EndToEndProtection:
+        if (short_name not in self.elements):
+            protection = EndToEndProtection(self, short_name)
+            self.elements[short_name] = protection
+        return self.elements[short_name]
+
+    def getEndToEndProtections(self) -> List[EndToEndProtection]:
+        return sorted(filter(lambda c: isinstance(c, EndToEndProtection), self.elements.values()), key= lambda e: e.short_name)

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

@@ -0,0 +1,11 @@
+from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ..CommonStructure.Implementation import Implementation
+
+class SwcImplementation(Implementation):
+    def __init__(self, parent: ARObject, short_name: str) -> None:
+        super().__init__(parent, short_name)
+
+        self.behavior_ref = None                        # type: RefType
+        self.per_instance_memory_size = None
+        self.required_rte_vendor = ""

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/access_count.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/AccessCount.py}

@@ -1,7 +1,7 @@
 from abc import ABCMeta
 
-from .....general_structure import Identifiable
-from .....ar_object import ARObject
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class AbstractAccessPoint(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/data_elements.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py}

@@ -1,8 +1,10 @@
-from .....general_structure import Identifiable
-from .....ar_object import ARLiteral, ARObject
-from ....msr.data_dictionary.data_def_properties import SwDataDefProps
-from ..swc_internal_behavior.instance_refs_usage import AutosarParameterRef, AutosarVariableRef
-from .access_count import AbstractAccessPoint
+from ....AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import AbstractAccessPoint
+from ....AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef
+from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....MSR.DataDictionary.DataDefProperties import SwDataDefProps
+
 class ParameterAccess(AbstractAccessPoint):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/IncludedDataTypes.py

@@ -0,0 +1,24 @@
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
+from typing import List
+
+class IncludedDataTypeSet(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.data_type_refs = []            # type: List[RefType]
+        self.literal_prefix = None          # type: ARLiteral
+
+    def addDataTypeRef(self, ref_type: RefType):
+        self.data_type_refs.append(ref_type)
+
+    def getDataTypeRefs(self) -> List[RefType]:
+        return self.data_type_refs
+
+    @property
+    def literalPrefix(self) -> ARLiteral:
+        return self.literal_prefix
+
+    @literalPrefix.setter
+    def literalPrefix(self, value: ARLiteral):
+        self.literal_prefix = value

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/instance_refs_usage.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py}

@@ -1,8 +1,8 @@
 from typing import List
 
-from .....ar_object import ARObject
-from .....ar_ref import RefType
-from ...generic_structure.abstract_structure import AtpInstanceRef
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ...GenericStructure.AbstractStructure import AtpInstanceRef
 
 class ArVariableInImplementationDataInstanceRef(AtpInstanceRef):
     def __init__(self):

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/mode_declaration_group.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py}

@@ -1,7 +1,7 @@
-from .access_count import AbstractAccessPoint
-from ..components.instance_refs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
+from .AccessCount import AbstractAccessPoint
+from ..Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
 from .....rpt_scenario import ModeAccessPointIdent
-from .....ar_object import ARObject
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class ModeAccessPoint(ARObject):
     def __init__(self):

armodel/models/{per_instance_memory.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PerInstanceMemory.py}

@@ -1,8 +1,7 @@
-
-from .m2.msr.data_dictionary.data_def_properties import SwDataDefProps
-from .ar_object import ARLiteral, ARObject
-from .general_structure import Identifiable
-
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from .....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
 
 class PerInstanceMemory(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -39,4 +38,4 @@ class PerInstanceMemory(Identifiable):
 
     def setTypeDefinition(self, value):
         self.typeDefinition = value
-        return self
+        return self

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/server_call.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServerCall.py}

@@ -1,7 +1,7 @@
 from abc import ABCMeta
-from .....ar_object import ARObject
-from ..composition.instance_refs import ROperationInAtomicSwcInstanceRef
-from .access_count import AbstractAccessPoint
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ..Composition.InstanceRefs import ROperationInAtomicSwcInstanceRef
+from .AccessCount import AbstractAccessPoint
 
 
 class ServerCallPoint(AbstractAccessPoint, metaclass = ABCMeta):

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py

@@ -0,0 +1,23 @@
+from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+
+class RoleBasedPortAssignment(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.portPrototypeRef = None            # type: RefType
+        self.role = None                        # type: Identifier
+
+    def getPortPrototypeRef(self):
+        return self.portPrototypeRef
+
+    def setPortPrototypeRef(self, value):
+        self.portPrototypeRef = value
+        return self
+
+    def getRole(self):
+        return self.role
+
+    def setRole(self, value):
+        self.role = value
+        return self

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/trigger.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Trigger.py}

@@ -1,6 +1,6 @@
 
-from .access_count import AbstractAccessPoint
-from .....ar_object import ARObject
+from .AccessCount import AbstractAccessPoint
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 
 class InternalTriggeringPoint(AbstractAccessPoint):

armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior}/__init__.py

@@ -1,16 +1,15 @@
 
-from typing import Dict, List
-
-from .data_elements import ParameterAccess, VariableAccess
-from .server_call import ServerCallPoint
-from .mode_declaration_group import ModeAccessPoint, ModeSwitchPoint
-from .trigger import InternalTriggeringPoint
+from .ServiceMapping import *
 
-from .....ar_ref import RefType
-from .....ar_object import ARBoolean, ARLiteral
-from .....common_structure import ExecutableEntity
-from .....ar_object import ARObject
+from typing import Dict, List
 
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType, ARBoolean
+from ...SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
+from ...SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
+from ...SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import ModeAccessPoint, ModeSwitchPoint
+from ...SWComponentTemplate.SwcInternalBehavior.Trigger import InternalTriggeringPoint
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...CommonStructure.InternalBehavior import ExecutableEntity
 
 class RunnableEntityArgument(ARObject):
     def __init__(self):

armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/__init__.py

@@ -1,12 +1,16 @@
 from abc import ABCMeta
 from typing import List
 
-from ..data_type.data_prototypes import ParameterDataPrototype, VariableDataPrototype, AutosarDataPrototype
-from .....ar_object import ARBoolean, ARLiteral, ARNumerical
-from .....common_structure import ModeDeclarationGroupPrototype, Trigger
-from .....datatype import AtpType
-from .....general_structure import ARObject, Identifiable, AtpFeature
-from .....ar_ref import RefType
+from ...CommonStructure.TriggerDeclaration import Trigger
+from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
+from ..Datatype.DataPrototypes import ParameterDataPrototype, VariableDataPrototype, AutosarDataPrototype
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ...CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
+from ...GenericStructure.AbstractStructure import AtpType
+from ...GenericStructure.AbstractStructure import AtpFeature
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 
 class PortInterface(AtpType, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -127,11 +131,11 @@ class SenderReceiverInterface(DataInterface):
     
     def createInvalidationPolicy(self) -> InvalidationPolicy:
         policy = InvalidationPolicy(self)
-        self.invalidation_polivys.append(policy)
+        self.invalidationPolicies.append(policy)
         return policy
     
     def getInvalidationPolicys(self) -> List[InvalidationPolicy]:
-        return list(filter(lambda c: isinstance(c, InvalidationPolicy), self.invalidation_polivys))
+        return list(filter(lambda c: isinstance(c, InvalidationPolicy), self.invalidationPolicies))
 
 class ArgumentDataPrototype(AutosarDataPrototype):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/instance_refs.py

@@ -1,5 +1,5 @@
-from .....ar_ref import RefType
-from ...generic_structure.abstract_structure import AtpInstanceRef
+from ...GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ...GenericStructure.AbstractStructure import AtpInstanceRef
 
 class ApplicationCompositeElementInPortInterfaceInstanceRef(AtpInstanceRef):
     def __init__(self):