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

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/Timing.py

@@ -0,0 +1,177 @@
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, RefType, TimeValue
+
+class ModeDrivenTransmissionModeCondition(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.modeDeclarationRef = None                          # type: RefType
+
+    def getModeDeclarationRef(self):
+        return self.modeDeclarationRef
+
+    def setModeDeclarationRef(self, value):
+        self.modeDeclarationRef = value
+        return self
+
+class TransmissionModeCondition(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.dataFilter = None                                  # type: DataFilter
+        self.iSignalInIPduRef = None                            # type: RefType
+
+    def getDataFilter(self):
+        return self.dataFilter
+
+    def setDataFilter(self, value):
+        self.dataFilter = value
+        return self
+
+    def getISignalInIPduRef(self):
+        return self.iSignalInIPduRef
+
+    def setISignalInIPduRef(self, value):
+        self.iSignalInIPduRef = value
+        return self
+
+
+class TimeRangeType(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        # type: TimeRangeTypeTolerance
+        self.tolerance = None
+        self.value = None                                       # type: TimeValue
+
+    def getTolerance(self):
+        return self.tolerance
+
+    def setTolerance(self, value):
+        self.tolerance = value
+        return self
+
+    def getValue(self):
+        return self.value
+
+    def setValue(self, value):
+        self.value = value
+        return self
+
+
+class CyclicTiming(Describable):
+    def __init__(self):
+        super().__init__()
+
+        self.timeOffset = None                                  # type: TimeRangeType
+        self.timePeriod = None                                  # type: TimeRangeType
+
+    def getTimeOffset(self):
+        return self.timeOffset
+
+    def setTimeOffset(self, value):
+        self.timeOffset = value
+        return self
+
+    def getTimePeriod(self):
+        return self.timePeriod
+
+    def setTimePeriod(self, value):
+        self.timePeriod = value
+        return self
+
+
+class EventControlledTiming(Describable):
+    def __init__(self):
+        super().__init__()
+
+        self.numberOfRepetitions = None                         # type: Integer
+        self.repetitionPeriod = None                            # type: TimeRangeType
+
+    def getNumberOfRepetitions(self):
+        return self.numberOfRepetitions
+
+    def setNumberOfRepetitions(self, value):
+        self.numberOfRepetitions = value
+        return self
+
+    def getRepetitionPeriod(self):
+        return self.repetitionPeriod
+
+    def setRepetitionPeriod(self, value):
+        self.repetitionPeriod = value
+        return self
+
+
+class TransmissionModeTiming(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.cyclicTiming = None                                # type: CyclicTiming
+        # type: EventControlledTiming
+        self.eventControlledTiming = None
+
+    def getCyclicTiming(self):
+        return self.cyclicTiming
+
+    def setCyclicTiming(self, value):
+        self.cyclicTiming = value
+        return self
+
+    def getEventControlledTiming(self):
+        return self.eventControlledTiming
+
+    def setEventControlledTiming(self, value):
+        self.eventControlledTiming = value
+        return self
+
+class TransmissionModeDeclaration(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        # type: ModeDrivenTransmissionModeCondition
+        self.modeDrivenFalseConditions = []
+        # type: ModeDrivenTransmissionModeCondition
+        self.modeDrivenTrueConditions = []
+        # type: TransmissionModeCondition
+        self.transmissionModeConditions = []
+        # type: TransmissionModeTiming
+        self.transmissionModeFalseTiming = None
+        # type: TransmissionModeTiming
+        self.transmissionModeTrueTiming = None
+
+    def getModeDrivenFalseConditions(self):
+        return self.modeDrivenFalseConditions
+
+    def addModeDrivenFalseCondition(self, value):
+        self.modeDrivenFalseConditions.append(value)
+        return self
+
+    def getModeDrivenTrueConditions(self):
+        return self.modeDrivenTrueConditions
+
+    def addModeDrivenTrueCondition(self, value):
+        self.modeDrivenTrueConditions.append(value)
+        return self
+
+    def getTransmissionModeConditions(self):
+        return self.transmissionModeConditions
+
+    def addTransmissionModeCondition(self, value):
+        self.transmissionModeConditions.append(value)
+        return self
+
+    def getTransmissionModeFalseTiming(self):
+        return self.transmissionModeFalseTiming
+
+    def setTransmissionModeFalseTiming(self, value):
+        self.transmissionModeFalseTiming = value
+        return self
+
+    def getTransmissionModeTrueTiming(self):
+        return self.transmissionModeTrueTiming
+
+    def setTransmissionModeTrueTiming(self, value):
+        self.transmissionModeTrueTiming = value
+        return self

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

@@ -46,3 +46,40 @@ class VariableDataPrototypeInSystemInstanceRef(AtpInstanceRef):
     def setTargetDataPrototypeRef(self, value):
         self.targetDataPrototypeRef = value
         return self
+
+class ComponentInSystemInstanceRef(AtpInstanceRef):
+    def __init__(self):
+        super().__init__()
+
+        self.baseRef = None                         # type: RefType
+        self.contextComponentRefs = []              # type: List[RefType]
+        self.contextCompositionRef = None           # type: RefType
+        self.targetComponentRef = None              # type: RefType
+
+    def getBaseRef(self):
+        return self.baseRef
+
+    def setBaseRef(self, value):
+        self.baseRef = value
+        return self
+
+    def getContextComponentRefs(self):
+        return self.contextComponentRefs
+
+    def addContextComponentRef(self, value):
+        self.contextComponentRefs.append(value)
+        return self
+
+    def getContextCompositionRef(self):
+        return self.contextCompositionRef
+
+    def setContextCompositionRef(self, value):
+        self.contextCompositionRef = value
+        return self
+
+    def getTargetComponentRef(self):
+        return self.targetComponentRef
+
+    def setTargetComponentRef(self, value):
+        self.targetComponentRef = value
+        return self

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

@@ -1,10 +1,48 @@
 from typing import List
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, RefType, TRefType
+
+class SwcToEcuMapping(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.componentIRefs = []                    # type: List[ComponentInSystemInstanceRef]
+        self.controlledHwElementRef = None          # type: RefType
+        self.ecuInstanceRef = None                  # type: RefType
+        self.processingUnitRef = None               # type: RefType
+
+    def getComponentIRefs(self):
+        return self.componentIRefs
+
+    def addComponentIRef(self, value):
+        self.componentIRefs.append(value)
+        return self
+
+    def getControlledHwElementRef(self):
+        return self.controlledHwElementRef
+
+    def setControlledHwElementRef(self, value):
+        self.controlledHwElementRef = value
+        return self
+
+    def getEcuInstanceRef(self):
+        return self.ecuInstanceRef
+
+    def setEcuInstanceRef(self, value):
+        self.ecuInstanceRef = value
+        return self
+
+    def getProcessingUnitRef(self):
+        return self.processingUnitRef
+
+    def setProcessingUnitRef(self, value):
+        self.processingUnitRef = value
+        return self
 
 class SystemMapping(Identifiable):
-    def __init__(self, parent, short_name):
+    def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.applicationPartitionToEcuPartitionMappings = []
@@ -28,7 +66,7 @@ class SystemMapping(Identifiable):
         self.swClusterMappings = []
         self.swcToApplicationPartitionMappings = []
         self.swImplMappings = []
-        self.swMappings = []
+        self.swMappings = []                                                        # type: List[SwcToEcuMapping]
         self.systemSignalGroupToComResourceMappings = []
         self.systemSignalToComResourceMappings = []
 
@@ -182,9 +220,12 @@ class SystemMapping(Identifiable):
     def getSwMappings(self):
         return self.swMappings
 
-    def addSwMapping(self, value):
-        self.swMappings.append(value)
-        return self
+    def createSwcToEcuMapping(self, short_name: str) -> SwcToEcuMapping:
+        if short_name not in self.elements:
+            mapping = SwcToEcuMapping(self, short_name)
+            self.addElement(mapping)
+            self.swMappings.append(mapping)
+        return self.getElement(short_name)
 
     def getSystemSignalGroupToComResourceMappings(self):
         return self.systemSignalGroupToComResourceMappings
@@ -200,9 +241,37 @@ class SystemMapping(Identifiable):
         self.systemSignalToComResourceMappings.append(value)
         return self
 
+class RootSwCompositionPrototype(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.calibrationParameterValueSetRef = None         # type: RefType
+        self.flatMapRef = None                              # type: RefType
+        self.softwareCompositionTRef = None                 # type: TRefType
+
+    def getCalibrationParameterValueSetRef(self):
+        return self.calibrationParameterValueSetRef
+
+    def setCalibrationParameterValueSetRef(self, value):
+        self.calibrationParameterValueSetRef = value
+        return self
+
+    def getFlatMapRef(self):
+        return self.flatMapRef
+
+    def setFlatMapRef(self, value):
+        self.flatMapRef = value
+        return self
+
+    def getSoftwareCompositionTRef(self):
+        return self.softwareCompositionTRef
+
+    def setSoftwareCompositionTRef(self, value):
+        self.softwareCompositionTRef = value
+        return self
 
 class System(ARElement):
-    def __init__(self, parent, short_name):
+    def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.clientIdDefinitionSetRefs = []                 # type: List[RefType]
@@ -212,12 +281,12 @@ class System(ARElement):
         self.interpolationRoutineMappingSetRefs = []        # type: List[RefType]
         self.j1939SharedAddressClusters = []
         self.mappings = []                                  # type: List[SystemMapping]
-        self.pncVectorLength = None
-        self.pncVectorOffset = None
-        self.rootSoftwareComposition = None
+        self.pncVectorLength = None                         # type: PositiveInteger
+        self.pncVectorOffset = None                         # type: PositiveInteger
+        self.rootSoftwareComposition = None                 # type: RootSwCompositionPrototype
         self.swClusters = []
         self.systemDocumentation = []
-        self.systemVersion = None
+        self.systemVersion = None                           # type: RevisionLabelString
 
     def getClientIdDefinitionSetRefs(self):
         return self.clientIdDefinitionSetRefs
@@ -287,9 +356,12 @@ class System(ARElement):
     def getRootSoftwareComposition(self):
         return self.rootSoftwareComposition
 
-    def setRootSoftwareComposition(self, value):
-        self.rootSoftwareComposition = value
-        return self
+    def createRootSoftwareComposition(self, short_name) -> RootSwCompositionPrototype:
+        if short_name not in self.elements:
+            prototype = RootSwCompositionPrototype(self, short_name)
+            self.addElement(prototype)
+            self.rootSoftwareComposition = prototype
+        return self.getElement(short_name)
 
     def getSwClusters(self):
         return self.swClusters

armodel/models/__init__.py

@@ -19,10 +19,13 @@ from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import *
 from .M2.AUTOSARTemplates.CommonStructure import *
+from .M2.AUTOSARTemplates.CommonStructure.Filter import *
 from .M2.AUTOSARTemplates.CommonStructure.Implementation import *
 from .M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import *
 from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import *
 from .M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import *
+from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
 from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
@@ -42,9 +45,17 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMem
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.Trigger import *
+from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
+from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
+from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
-from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import *

armodel/parser/abstract_arxml_parser.py

@@ -9,7 +9,7 @@ import xml.etree.ElementTree as ET
 
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, Integer, TimeValue
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
@@ -73,7 +73,7 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementLiteral(self, short_name: str, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
@@ -82,7 +82,7 @@ class AbstractARXMLParser:
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
         
     def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             literal = ARLiteral()
@@ -91,10 +91,27 @@ class AbstractARXMLParser:
         return results
 
     def getChildElementOptionalLiteral(self, element: ET.Element, key: str) -> ARLiteral:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("readChildOptionalElementLiteral : %s" % child_element.text)
+            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            literal = ARLiteral()
+            self.readElementAttributes(child_element, literal)
+            # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
+            if child_element.text is None:      
+                literal.setValue("")
+            else:
+                literal.setValue(child_element.text)
+        return literal
+    
+    def getChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str) -> ARLiteral:
+        child_element = self.find(element, key)
+        literal = None
+        if (child_element is not None) and (child_element.text is not None):
+            self.logger.debug("getChildElementOptionalRevisionLabelString : %s" % child_element.text)
+            m = re.match(r'[0-9]+\.[0-9]+\.[0-9]+([\._;].*)?', child_element.text)
+            if not m:
+                raise ValueError("Invalid RevisionLabelString <%s>" % child_element.text)
             literal = ARLiteral()
             self.readElementAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
@@ -110,7 +127,7 @@ class AbstractARXMLParser:
         return False
     
     def getChildElementOptionalFloatValue(self, element: ET.Element, key: str) -> ARFloat:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         float_value = None
         if (child_element is not None) and (child_element.text is not None):
             float_value = ARFloat()
@@ -118,26 +135,34 @@ class AbstractARXMLParser:
         return float_value
     
     def getChildElementFloatValueList(self, element: ET.Element, key: str) -> ARFloat:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             float_value = ARFloat()
             float_value.setValue(child_element.text)
             results.append(float_value)
         return results
+    
+    def getChildElementOptionalTimeValue(self, element: ET.Element, key: str) -> TimeValue:
+        child_element = self.find(element, key)
+        time_value = None
+        if (child_element is not None) and (child_element.text is not None):
+            time_value = TimeValue()
+            time_value.setValue(child_element.text)
+        return time_value
 
-    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementBooleanValue(self, short_name: str, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementLiteral(short_name, element, key)
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.value = self._convertStringToBooleanValue(literal._value)
         return bool_value
 
-    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> ARBoolean:
+    def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
         if (literal == None):
             return None
-        bool_value = ARBoolean()
+        bool_value = Boolean()
         bool_value.timestamp = literal.timestamp
         bool_value.setValue(literal.getValue())
         return bool_value
@@ -162,16 +187,25 @@ class AbstractARXMLParser:
     '''
     
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if child_element == None:
             return None
         numerical = ARNumerical()
         self.readElementAttributes(child_element, numerical)
         numerical.setValue(child_element.text)
         return numerical
+    
+    def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
+        child_element = self.find(element, key)
+        if child_element == None:
+            return None
+        numerical = Integer()
+        self.readElementAttributes(child_element, numerical)
+        numerical.setValue(child_element.text)
+        return numerical
         
     def getChildElementNumericalValueList(self, element: ET.Element, key: str) -> List[ARNumerical]:
-        child_elements = element.findall("./xmlns:%s" % key, self.nsmap)
+        child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
             numerical = ARNumerical()
@@ -180,7 +214,7 @@ class AbstractARXMLParser:
         return results
     
     def getChildLimitElement(self, element: ET.Element, key: str) -> Limit:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             limit = Limit()
             self.readElementAttributes(child_element, limit)
@@ -199,13 +233,13 @@ class AbstractARXMLParser:
         return ref
 
     def getChildElementRefType(self, short_name: str, element: ET.Element, key: str) -> RefType:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         self._raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
 
     def getChildElementOptionalRefType(self, element:ET.Element, key: str) -> RefType:
-        child_element = element.find("./xmlns:%s" % key, self.nsmap)
+        child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
         return None