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

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

@@ -82,7 +82,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self
 
     def getFrameTriggerings(self) -> List[FrameTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, FrameTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, FrameTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createCanFrameTriggering(self, short_name: str) -> CanFrameTriggering:
         if (short_name not in self.elements):
@@ -106,7 +106,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self.getElement(short_name)
 
     def getISignalTriggerings(self) -> List[ISignalTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, ISignalTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, ISignalTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createISignalTriggering(self, short_name: str):
         if (short_name not in self.elements):
@@ -122,7 +122,7 @@ class PhysicalChannel (Identifiable, metaclass=ABCMeta):
         return self
     
     def getPduTriggerings(self) -> List[PduTriggering]:
-        return list(sorted(filter(lambda a: isinstance(a, PduTriggering), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, PduTriggering), self.elements), key=lambda o: o.getShortName()))
 
     def createPduTriggering(self, short_name: str):
         if (short_name not in self.elements):
@@ -268,16 +268,16 @@ class CommunicationCluster(FibexElement, metaclass=ABCMeta):
         return self
 
     def getPhysicalChannels(self) -> List[PhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, PhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, PhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def getCanPhysicalChannels(self) -> List[CanPhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, CanPhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, CanPhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def getLinPhysicalChannels(self) -> List[LinPhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def getEthernetPhysicalChannels(self) -> List[EthernetPhysicalChannel]:
-        return list(sorted(filter(lambda a: isinstance(a, EthernetPhysicalChannel), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, EthernetPhysicalChannel), self.elements), key=lambda o: o.getShortName()))
     
     def createCanPhysicalChannel(self, short_name: str):
         if (short_name not in self.elements):
@@ -624,7 +624,7 @@ class CommunicationConnector(Identifiable, metaclass=ABCMeta):
         return self
 
     def getEcuCommPortInstances(self):
-        return list(sorted(filter(lambda a: isinstance(a, CommConnectorPort), self.elements.values()), key=lambda o: o.getShortName()))
+        return list(sorted(filter(lambda a: isinstance(a, CommConnectorPort), self.elements), key=lambda o: o.getShortName()))
 
     def createFramePort(self, short_name) -> FramePort:
         if short_name not in self.elements:

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

@@ -104,7 +104,7 @@ class EcuInstance(FibexElement):
         return self
 
     def getCommControllers(self):
-        return list(sorted(filter(lambda a: isinstance(a, CommunicationController), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CommunicationController), self.elements), key= lambda o:o.short_name))
 
     def createCanCommunicationController(self, short_name: str) -> CanCommunicationController:
         if (not self.IsElementExists(short_name)):
@@ -131,7 +131,7 @@ class EcuInstance(FibexElement):
         return self.getElement(short_name)
 
     def getConnectors(self):
-        return list(sorted(filter(lambda a: isinstance(a, CommunicationConnector), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CommunicationConnector), self.elements), key= lambda o:o.short_name))
 
     def createCanCommunicationConnector(self, short_name: str) -> CanCommunicationConnector:
         if (not self.IsElementExists(short_name)):

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

@@ -392,13 +392,13 @@ class NmConfig(FibexElement):
         return self.getElement(short_name)
 
     def getCanNmClusters(self):                             # type: () -> List[CanNmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements), key= lambda o:o.short_name))
     
     def getUdpNmClusters(self):                             # type: () -> List[UdpNmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements), key= lambda o:o.short_name))
     
     def getNmClusters(self):                                # type: () -> List[NmCluster]
-        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements), key= lambda o:o.short_name))
     
     def getNmClusterCouplings(self):
         return self.nmClusterCouplings
@@ -467,13 +467,13 @@ class NmCluster(Identifiable, metaclass=ABCMeta):
         return self.getElement(short_name)
     
     def getCanNmNodes(self) -> List[CanNmNode]:
-        return list(sorted(filter(lambda a: isinstance(a, CanNmNode), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, CanNmNode), self.elements), key= lambda o:o.short_name))
     
     def getUdpNmNodes(self) -> List[UdpNmNode]:
-        return list(sorted(filter(lambda a: isinstance(a, UdpNmNode), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmNode), self.elements), key= lambda o:o.short_name))
     
     def getNmNodes(self) -> List[NmNode]:
-        return list(sorted(filter(lambda a: isinstance(a, NmNode), self.elements.values()), key= lambda o:o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, NmNode), self.elements), key= lambda o:o.short_name))
 
     def getNmNodeDetectionEnabled(self):
         return self.nmNodeDetectionEnabled

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

@@ -269,7 +269,7 @@ class SystemMapping(Identifiable):
         return self.swMappings
     
     def getSwcToEcuMappings(self) -> List[SwcToEcuMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SwcToEcuMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SwcToEcuMapping), self.elements), key=lambda o: o.short_name))
 
     def createSwcToEcuMapping(self, short_name: str) -> SwcToEcuMapping:
         if short_name not in self.elements:
@@ -401,16 +401,16 @@ class System(ARElement):
         return self
 
     def getMappings(self) -> List[SystemMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements), key=lambda o: o.short_name))
     
     def getSystemMappings(self) -> List[SystemMapping]:
-        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements.values()), key=lambda o: o.short_name))
+        return list(sorted(filter(lambda a: isinstance(a, SystemMapping), self.elements), key=lambda o: o.short_name))
 
     def createSystemMapping(self, short_name) -> SystemMapping:
-        if (short_name not in self.elements):
+        if not self.IsElementExists(short_name):
             mapping = SystemMapping(self, short_name)
