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

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

@@ -1,15 +1,12 @@
 from abc import ABCMeta
 from typing import List
-
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
-
-from ...MSR.DataDictionary.DataDefProperties import SwDataDefProps
-from ..GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ..SWComponentTemplate.Datatype.Datatypes import AutosarDataType
-from ..SWComponentTemplate.Components import SymbolProps
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
+from ....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import AutosarDataType
+from ....M2.AUTOSARTemplates.SWComponentTemplate.Components import SymbolProps
 
 class AbstractImplementationDataTypeElement(Identifiable):
     def __init__(self, parent, short_name: str):

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

@@ -1,18 +1,15 @@
 from abc import ABCMeta
 from enum import Enum
 from typing import List
-
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType
+from ....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype
 
 class ReentrancyLevelEnum(Enum):
-
-    multicoreReentrant = "multicoreReentrant"
-    nonReentrant = "nonReentrant"
-    singleCoreReentrant = "singleCoreReentrant"
-
+    ENUM_MULTICORE_REENTRANT = "multicoreReentrant"
+    ENUM_NON_REENTRANT = "nonReentrant"
+    ENUM_SINGLE_CORE_REENTRANT = "singleCoreReentrant"
 
 class ExclusiveArea(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -105,4 +102,17 @@ class InternalBehavior(Identifiable, metaclass=ABCMeta):
         return self.elements[short_name]
 
     def getConstantMemorys(self) -> List[ParameterDataPrototype]:
-        return self.constant_memories
+        return self.constant_memories
+
+class AbstractEvent(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.activationReasonRepresentationRef = None                       # type: RefType
+
+    def getActivationReasonRepresentationRef(self):
+        return self.activationReasonRepresentationRef
+
+    def setActivationReasonRepresentationRef(self, value):
+        self.activationReasonRepresentationRef = value
+        return self

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

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

armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py

@@ -1,12 +1,9 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
-
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
 import re
 from typing import List
 
-
 class MemorySection(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/__init__.py

@@ -1,8 +1,6 @@
-from . import *
-
-from .MemorySectionUsage import MemorySection
-from ...GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ...GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from .....M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import MemorySection
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from typing import List
 
 class ResourceConsumption(Identifiable):

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

@@ -1,9 +1,8 @@
 from abc import ABCMeta
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, ARLiteral, RefType
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, ARLiteral, RefType
+from ....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef
 
 class RoleBasedDataAssignment(ARObject):
     def __init__(self):
@@ -47,4 +46,9 @@ class NvBlockNeeds(ServiceNeeds):
         self.write_only_once = None                     # type: ARBoolean
         self.write_verification = None                  # type: ARBoolean
         self.writing_frequency = None                   # type: ARBoolean
-        self.writing_priority = None                    # type: ARBoolean
+        self.writing_priority = None                    # type: ARBoolean
+
+
+class ServiceDependency(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

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

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

armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/ModeDeclarationGroup.py

@@ -1,10 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
-
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
 from typing import List
 
-
 class IncludedModeDeclarationGroupSet(ARObject):
     def __init__(self):
         super().__init__()

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

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

armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/ExecutionOrderConstraint.py

@@ -0,0 +1,45 @@
+from typing import List
+from abc import ABCMeta
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ......M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingConstraint import TimingConstraint
+
+class EOCExecutableEntityRefAbstract(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingConstraint:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+
+        super().__init__(parent, short_name)
+
+
+class EOCExecutableEntityRef(EOCExecutableEntityRefAbstract):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.successor_refs = []            # List[RefType]
+
+    def addSuccessorRef(self, ref: RefType):
+        self.successor_refs.append(ref)
+
+    def getSuccessorRefs(self) -> List[RefType]:
+        return self.successor_refs
+
+
+class ExecutionOrderConstraint(TimingConstraint):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.ordered_elements = []                      # type: List[EOCExecutableEntityRefAbstract]
+
+    def createEOCExecutableEntityRef(self, short_name: str)-> EOCExecutableEntityRef:
+        if short_name not in self.elements:
+            entity_ref = EOCExecutableEntityRef(self, short_name)
+            self.elements[short_name] = entity_ref
+            self.ordered_elements.append(entity_ref)
+        return self.elements[short_name]
+
+    def getOrderedElements(self) -> List[EOCExecutableEntityRefAbstract]:
+        return self.ordered_elements

armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/TimingConstraint.py

@@ -0,0 +1,24 @@
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from abc import ABCMeta
+
+
+class TimingConstraint(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingConstraint:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+
+        super().__init__(parent, short_name)
+
+        self.timing_condition_ref = None                # type: RefType
+
+    @property
+    def timingConditionRef(self) -> RefType:
+        return self.timing_condition_ref
+
+    @timingConditionRef.setter
+    def timingConditionRef(self, ref: RefType):
+        self.timing_condition_ref = ref

armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/TimingExtensions.py

@@ -0,0 +1,33 @@
+from ......M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import ExecutionOrderConstraint
+from ......M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingConstraint import TimingConstraint
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from abc import ABCMeta
+from typing import List
+
+
+class TimingExtension(Identifiable):
+    __metaclass__ = ABCMeta
+
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == TimingExtension:
+            raise NotImplementedError("TimingExtension is an abstract class.")
+
+        super().__init__(parent, short_name)
+
+        self.timing_requirements = []           # Type: List[TimingConstraint]
+
+    def createExecutionOrderConstraint(self, short_name: str)-> ExecutionOrderConstraint:
+        if short_name not in self.elements:
+            constraint = ExecutionOrderConstraint(self, short_name)
+            self.elements[short_name] = constraint
+            self.timing_requirements.append(constraint)
+        return self.elements[short_name]
+
+    def getTimingRequirements(self) -> List[TimingConstraint]:
+        return self.timing_requirements
+
+
+class SwcTiming(TimingExtension):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)

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

@@ -1,5 +1,5 @@
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ..GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class Trigger(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):

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

@@ -1,11 +1,9 @@
 from abc import ABCMeta
 from typing import List
-
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 
 class ValueSpecification(ARObject, metaclass = ABCMeta):
     '''

armodel/models/M2/AUTOSARTemplates/{ecuc_description_template.py → ECUCDescriptionTemplate.py}

@@ -1,16 +1,11 @@
 from abc import ABCMeta
 from typing import List
-
-from .GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-
-from .GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical
-
-from .GenericStructure.AbstractStructure import AnyInstanceRef
-from ..MSR.Documentation.BlockElements import DocumentationBlock
-from ..MSR.Documentation.Annotation import Annotation
-from .GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from .GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from .GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ...M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ...M2.MSR.Documentation.Annotation import Annotation
+from ...M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
+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 ARElement
 
 class EcucValueCollection(ARElement):
     def __init__(self, parent: ARObject, short_name: str):

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

@@ -1,12 +1,9 @@
 
 from abc import ABCMeta
 from typing import List
-
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
-
-from .GeneralTemplateClasses.PrimitiveTypes import RefType
-from .GeneralTemplateClasses.ArObject import ARObject
-
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 class AtpInstanceRef(ARObject, metaclass = ABCMeta):
     def __init__(self):
 

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

@@ -1,41 +1,41 @@
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
-from armodel.models.M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, Referrable
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType
-from armodel.models.M2.MSR.AsamHdo.BaseTypes import SwBaseType
-from armodel.models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
-from armodel.models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
-from armodel.models.fibex.can_communication import CanFrame
-from armodel.models.fibex.fibex_4_multiplatform import Gateway
-from armodel.models.fibex.fibex_core.core_communication import DcmIPdu, ISignal, ISignalGroup, ISignalIPdu, ISignalIPduGroup, NPdu, NmPdu, SecuredIPdu, SystemSignal, SystemSignalGroup
-from armodel.models.fibex.fibex_core.core_topology import CanCluster, EcuInstance, LinCluster
-from armodel.models.fibex.lin_communication import LinUnconditionalFrame
-from armodel.models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping
-from armodel.models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
-from armodel.models.M2.AUTOSARTemplates.CommonStructure import ConstantSpecification
-from armodel.models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
-from armodel.models.M2.AUTOSARTemplates.ecuc_description_template import EcucModuleConfigurationValues, EcucValueCollection
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Components import SwComponentType
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import CompositionSwComponentType
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.port_interface import ClientServerInterface, ModeSwitchInterface, ParameterInterface, SenderReceiverInterface, TriggerInterface
-from armodel.models.M2.AUTOSARTemplates.SystemTemplate import System
-from armodel.models.M2.AUTOSARTemplates.SystemTemplate.network_management import NmConfig
-from armodel.models.M2.AUTOSARTemplates.SystemTemplate.transport_protocols import CanTpConfig
-from armodel.models.M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
-from armodel.models.M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
-from armodel.models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
-from armodel.models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
-from armodel.models.sw_component import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, EcuAbstractionSwComponentType, SensorActuatorSwComponentType, ServiceSwComponentType
-from armodel.models.timing import SwcTiming
-
 from typing import Dict, List
 
+from ...SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
+from .....M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType, ServiceSwComponentType, SwComponentType, ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, EcuAbstractionSwComponentType, SensorActuatorSwComponentType
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
+from .....M2.MSR.AsamHdo.BaseTypes import SwBaseType
+from .....M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
+from .....M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
+from .....M2.MSR.AsamHdo.ComputationMethod import CompuMethod
+from .....M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
+from .....M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
+from .....M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
+from .....M2.AUTOSARTemplates.CommonStructure.Implementation import Implementation
+from .....M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, Referrable
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType
+from .....M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
+from .....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
+from .....M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import DcmIPdu, ISignal, ISignalGroup, ISignalIPdu, ISignalIPduGroup, NPdu, NmPdu, SecuredIPdu, SystemSignal, SystemSignalGroup
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CanCluster, LinCluster
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinUnconditionalFrame
+from .....M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping
+from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
+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.SystemTemplate import System
+from .....M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import NmConfig
+from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
+
 class ARPackage(Identifiable, CollectableElement):
     def __init__(self, parent: ARObject, short_name: str):
         Identifiable.__init__(self, parent, short_name)
@@ -111,6 +111,12 @@ class ARPackage(Identifiable, CollectableElement):
             sr_interface = ParameterInterface(self, short_name)
             self.addElement(sr_interface)
         return self.getElement(short_name)
+    
+    def createGenericEthernetFrame(self, short_name: str) -> GenericEthernetFrame:
+        if (short_name not in self.elements):
+            sr_interface = GenericEthernetFrame(self, short_name)
+            self.addElement(sr_interface)
+        return self.getElement(short_name)
 
     def createClientServerInterface(self, short_name: str) -> ClientServerInterface:
         if (short_name not in self.elements):

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

@@ -1,10 +1,7 @@
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
-
-
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from abc import ABCMeta
 
-
 class EngineeringObject(ARObject, metaclass=ABCMeta):
     def __init__(self):
         if type(self) == EngineeringObject:

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

@@ -1,9 +1,9 @@
-from armodel.models.M2.MSR.AsamHdo.AdminData import AdminData
-from armodel.models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
-from .ArObject import ARObject
-from .PrimitiveTypes import ARLiteral
-from ....MSR.Documentation.Annotation import Annotation
-from ....MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from .....M2.MSR.AsamHdo.AdminData import AdminData
+from .....M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
+from .....M2.MSR.Documentation.Annotation import Annotation
+from .....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from abc import ABCMeta
 from typing import List
 
@@ -14,17 +14,9 @@ class Referrable(ARObject, metaclass = ABCMeta):
             raise NotImplementedError("Referrable is an abstract class.")
         ARObject.__init__(self)
 
-        self._parent = parent
+        self.parent = parent
         self.short_name = short_name
 
-    @property
-    def parent(self):
-        return self._parent
-
-    @parent.setter
-    def parent(self, value):
-        self._parent = value
-
     @property
     def shortName(self):
         return self.short_name
@@ -35,10 +27,13 @@ class Referrable(ARObject, metaclass = ABCMeta):
 
     def getShortName(self) -> str:
         return self.short_name
+    
+    def getParent(self):
+        return self.parent
 
     @property
     def full_name(self) -> str:
-        return self._parent.full_name + "/" + self.short_name
+        return self.parent.full_name + "/" + self.short_name
 
     def getFullName(self) -> str:
         return self.full_name

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

@@ -1,7 +1,7 @@
 from abc import ABCMeta
 import re
-
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from typing import List
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class ARType(metaclass = ABCMeta):
     def __init__(self) -> None:
@@ -42,6 +42,9 @@ class ARNumerical(ARType):
                 m = re.match(r"0x([0-9a-f]+)", value, re.I)
                 if m:
                     return int(m.group(1), 16)
+                m = re.match(r'0b([\d]+)', value, re.I)
+                if m:
+                    return int(m.group(1), 2)
                 m = re.match(r"-?\d+\.\d+", value)
                 if m:
                     return float(value)
@@ -99,6 +102,16 @@ class ARFloat(ARNumerical):
         else:
             return str(self._value)
         
+class Float(ARFloat):
+    '''
+        An instance of Float is an element from the set of real numbers.
+        Tags:
+            * xml.xsd.customType=FLOAT
+            * xml.xsd.type=double
+    '''
+    def __init__(self):
+        super().__init__()
+        
 class TimeValue(ARFloat):
     '''
         This primitive type is taken for expressing time values. The numerical value is supposed to be interpreted
@@ -135,6 +148,23 @@ class ARLiteral(ARType):
     def upper(self) -> str:
         return self.value.upper()
 
+class AREnum(ARLiteral):
+    def __init__(self, enum_values: List[str]):
+        super().__init__()
+        
+        self.enumValues = enum_values                # List[str]
+
+    def getEnumValues(self):
+        return self.enumValues
+
+    def setEnumValues(self, values: List[str]):
+        self.enumValues = values
+        return self
+
+    def validateEnumValue(self, value: str):
+        if value in self.enumValues:
+            return True
+        return False
 
 class String(ARLiteral):
     
@@ -175,9 +205,9 @@ class ARBoolean(ARType):
 
     def _convertStringToBoolean(self, value: str) -> bool:
         value = value.lower()
-        if value == "true":
+        if value == "true" or value == "1":
             return True
-        elif value == "false":
+        elif value == "false" or value == "0":
             return False
         else:
             return self._convertNumberToBoolean(int(value))
@@ -237,6 +267,16 @@ class PositiveInteger(ARPositiveInteger):
     def __init__(self):
         super().__init__()
 
+class PositiveUnlimitedInteger(ARPositiveInteger):
+    '''
+        This is a positive unlimited integer which can be denoted in decimal, binary, octal and hexadecimal.
+        
+        Tags:
+            * xml.xsd.customType=POSITIVE-UNLIMITED-INTEGER
+            * xml.xsd.pattern=0|[\+]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''        
+
 class Integer(ARNumerical):
     '''
         An instance of Integer is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
@@ -252,6 +292,34 @@ class Integer(ARNumerical):
     def __init__(self):
         super().__init__()
 
+class UnlimitedInteger(Integer):
+    '''
+        An instance of UnlimitedInteger is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
+        The range is limited by constraint 2534.
+        The value can be expressed in decimal, octal, hexadecimal and binary representation. Negative numbers
+        can only be expressed in decimal notation.
+        
+        Tags:
+            * xml.xsd.customType=UNLIMITED-INTEGER
+            * xml.xsd.pattern=0|[\+\-]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
+class Boolean(ARBoolean):
+    '''
+        A Boolean value denotes a logical condition that is either 'true' or 'false'. It can be one of "0", "1", "true",
+        "false"
+        
+        Tags:
+            * xml.xsd.customType=BOOLEAN
+            * xml.xsd.pattern=0|1|true|false
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
 class Identifier(ARLiteral):
     '''
         An Identifier is a string with a number of constraints on its appearance, satisfying the requirements typical
@@ -267,6 +335,21 @@ class Identifier(ARLiteral):
     '''
     def __init__(self):
         super().__init__()
+
+class RevisionLabelString(ARLiteral):
+    '''
+        This primitive represents an internal AUTOSAR revision label which identifies an engineering object. It
+        represents a pattern which
+            * supports three integers representing from left to right MajorVersion, MinorVersion, PatchVersion.
+            * may add an application specific suffix separated by one of ".", "_", ";".
+        Legal patterns are for example:
+            * 4.0.0
+            * 4.0.0.1234565
+            * 4.0.0_vendor specific;13
+            * 4.0.0;12
+    '''
+
+    
 class Limit(ARObject):
     def __init__(self):
         super().__init__()

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

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