armodel 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

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

@@ -1,14 +1,14 @@
 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 .....M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, DelegationSwConnector, SwComponentPrototype, SwConnector
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import SwcInternalBehavior
+from .....M2.AUTOSARTemplates.CommonStructure.Implementation import ImplementationProps
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, ARElement
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, RefType
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec, QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ServerComSpec
 
 class SymbolProps(ImplementationProps):
     def __init__(self, parent: ARObject, short_name: str):
@@ -210,7 +210,7 @@ class PortGroup(Identifiable):
     def getOuterPortRefs(self) -> List[RefType]:
         return self._outer_port_ref
 
-class SwComponentType(ARElement,  metaclass = ABCMeta):
+class SwComponentType(ARElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
@@ -244,3 +244,107 @@ class SwComponentType(ARElement,  metaclass = ABCMeta):
     def getPortGroups(self) -> List[PortGroup]:
         return list(sorted(filter(lambda c: isinstance(c, PortGroup), self.elements.values()), key= lambda o: o.short_name))
 
+
+class AtomicSwComponentType(SwComponentType, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+    def createSwcInternalBehavior(self, short_name) -> SwcInternalBehavior:
+        if (short_name not in self.elements):
+            if (len(list(filter(lambda e: isinstance(e, SwcInternalBehavior), self.elements.values()))) >= 1):
+                raise ValueError("The internal behavior of <%s> can not more than 1" % self.short_name)
+            behavior = SwcInternalBehavior(self, short_name)
+            self.elements[short_name] = behavior
+        return self.elements[short_name]
+
+    @property
+    def internal_behavior(self) -> SwcInternalBehavior:
+        return next(filter(lambda e: isinstance(e, SwcInternalBehavior), self.elements.values()))
+
+class EcuAbstractionSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent:ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class ApplicationSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class ComplexDeviceDriverSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class NvBlockSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class SensorActuatorSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class ServiceProxySwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class ServiceSwComponentType(AtomicSwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+
+class CompositionSwComponentType(SwComponentType):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.constantValueMappingRefs = []                      # type: List[RefType]
+        self.dataTypeMappingRefs = []                           # type: List[RefType]
+        self.instantiationRTEEventProps = []                    # type: List[InstantiationRTEEventProps]
+
+    def removeAllAssemblySwConnector(self):
+        for sw_connector in self.getAssemblySwConnectors():
+            self.elements.pop(sw_connector.short_name)
+
+    def removeAllDelegationSwConnector(self):
+        for sw_connector in self.getDelegationSwConnectors():
+            self.elements.pop(sw_connector.short_name)
+
+    def createAssemblySwConnector(self, short_name: str) -> AssemblySwConnector:
+        if (short_name not in self.elements):
+            connector = AssemblySwConnector(self, short_name)
+            self.elements[short_name] = connector
+        return self.elements[short_name]
+
+    def createDelegationSwConnector(self, short_name: str) -> DelegationSwConnector:
+        if short_name not in self.elements:
+            connector = DelegationSwConnector(self, short_name)
+            self.elements[short_name] = connector
+        return self.elements[short_name]
+
+    def getAssemblySwConnectors(self) -> List[AssemblySwConnector]:
+        return list(sorted(filter(lambda e: isinstance(e, AssemblySwConnector), self.elements.values()), key = lambda c: c.short_name))
+
+    def getDelegationSwConnectors(self) -> List[DelegationSwConnector]:
+        return list(sorted(filter(lambda e: isinstance(e, DelegationSwConnector), self.elements.values()), key = lambda c: c.short_name))
+
+    def getSwConnectors(self) -> List[SwConnector]:
+        return list(sorted(filter(lambda e: isinstance(e, SwConnector), self.elements.values()), key = lambda c: c.short_name))
+
+    def createSwComponentPrototype(self, short_name: str) -> SwComponentPrototype:
+        if (short_name not in self.elements):
+            connector = SwComponentPrototype(self, short_name)
+            self.elements[short_name] = connector
+        return self.elements[short_name]
+
+    def getSwComponentPrototypes(self) -> List[SwComponentPrototype]:
+        return list(filter(lambda e: isinstance(e, SwComponentPrototype), self.elements.values()))
+
+    def addDataTypeMapping(self, data_type_mapping_ref: RefType):
+        self.dataTypeMappingRefs.append(data_type_mapping_ref)
+
+    def getDataTypeMappings(self) -> List[RefType]:
+        return self.dataTypeMappingRefs
+

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

@@ -1,9 +1,6 @@
-
 from abc import ABCMeta
-
-from .....ar_ref import RefType
-from ...generic_structure.abstract_structure import AtpInstanceRef
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpInstanceRef
 
 class PortInCompositionTypeInstanceRef(AtpInstanceRef, metaclass = ABCMeta):
     def __init__(self):

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

@@ -0,0 +1,96 @@
+from abc import ABCMeta
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import PPortInCompositionInstanceRef, PortInCompositionTypeInstanceRef, RPortInCompositionInstanceRef
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+
+class SwComponentPrototype(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.typeTRef = None                       # type: RefType
+
+    def getTypeTRef(self):
+        return self.typeTRef
+
+    def setTypeTRef(self, value):
+        self.typeTRef = value
+        return self
+
+class SwConnector(Identifiable, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.mappingRef = None                      # type: RefType
+
+    def getMappingRef(self):
+        return self.mappingRef
+
+    def setMappingRef(self, value):
+        self.mappingRef = value
+        return self
+
+class AssemblySwConnector(SwConnector):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.providerIRef = None        # type: PPortInCompositionInstanceRef
+        self.requesterIRef = None       # type: RPortInCompositionInstanceRef
+
+    def getProviderIRef(self) -> PPortInCompositionInstanceRef:
+        return self.providerIRef
+
+    def setProviderIRef(self, value: PPortInCompositionInstanceRef):
+        self.providerIRef = value
+        return self
+
+    def getRequesterIRef(self) -> PPortInCompositionInstanceRef:
+        return self.requesterIRef
+
+    def setRequesterIRef(self, value: PPortInCompositionInstanceRef):
+        self.requesterIRef = value
+        return self
+
+class DelegationSwConnector(SwConnector):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+        
+        self.innerPortIRref = None                          # type: PortInCompositionTypeInstanceRef
+        self.outerPortRef = None                            # type: RefType
+
+    def getInnerPortIRref(self):
+        return self.innerPortIRref
+
+    def setInnerPortIRref(self, value):
+        self.innerPortIRref = value
+        return self
+
+    def getOuterPortRef(self):
+        return self.outerPortRef
+
+    def setOuterPortRef(self, value):
+        self.outerPortRef = value
+        return self
+
+
+class PassThroughSwConnector(SwConnector):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.providedOuterPortRef = None                    # type: RefType
+        self.requiredOuterPortRef = None                    # type: RefType
+
+    def getProvidedOuterPortRef(self):
+        return self.providedOuterPortRef
+
+    def setProvidedOuterPortRef(self, value):
+        self.providedOuterPortRef = value
+        return self
+
+    def getRequiredOuterPortRef(self):
+        return self.requiredOuterPortRef
+
+    def setRequiredOuterPortRef(self, value):
+        self.requiredOuterPortRef = value
+        return self
+        

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

@@ -1,10 +1,10 @@
 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 .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, TRefType
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from .....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from .....M2.AUTOSARTemplates.CommonStructure import ValueSpecification
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
 
 class AtpPrototype(AtpFeature, metaclass = ABCMeta):
     def __init__(self, parent:ARObject, short_name: str):
@@ -36,7 +36,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 +76,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 +84,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,47 +1,12 @@
-from abc import ABCMeta
 from typing import List
-
-from .m2.msr.data_dictionary.data_def_properties import SwDataDefProps
-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 .....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeRequestTypeMap
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationRecordElement
+from .....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from abc import ABCMeta
 
 class AutosarDataType(AtpType, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -59,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:
@@ -79,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):
@@ -117,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,16 +77,18 @@ class ApplicationRecordDataType(ApplicationCompositeDataType):
     def getApplicationRecordElements(self) -> List[ApplicationRecordElement]:
         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]
 
@@ -152,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/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/autosar_templates/sw_component_template/port_interface/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/PortInterface/InstanceRefs.py}

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

armodel/models/{m2/autosar_templates/sw_component_template/port_interface → M2/AUTOSARTemplates/SWComponentTemplate/PortInterface}/__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 .....M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import Trigger
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype, VariableDataPrototype, AutosarDataPrototype
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from .....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpType
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpFeature
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 
 class PortInterface(AtpType, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/{rpt_scenario.py → M2/AUTOSARTemplates/SWComponentTemplate/RPTScenario.py}

@@ -1,17 +1,15 @@
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from abc import ABCMeta
-from .ar_object import ARObject
-from .general_structure import Identifiable
-
 
 class IdentCaption(Identifiable):
-    
+
     __metaclass__ = ABCMeta
 
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == IdentCaption:
             raise NotImplementedError("IdentCaption is an abstract class.")
-        
+
         super().__init__(parent, short_name)