-            self.elements[short_name] = mapping
-        return self.elements[short_name]
+            self.addElement(mapping)
+        return self.getElement(short_name, SystemMapping)
     
     def getPncVectorLength(self):
         return self.pncVectorLength

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

@@ -1,21 +1,116 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import DateTime, NameToken, RevisionLabelString, String
 from ....M2.MSR.Documentation.TextModel.LanguageDataModel import LEnum
-from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguagePlainText
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguagePlainText
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
+
+class Modification(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.change: MultiLanguageOverviewParagraph = None
+        self.reason: MultiLanguageOverviewParagraph = None
+
+    def getChange(self) -> MultiLanguageOverviewParagraph:
+        return self.change
+
+    def setChange(self, value: MultiLanguageOverviewParagraph):
+        if value is not None:
+            self.change = value
+        return self
+
+    def getReason(self) -> MultiLanguageOverviewParagraph:
+        return self.reason
+
+    def setReason(self, value: MultiLanguageOverviewParagraph):
+        if value is not None:
+            self.reason = value
+        return self
+
+
+class DocRevision(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.date: DateTime = None
+        self.issuedBy: String = None
+        self.modifications: List[Modification] = []
+        self.revisionLabel: RevisionLabelString = None
+        self.revisionLabelP1: RevisionLabelString = None
+        self.revisionLabelP2: RevisionLabelString = None
+        self.state: NameToken = None
+
+    def getDate(self) -> DateTime:
+        return self.date
+
+    def setDate(self, value: DateTime):
+        if value is not None:
+            self.date = value
+        return self
+
+    def getIssuedBy(self) -> String:
+        return self.issuedBy
+
+    def setIssuedBy(self, value: String):
+        if value is not None:
+            self.issuedBy = value
+        return self
+
+    def getModifications(self) -> List[Modification]:
+        return self.modifications
+
+    def addModification(self, value: List[Modification]):
+        if value is not None:
+            self.modifications.append(value)
+        return self
+
+    def getRevisionLabel(self) -> RevisionLabelString:
+        return self.revisionLabel
+
+    def setRevisionLabel(self, value: RevisionLabelString):
+        if value is not None:
+            self.revisionLabel = value
+        return self
+
+    def getRevisionLabelP1(self) -> RevisionLabelString:
+        return self.revisionLabelP1
+
+    def setRevisionLabelP1(self, value: RevisionLabelString):
+        if value is not None:
+            self.revisionLabelP1 = value
+        return self
+
+    def getRevisionLabelP2(self) -> RevisionLabelString:
+        return self.revisionLabelP2
+
+    def setRevisionLabelP2(self, value: RevisionLabelString):
+        if value is not None:
+            self.revisionLabelP2 = value
+        return self
+
+    def getState(self) -> NameToken:
+        return self.state
+
+    def setState(self, value: NameToken):
+        if value is not None:
+            self.state = value
+        return self
+
+
 class AdminData(ARObject):
     def __init__(self):
         super().__init__()
 
-        self.DocRevisions = []                              # type: List[DocRevision]
-        self.language = None                                # type: LEnum
-        self.sdgs = []                                      # type: List                       ## Sdg will cause the circular import
-        self.usedLanguages = None                           # type: MultiLanguagePlainText
+        self.DocRevisions: List[DocRevision] = []
+        self.language: LEnum = None
+        self.sdgs: List = []
+        self.usedLanguages: MultiLanguagePlainText = None
 
     def getDocRevisions(self):
         return self.DocRevisions
 
-    def setDocRevisions(self, value):
+    def addDocRevision(self, value: DocRevision):
         self.DocRevisions.append(value)
         return self
 
@@ -39,5 +134,3 @@ class AdminData(ARObject):
     def setUsedLanguages(self, value):
         self.usedLanguages = value
         return self
-
-    

armodel/parser/abstract_arxml_parser.py

@@ -9,9 +9,9 @@ import xml.etree.ElementTree as ET
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, Boolean, DateTime
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, PositiveInteger, TimeValue
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, Limit
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, Limit, RevisionLabelString
 
 
 class AbstractARXMLParser:
@@ -84,7 +84,7 @@ class AbstractARXMLParser:
             return literal
         self.raiseError("The attribute %s of <%s> has not been defined" % (key, short_name))
         
-    def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> ARFloat:
+    def getChildElementLiteralValueList(self, element: ET.Element, key: str) -> List[ARLiteral]:
         child_elements = self.findall(element, key)
         results = []
         for child_element in child_elements:
@@ -107,7 +107,7 @@ class AbstractARXMLParser:
                 literal.setValue(child_element.text)
         return literal
     
-    def getChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str) -> ARLiteral:
+    def getChildElementOptionalRevisionLabelString(self, element: ET.Element, key: str) -> RevisionLabelString:
         child_element = self.find(element, key)
         literal = None
         if (child_element is not None) and (child_element.text is not None):
@@ -115,7 +115,7 @@ class AbstractARXMLParser:
             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()
+            literal = RevisionLabelString()
             self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
             if child_element.text is None:
@@ -124,6 +124,9 @@ class AbstractARXMLParser:
                 literal.setValue(child_element.text)
         return literal
     
+    def getChildElementOptionalDataTime(self, element: ET.Element, key: str) -> DateTime:
+        return self.getChildElementOptionalLiteral(element, key)
+    
     def _convertStringToBooleanValue(self, value: str) -> bool:
         if (value == "true"):
             return True