armodel 1.7.8__py3-none-any.whl → 1.8.0__py3-none-any.whl

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

@@ -1,6 +1,9 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.MSR.DataDictionary.DataDefProperties import SwImplPolicyEnum
 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):
         super().__init__(parent, short_name)
@@ -23,3 +26,27 @@ class Trigger(Identifiable):
         if value is not None:
             self.triggerPeriod = value
         return self
+
+
+class TriggerMapping(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.firstTriggerRef = None                             # type: RefType
+        self.secondTriggerRef = None                            # type: RefType
+
+    def getFirstTriggerRef(self):
+        return self.firstTriggerRef
+
+    def setFirstTriggerRef(self, value):
+        if value is not None:
+            self.firstTriggerRef = value
+        return self
+
+    def getSecondTriggerRef(self):
+        return self.secondTriggerRef
+
+    def setSecondTriggerRef(self, value):
+        if value is not None:
+            self.secondTriggerRef = value
+        return self

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

@@ -1,10 +1,6 @@
 from typing import Dict, List
 
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType, ServiceSwComponentType, SwComponentType
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType
-from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import ComplexDeviceDriverSwComponentType, EcuAbstractionSwComponentType
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import SensorActuatorSwComponentType
-
 from .....M2.MSR.AsamHdo.BaseTypes import SwBaseType
 from .....M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
 from .....M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
@@ -21,15 +17,21 @@ from .....M2.AUTOSARTemplates.CommonStructure.Implementation import Implementati
 from .....M2.AUTOSARTemplates.CommonStructure.FlatMap import FlatMap
 from .....M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroup
 from .....M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping
+from .....M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.BlueprintDedicated.PortPrototypeBlueprint import PortPrototypeBlueprint
+from .....M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.Keyword import KeywordSet
 from .....M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
 from .....M2.AUTOSARTemplates.DiagnosticExtract.DiagnosticContribution import DiagnosticServiceTable
 from .....M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucModuleConfigurationValues, EcucValueCollection
 from .....M2.AUTOSARTemplates.EcuResourceTemplate import HwElement
 from .....M2.AUTOSARTemplates.EcuResourceTemplate.HwElementCategory import HwCategory, HwType
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ElementCollection import Collection
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import CollectableElement, Identifiable, Referrable
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Identifier, RefType, ReferrableSubtypesEnum
 from .....M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType, ServiceSwComponentType, SwComponentType
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType
+from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import ComplexDeviceDriverSwComponentType, EcuAbstractionSwComponentType
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationDataType
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationPrimitiveDataType, ApplicationRecordDataType
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
@@ -599,6 +601,24 @@ class ARPackage(Identifiable, CollectableElement):
             transform_set = DataTransformationSet(self, short_name)
             self.addElement(transform_set)
         return self.getElement(short_name)
+    
+    def createCollection(self, short_name: str) -> Collection:
+        if (not self.IsElementExists(short_name)):
+            collection = Collection(self, short_name)
+            self.addElement(collection)
+        return self.getElement(short_name)
+    
+    def createKeywordSet(self, short_name: str) -> KeywordSet:
+        if (not self.IsElementExists(short_name)):
+            keyword_set = KeywordSet(self, short_name)
+            self.addElement(keyword_set)
+        return self.getElement(short_name)
+    
+    def createPortPrototypeBlueprint(self, short_name: str) -> PortPrototypeBlueprint:
+        if (not self.IsElementExists(short_name)):
+            keyword_set = PortPrototypeBlueprint(self, short_name)
+            self.addElement(keyword_set)
+        return self.getElement(short_name)
 
     def getApplicationPrimitiveDataTypes(self) -> List[ApplicationPrimitiveDataType]:
         return list(sorted(filter(lambda a: isinstance(a, ApplicationPrimitiveDataType), self.elements.values()), key=lambda o: o.short_name))
@@ -765,6 +785,15 @@ class ARPackage(Identifiable, CollectableElement):
     def getDataTransformationSets(self) -> List[DataTransformationSet]:
         return list(sorted(filter(lambda a: isinstance(a, DataTransformationSet), self.elements.values()), key=lambda a: a.short_name))
     
+    def getCollections(self) -> List[Collection]:
+        return list(sorted(filter(lambda a: isinstance(a, Collection), self.elements.values()), key=lambda a: a.short_name))
+    
+    def getKeywordSets(self) -> List[KeywordSet]:
+        return list(sorted(filter(lambda a: isinstance(a, KeywordSet), self.elements.values()), key=lambda a: a.short_name))
+    
+    def getPortPrototypeBlueprints(self) -> List[PortPrototypeBlueprint]:
+        return list(sorted(filter(lambda a: isinstance(a, PortPrototypeBlueprint), self.elements.values()), key=lambda a: a.short_name))
+    
     def getReferenceBases(self):
         return self.referenceBases
 

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

@@ -1 +1,74 @@
+from typing import List
 
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Identifier, NameToken, RefType
+from .....M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
+
+
+class Collection(ARElement):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.autoCollect = None                                 # type: AutoCollectEnum
+        self.collectedInstances = []                            # type: List[AnyInstanceRef]
+        self.collectionSemantics = None                         # type: NameToken
+        self.elementRefs = []                                   # type: List[RefType]
+        self.elementRole = None                                 # type: Identifier
+        self.sourceElementRefs = []                             # type: List[RefType]
+        self.sourceInstances = []                               # type: List[AnyInstanceRef]
+
+    def getAutoCollect(self):
+        return self.autoCollect
+
+    def setAutoCollect(self, value):
+        if value is not None:
+            self.autoCollect = value
+        return self
+
+    def getCollectedInstances(self):
+        return self.collectedInstances
+
+    def setCollectedInstances(self, value):
+        if value is not None:
+            self.collectedInstances = value
+        return self
+
+    def getCollectionSemantics(self):
+        return self.collectionSemantics
+
+    def setCollectionSemantics(self, value):
+        if value is not None:
+            self.collectionSemantics = value
+        return self
+
+    def getElementRefs(self):
+        return self.elementRefs
+
+    def addElementRef(self, value):
+        if value is not None:
+            self.elementRefs.append(value)
+        return self
+
+    def getElementRole(self):
+        return self.elementRole
+
+    def setElementRole(self, value):
+        if value is not None:
+            self.elementRole = value
+        return self
+
+    def getSourceElementRefs(self):
+        return self.sourceElementRefs
+
+    def addSourceElementRef(self, value):
+        if value is not None:
+            self.sourceElementRefs.append(value)
+        return self
+
+    def getSourceInstances(self):
+        return self.sourceInstances
+
+    def setSourceInstances(self, value):
+        if value is not None:
+            self.sourceInstances = value
+        return self

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

@@ -3,9 +3,10 @@ import re
 from typing import List
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
-class ARType(metaclass = ABCMeta):
+
+class ARType(metaclass=ABCMeta):
     def __init__(self) -> None:
-        self.timestamp = None           # type: str   
+        self.timestamp = None           # type: str
         self.uuid = None                # type: str
         self._value = None
 
@@ -28,11 +29,12 @@ class ARType(metaclass = ABCMeta):
     def getText(self) -> str:
         return str(self)
 
+
 class ARNumerical(ARType):
     def __init__(self) -> None:
         super().__init__()
 
-        self._text = None                   # type: str
+        self._text = None                       # type: str
 
     def _convertStringToNumberValue(self, value: str) -> int:
         try:
@@ -47,11 +49,11 @@ class ARNumerical(ARType):
                 m = re.match(r'0b([\d]+)', value, re.I)
                 if m:
                     return int(m.group(1), 2)
-                m = re.match(r"-?\d+\.\d+", value)
+                m = re.match(r"^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$", value)
                 if m:
                     return float(value)
                 return int(value)
-        except:
+        except:         # noqa E722
             raise ValueError("Invalid Numerical Type <%s>" % value)
 
     @property
@@ -93,7 +95,6 @@ class ARFloat(ARNumerical):
             self._value = val * 1.0
         elif isinstance(val, str):
             self._text = val
-            #self._value = float(val)
             self._value = self._convertStringToNumberValue(val)
         else:
             raise ValueError("Unsupported Type <%s>", type(val))
@@ -103,7 +104,8 @@ class ARFloat(ARNumerical):
             return self._text
         else:
             return str(self._value)
-        
+
+
 class Float(ARFloat):
     '''
         An instance of Float is an element from the set of real numbers.
@@ -113,7 +115,8 @@ class Float(ARFloat):
     '''
     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
@@ -150,6 +153,7 @@ class ARLiteral(ARType):
     def upper(self) -> str:
         return self.value.upper()
 
+
 class AREnum(ARLiteral):
     def __init__(self, enum_values: List[str]):
         super().__init__()
@@ -168,14 +172,17 @@ class AREnum(ARLiteral):
             return True
         return False
 
+
 class String(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class ReferrableSubtypesEnum(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class ARPositiveInteger(ARNumerical):
     def __init__(self) -> None:
         super().__init__()
@@ -243,6 +250,7 @@ class ARBoolean(ARType):
             else:
                 return "false"
 
+
 class NameToken(ARLiteral):
     '''
         This is an identifier as used in xml, e.g. xml-names. Typical usages are, for example, the names of type
@@ -259,6 +267,7 @@ class NameToken(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class PositiveInteger(ARPositiveInteger):
     r'''\n
         This is a positive integer which can be denoted in decimal, binary, octal and hexadecimal. The value is
@@ -273,6 +282,7 @@ class PositiveInteger(ARPositiveInteger):
     def __init__(self):
         super().__init__()
 
+
 class PositiveUnlimitedInteger(ARPositiveInteger):
     r'''
         This is a positive unlimited integer which can be denoted in decimal, binary, octal and hexadecimal.
@@ -281,7 +291,8 @@ class PositiveUnlimitedInteger(ARPositiveInteger):
             * 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):
     r'''
@@ -298,6 +309,7 @@ class Integer(ARNumerical):
     def __init__(self):
         super().__init__()
 
+
 class UnlimitedInteger(Integer):
     r'''
         An instance of UnlimitedInteger is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
@@ -313,6 +325,7 @@ class UnlimitedInteger(Integer):
     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",
@@ -326,6 +339,7 @@ class Boolean(ARBoolean):
     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
@@ -342,6 +356,7 @@ class Identifier(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class CIdentifier(ARLiteral):
     '''
         This datatype represents a string, that follows the rules of C-identifiers.
@@ -371,6 +386,7 @@ class CIdentifier(ARLiteral):
         self.namePattern = value
         return self
 
+
 class RevisionLabelString(ARLiteral):
     '''
         This primitive represents an internal AUTOSAR revision label which identifies an engineering object. It
@@ -406,6 +422,7 @@ class Limit(ARObject):
         self.value = value
         return self
 
+
 class RefType(ARObject):
     def __init__(self):
         self.base = None                        # type: str
@@ -446,13 +463,14 @@ class TRefType(RefType):
     def __init__(self):
         super().__init__()
 
+
 class DiagRequirementIdString(ARLiteral):
     '''
         This string denotes an Identifier for a requirement.
 
         Tags:
             * xml.xsd.customType=DIAG-REQUIREMENT-ID-STRING
-            * xml.xsd.pattern=[0-9a-zA-Z_\-]+
+            * xml.xsd.pattern=[0-9a-zA-Z_\-]+                           # noqa W605
             * xml.xsd.type=string
     '''
     def __init__(self):
@@ -460,7 +478,7 @@ class DiagRequirementIdString(ARLiteral):
 
 
 class ArgumentDirectionEnum(AREnum):
-    IN  = "in"
+    IN = "in"
     INOUT = "inout"
     OUT = "out"
 
@@ -468,7 +486,7 @@ class ArgumentDirectionEnum(AREnum):
         super().__init__((
             ArgumentDirectionEnum.IN,
             ArgumentDirectionEnum.INOUT,
-            ArgumentDirectionEnum.OUT  
+            ArgumentDirectionEnum.OUT
         ))
 
 
@@ -478,12 +496,13 @@ class Ip4AddressString(ARLiteral):
         
         Tags
             * xml.xsd.customType=IP4-ADDRESS-STRING
-            * xml.xsd.pattern=(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|ANY
+            * xml.xsd.pattern=(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|ANY        # noqa E501
             * xml.xsd.type=string
     '''
     def __init__(self):
         super().__init__()
 
+
 class Ip6AddressString(ARLiteral):
     '''
         This is used to specify an IP6 address. Notation: FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
@@ -498,6 +517,7 @@ class Ip6AddressString(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class MacAddressString(ARLiteral):
     '''
         This primitive specifies a Mac Address. Notation: FF:FF:FF:FF:FF:FF
@@ -511,6 +531,7 @@ class MacAddressString(ARLiteral):
     def __init__(self):
         super().__init__()
 
+
 class CategoryString(ARLiteral):
     '''
         This represents the pattern applicable to categories.
@@ -523,4 +544,9 @@ class CategoryString(ARLiteral):
             * xml.xsd.type=string
         '''
     def __init__(self):
-        super().__init__()
+        super().__init__()
+
+
+class ByteOrderEnum(AREnum):
+    def __init__(self):
+        super().__init__([])

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

@@ -1,5 +1,155 @@
+from typing import List
+from xmlrpc.client import DateTime
+
+from ....M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, RevisionLabelString
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
 
+
+class LifeCyclePeriod(ARObject):
+    '''
+        This meta class represents the ability to specify a point of time within a specified period, e.g. the starting
+        or end point, in which a specific life cycle state is valid/applies to.
+    '''
+    def __init__(self):
+        super().__init__()
+
+        self.arReleaseVersion = None                            # type: RevisionLabelString
+        self.date = None                                        # type: DateTime
+        self.productRelease = None                              # type: RevisionLabelString
+
+    def getArReleaseVersion(self):
+        return self.arReleaseVersion
+
+    def setArReleaseVersion(self, value):
+        if value is not None:
+            self.arReleaseVersion = value
+        return self
+
+    def getDate(self):
+        return self.date
+
+    def setDate(self, value):
+        if value is not None:
+            self.date = value
+        return self
+
+    def getProductRelease(self):
+        return self.productRelease
+
+    def setProductRelease(self, value):
+        if value is not None:
+            self.productRelease = value
+        return self
+
+
+class LifeCycleInfo(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.lcObjectRef = None                                 # type: RefType
+        self.lcStateRef = None                                  # type: RefType
+        self.periodBegin = None                                 # type: LifeCyclePeriod
+        self.periodEnd = None                                   # type: LifeCyclePeriod
+        self.remark = None                                      # type: DocumentationBlock
+        self.useInsteadRefs = []                                # type: List[RefType]
+
+    def getLcObjectRef(self):
+        return self.lcObjectRef
+
+    def setLcObjectRef(self, value):
+        if value is not None:
+            self.lcObjectRef = value
+        return self
+
+    def getLcStateRef(self):
+        return self.lcStateRef
+
+    def setLcStateRef(self, value):
+        if value is not None:
+            self.lcStateRef = value
+        return self
+
+    def getPeriodBegin(self):
+        return self.periodBegin
+
+    def setPeriodBegin(self, value):
+        if value is not None:
+            self.periodBegin = value
+        return self
+
+    def getPeriodEnd(self):
+        return self.periodEnd
+
+    def setPeriodEnd(self, value):
+        if value is not None:
+            self.periodEnd = value
+        return self
+
+    def getRemark(self):
+        return self.remark
+
+    def setRemark(self, value):
+        if value is not None:
+            self.remark = value
+        return self
+
+    def getUseInsteadRefs(self):
+        return self.useInsteadRefs
+
+    def addUseInsteadRef(self, value):
+        if value is not None:
+            self.useInsteadRefs.append(value)
+        return self
+
+
 class LifeCycleInfoSet(ARElement):
     def __init__(self, parent, short_name):
-        super().__init__(parent, short_name)
+        super().__init__(parent, short_name)
+
+        self.defaultLcStateRef = None                           # type: RefType
+        self.defaultPeriodBegin = None                          # type: LifeCyclePeriod
+        self.defaultPeriodEnd = None                            # type: LifeCyclePeriod
+        self.lifeCycleInfos = []                                # type: List[LifeCycleInfo]
+        self.usedLifeCycleStateDefinitionGroupRef = None        # type: RefType
+
+    def getDefaultLcStateRef(self):
+        return self.defaultLcStateRef
+
+    def setDefaultLcStateRef(self, value):
+        if value is not None:
+            self.defaultLcStateRef = value
+        return self
+
+    def getDefaultPeriodBegin(self):
+        return self.defaultPeriodBegin
+
+    def setDefaultPeriodBegin(self, value):
+        if value is not None:
+            self.defaultPeriodBegin = value
+        return self
+
+    def getDefaultPeriodEnd(self):
+        return self.defaultPeriodEnd
+
+    def setDefaultPeriodEnd(self, value):
+        if value is not None:
+            self.defaultPeriodEnd = value
+        return self
+
+    def getLifeCycleInfos(self):
+        return self.lifeCycleInfos
+
+    def addLifeCycleInfo(self, value):
+        if value is not None:
+            self.lifeCycleInfos.append(value)
+        return self
+
+    def getUsedLifeCycleStateDefinitionGroupRef(self):
+        return self.usedLifeCycleStateDefinitionGroupRef
+
+    def setUsedLifeCycleStateDefinitionGroupRef(self, value):
+        if value is not None:
+            self.usedLifeCycleStateDefinitionGroupRef = value
+        return self

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

@@ -442,8 +442,11 @@ class CompositionSwComponentType(SwComponentType):
     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 getSwConnectors(self) -> List[SwConnector]:
-        return list(sorted(filter(lambda e: isinstance(e, SwConnector), self.elements.values()), key=lambda c: c.short_name))
+        return list(filter(lambda e: isinstance(e, SwConnector), self.elements.values()))
 
     def createSwComponentPrototype(self, short_name: str) -> SwComponentPrototype:
         if (not self.IsElementExists(short_name)):