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

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

@@ -1,15 +1,19 @@
-
-from .ServiceMapping import *
-
 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
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
+from .....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype, VariableDataPrototype
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import PerInstanceMemory
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import SwcServiceDependency
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType, ARBoolean
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import ModeAccessPoint, ModeSwitchPoint
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import InternalTriggeringPoint
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
 
 class RunnableEntityArgument(ARObject):
     def __init__(self):
@@ -200,3 +204,155 @@ class RunnableEntity(ExecutableEntity):
         self.symbol = value
         return self
 
+
+class SwcInternalBehavior(InternalBehavior):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.handle_termination_and_restart = None      # type: str
+        self.supports_multiple_instantiation = None     # type: ARBoolean
+        self.explicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
+        self.implicit_inter_runnable_variables = []     # type: List[VariableDataPrototype]
+        self.per_instance_memories = []                 # type: List[PerInstanceMemory]
+        self.per_instance_parameters = []               # type: List[ParameterDataPrototype]
+        self.port_api_options = []                      # type: List[PortAPIOption]
+        self.included_data_type_sets = []               # type: List[IncludedDataTypeSet]
+
+    def getExplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
+        return self.explicit_inter_runnable_variables
+
+    def getImplicitInterRunnableVariables(self) -> List[VariableDataPrototype]:
+        return self.implicit_inter_runnable_variables
+
+    def getPerInstanceMemories(self) -> List[PerInstanceMemory]:
+        return self.per_instance_memories
+
+    def getPerInstanceParameters(self) -> List[ParameterDataPrototype]:
+        return self.per_instance_parameters
+
+    def addPortAPIOption(self, option: PortAPIOption):
+        self.port_api_options.append(option)
+
+    def getPortAPIOptions(self) -> List[PortAPIOption]:
+        return self.port_api_options
+
+    def addIncludedDataTypeSet(self, set: IncludedDataTypeSet):
+        self.included_data_type_sets.append(set)
+
+    def getIncludedDataTypeSets(self) -> List[IncludedDataTypeSet]:
+        return self.included_data_type_sets
+
+    def createOperationInvokedEvent(self, short_name: str) -> OperationInvokedEvent:
+        if (short_name not in self.elements):
+            event = OperationInvokedEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createTimingEvent(self, short_name: str) -> TimingEvent:
+        if (short_name not in self.elements):
+            event = TimingEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createInitEvent(self, short_name: str) -> InitEvent:
+        if (short_name not in self.elements):
+            event = InitEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createDataReceivedEvent(self, short_name: str) -> DataReceivedEvent:
+        if (short_name not in self.elements):
+            event = DataReceivedEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createSwcModeSwitchEvent(self, short_name: str) -> SwcModeSwitchEvent:
+        if (short_name not in self.elements):
+            event = SwcModeSwitchEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createInternalTriggerOccurredEvent(self, short_name: str) -> InternalTriggerOccurredEvent:
+        if (short_name not in self.elements):
+            event = InternalTriggerOccurredEvent(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def createSwcServiceDependency(self, short_name: str) -> SwcServiceDependency:
+        if (short_name not in self.elements):
+            event = SwcServiceDependency(self, short_name)
+            self.elements[short_name] = event
+        return self.elements[short_name]
+
+    def getRteEvents(self) -> List[RTEEvent]:
+        return sorted(filter(lambda c: isinstance(c, RTEEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getOperationInvokedEvents(self) -> List[OperationInvokedEvent]:
+        return sorted(filter(lambda c: isinstance(c, OperationInvokedEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getInitEvents(self) -> List[InitEvent]:
+        return sorted(filter(lambda c: isinstance(c, InitEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getTimingEvents(self) -> List[TimingEvent]:
+        return sorted(filter(lambda c: isinstance(c, TimingEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getDataReceivedEvents(self) -> List[DataReceivedEvent]:
+        return sorted(filter(lambda c: isinstance(c, DataReceivedEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getSwcModeSwitchEvents(self) -> List[SwcModeSwitchEvent]:
+        return sorted(filter(lambda c: isinstance(c, SwcModeSwitchEvent), self.elements.values()), key=lambda e: e.short_name)
+
+    def getInternalTriggerOccurredEvents(self) -> List[InternalTriggerOccurredEvent]:
+        return sorted(filter(lambda c: isinstance(c, InternalTriggerOccurredEvent), self.elements.values()), key= lambda e: e.short_name)
+
+    def getSwcServiceDependencies(self) -> List[SwcServiceDependency]:
+        return sorted(filter(lambda c: isinstance(c, SwcServiceDependency), self.elements.values()), key= lambda e: e.short_name)
+
+    def getEvent(self, short_name: str) -> RTEEvent:
+        if (not isinstance(self.elements[short_name], RTEEvent)):
+            raise ValueError("Invalid Event Type <%s> of <%s>" % type(self.elements[short_name]), short_name)
+        return self.elements[short_name]
+
+    def createExplicitInterRunnableVariable(self, short_name: str) -> VariableDataPrototype:
+        if (short_name not in self.elements):
+            prototype = VariableDataPrototype(self, short_name)
+            self.elements[short_name] = prototype
+            self.explicit_inter_runnable_variables.append(prototype)
+        return self.elements[short_name]
+
+    def createImplicitInterRunnableVariable(self, short_name: str) -> VariableDataPrototype:
+        if (short_name not in self.elements):
+            prototype = VariableDataPrototype(self, short_name)
+            self.elements[short_name] = prototype
+            self.implicit_inter_runnable_variables.append(prototype)
+        return self.elements[short_name]
+
+    def createPerInstanceMemory(self, short_name: str) -> PerInstanceMemory:
+        if (short_name not in self.elements):
+            memory = PerInstanceMemory(self, short_name)
+            self.elements[short_name] = memory
+            self.per_instance_memories.append(memory)
+        return self.elements[short_name]
+
+    def createPerInstanceParameter(self, short_name: str) -> ParameterDataPrototype:
+        if (short_name not in self.elements):
+            prototype = ParameterDataPrototype(self, short_name)
+            self.elements[short_name] = prototype
+            self.per_instance_parameters.append(prototype)
+        return self.elements[short_name]
+
+    def getVariableDataPrototypes(self) -> List[VariableDataPrototype]:
+        return sorted(filter(lambda c: isinstance(c, VariableDataPrototype), self.elements.values()), key=lambda e: e.short_name)
+
+    def createRunnableEntity(self, short_name: str) -> RunnableEntity:
+        if (short_name not in self.elements):
+            runnable = RunnableEntity(self, short_name)
+            self.elements[short_name] = runnable
+        return self.elements[short_name]
+
+    def getRunnableEntities(self) -> List[RunnableEntity]:
+        return sorted(filter(lambda c: isinstance(c, RunnableEntity), self.elements.values()), key=lambda r: r.short_name)
+
+    def getRunnableEntity(self, short_name) -> RunnableEntity:
+        return self.elements[short_name]
+

armodel/models/M2/AUTOSARTemplates/SystemTemplate/{data_mapping.py → DataMapping.py}

@@ -1,7 +1,6 @@
 from abc import ABCMeta
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class DataMapping(ARObject, metaclass = ABCMeta):
     def __init__(self):

armodel/models/{fibex/can_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanCommunication.py}

@@ -1,7 +1,6 @@
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
-from .fibex_core.core_communication import Frame, FrameTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import Frame, FrameTriggering
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
 
 class RxIdentifierRange(ARObject):
     def __init__(self):

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetFrame.py

@@ -0,0 +1,14 @@
+from abc import ABCMeta
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import Frame
+
+class AbstractEthernetFrame(Frame, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == AbstractEthernetFrame:
+            raise NotImplementedError("AbstractEthernetFrame is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+class GenericEthernetFrame(AbstractEthernetFrame):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/ServiceInstances.py

@@ -0,0 +1,116 @@
+from typing import List
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, PositiveInteger, RefType, TimeValue
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses import Identifiable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+'''
+class SocketAddress(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.allowedIPv6ExtHeadersRef = None        # type: RefType
+        self.allowedTcpOptionsRef = None            # type: RefType
+        self.applicationEndpoint = None             # type: ApplicationEndpoint
+        self.connectorRef = None                    # type: RefType
+        self.differentiatedServiceField = None      # type: PositiveInteger
+        self.flowLabel = None                       # type: PositiveInteger
+        self.multicastConnectorRefs = []            # type: List[RefType]
+        self.pathMtuDiscoveryEnabled = None         # type: Boolean
+        self.pduCollectionMaxBufferSize = None      # type: PositiveInteger
+        self.pduCollectionTimeout = None            # type: TimeValue
+        self.staticSocketConnections = []            # type: List[StaticSocketConnection]
+        self.udpChecksumHandling = None             # type: UdpChecksumCalculationEnum
+
+    def getAllowedIPv6ExtHeadersRef(self):
+        return self.allowedIPv6ExtHeadersRef
+
+    def setAllowedIPv6ExtHeadersRef(self, value):
+        self.allowedIPv6ExtHeadersRef = value
+        return self
+
+    def getAllowedTcpOptionsRef(self):
+        return self.allowedTcpOptionsRef
+
+    def setAllowedTcpOptionsRef(self, value):
+        self.allowedTcpOptionsRef = value
+        return self
+
+    def getApplicationEndpoint(self):
+        return self.applicationEndpoint
+
+    def setApplicationEndpoint(self, value):
+        self.applicationEndpoint = value
+        return self
+
+    def getConnectorRef(self):
+        return self.connectorRef
+
+    def setConnectorRef(self, value):
+        self.connectorRef = value
+        return self
+
+    def getDifferentiatedServiceField(self):
+        return self.differentiatedServiceField
+
+    def setDifferentiatedServiceField(self, value):
+        self.differentiatedServiceField = value
+        return self
+
+    def getFlowLabel(self):
+        return self.flowLabel
+
+    def setFlowLabel(self, value):
+        self.flowLabel = value
+        return self
+
+    def getMulticastConnectorRefs(self):
+        return self.multicastConnectorRefs
+
+    def addMulticastConnectorRef(self, value):
+        self.multicastConnectorRefs.append(value)
+        return self
+
+    def getPathMtuDiscoveryEnabled(self):
+        return self.pathMtuDiscoveryEnabled
+
+    def setPathMtuDiscoveryEnabled(self, value):
+        self.pathMtuDiscoveryEnabled = value
+        return self
+
+    def getPduCollectionMaxBufferSize(self):
+        return self.pduCollectionMaxBufferSize
+
+    def setPduCollectionMaxBufferSize(self, value):
+        self.pduCollectionMaxBufferSize = value
+        return self
+
+    def getPduCollectionTimeout(self):
+        return self.pduCollectionTimeout
+
+    def setPduCollectionTimeout(self, value):
+        self.pduCollectionTimeout = value
+        return self
+
+    def getStaticSocketConnections(self):
+        return self.staticSocketConnections
+
+    def addStaticSocketConnection(self, value):
+        self.staticSocketConnections.append(value)
+        return self
+
+    def getUdpChecksumHandling(self):
+        return self.udpChecksumHandling
+
+    def setUdpChecksumHandling(self, value):
+        self.udpChecksumHandling = value
+        return self
+'''
+
+class SoAdConfig(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.connection = None                      # type: SocketConnection
+        self.connectionBundle = None                # type: SocketConnectionBundle
+        self.socketAddress = None                   # type: SocketAddress
+

armodel/models/{fibex/lin_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinCommunication.py}

@@ -1,11 +1,10 @@
 
 from abc import ABCMeta
 
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from .fibex_core.core_communication import Frame, FrameTriggering
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import Frame, FrameTriggering
 
 class LinFrame(Frame):
     __metaclass__ = ABCMeta

armodel/models/{fibex/fibex_4_multiplatform.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Multiplatform.py}

@@ -1,11 +1,10 @@
 from typing import List
 
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
-from .fibex_core.core_communication import FibexElement
+from .....M2.MSR.Documentation.BlockElements import DocumentationBlock
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 
 class FrameMapping(ARObject):
     def __init__(self):

armodel/models/{fibex/fibex_core/core_communication.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreCommunication.py}

@@ -1,15 +1,9 @@
 from abc import ABCMeta
 from typing import List
 
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
-
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, ARPositiveInteger
-
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable
+from ....GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, Describable
+from ....GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger, RefType, ARBoolean
 
 class FibexElement(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -56,9 +50,7 @@ class PduToFrameMapping(Identifiable):
         self.updateIndicationBitPosition = value
         return self
 
-class Frame(Identifiable):
-    __metaclass__ = ABCMeta
-
+class Frame(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == Frame:
             raise NotImplementedError("Frame is an abstract class.")

armodel/models/{fibex/fibex_core/core_topology.py → M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py}

@@ -1,16 +1,11 @@
 from abc import ABCMeta
 from typing import List
-
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
-
-from ...fibex.lin_communication import LinFrameTriggering
-from ...fibex.can_communication import CanFrameTriggering
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...fibex.fibex_core.core_communication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class PhysicalChannel (Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):

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

@@ -1,6 +1,6 @@
 from typing import List
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..GenericStructure.AbstractStructure import AtpInstanceRef
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AtpInstanceRef
 
 class VariableDataPrototypeInSystemInstanceRef(AtpInstanceRef):
     def __init__(self):

armodel/models/M2/AUTOSARTemplates/SystemTemplate/{network_management.py → NetworkManagement.py}

@@ -1,15 +1,10 @@
 from abc import ABCMeta
 from typing import List
-
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ....fibex.fibex_core.core_communication import FibexElement
-from ....fibex.can_communication import RxIdentifierRange
+from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import RxIdentifierRange
+from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType, ARBoolean
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class NmClusterCoupling(ARObject, metaclass = ABCMeta):
     def __init__(self):

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

@@ -0,0 +1,6 @@
+from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+class CanTpConfig(FibexElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

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

@@ -1,10 +1,7 @@
-
 from typing import List
-
-from ..GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 
 class SystemMapping(Identifiable):
     def __init__(self, parent, short_name):

armodel/models/M2/MSR/AsamHdo/AdminData.py

@@ -1,10 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.MSR.AsamHdo.SpecialData import Sdg
-
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.MSR.AsamHdo.SpecialData import Sdg
 from typing import List
 
-
 class AdminData(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/M2/MSR/AsamHdo/BaseTypes.py

@@ -1,7 +1,7 @@
 from abc import ABCMeta
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
 
 class BaseTypeDefinition(ARObject):
     def __init__(self):

armodel/models/M2/MSR/AsamHdo/ComputationMethod.py

@@ -1,11 +1,10 @@
 from typing import List
 from abc import ABCMeta
-
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 
 class CompuContent(ARObject, metaclass=ABCMeta):
     def __init__(self):

armodel/models/M2/MSR/AsamHdo/Constraints/GlobalConstraints.py

@@ -1,8 +1,7 @@
 from typing import List
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ....AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, Limit, RefType
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, Limit, RefType
 
 class InternalConstrs(ARObject):
     def __init__(self):

armodel/models/M2/MSR/AsamHdo/Constraints/__init__.py

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

armodel/models/M2/MSR/AsamHdo/SpecialData.py

@@ -1,9 +1,6 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
-
 class Sd(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/M2/MSR/AsamHdo/Units.py

@@ -1,9 +1,6 @@
-
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType, ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 
 class PhysicalDimension(ARElement):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/M2/MSR/AsamHdo/__init__.py

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

armodel/models/M2/MSR/CalibrationData/CalibrationValue.py

@@ -1,11 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
-
-
 from typing import List
-
-from armodel.models.M2.MSR.DataDictionary.DataDefProperties import ValueList
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical, RefType
+from ....M2.MSR.DataDictionary.DataDefProperties import ValueList
 
 class SwValues(ARObject):
     def __init__(self):

armodel/models/M2/MSR/CalibrationData/__init__.py

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

armodel/models/M2/MSR/DataDictionary/AuxillaryObjects.py

@@ -1,10 +1,7 @@
-
 from typing import List
-
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class SwAddrMethod(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/M2/MSR/DataDictionary/Axis.py

@@ -1,7 +1,7 @@
-from .CalibrationParameter import SwCalprmAxisTypeProps
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType
 from typing import List
+from ....M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisTypeProps
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARNumerical, RefType
 
 class SwGenericAxisParam(ARObject):
     def __init__(self):