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

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/models/__init__.py

@@ -63,9 +63,11 @@ from .M2.AUTOSARTemplates.SystemTemplate.DataMapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.DiagnosticConnection import *
 from .M2.AUTOSARTemplates.SystemTemplate.EcuResourceMapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import *
+from .M2.AUTOSARTemplates.SystemTemplate.RteEventToOsTaskMapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import *
 from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
 from .M2.AUTOSARTemplates.SystemTemplate.SWmapping import *
+from .M2.AUTOSARTemplates.SystemTemplate.SecureCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *

armodel/models/utils/uuid_mgr.py

@@ -0,0 +1,23 @@
+from typing import Dict, List
+
+from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+
+class UUIDMgr:
+    def __init__(self):
+        self.uuid_object_mappings = {}          # type: Dict[str, List[ARObject]]
+
+    def addObject(self, obj: ARObject):
+        if obj.uuid is None:
+            return
+        if obj.uuid not in self.uuid_object_mappings:
+            self.uuid_object_mappings[obj.uuid] = []
+        
+        uuid_obj_list = self.uuid_object_mappings[obj.uuid]
+        uuid_obj_list.append(obj)
+
+    def getObjects(self, uuid: str):
+        result = []
+        if uuid in self.uuid_object_mappings:
+            result = self.uuid_object_mappings[uuid]
+        return result

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
@@ -275,8 +278,12 @@ class AbstractARXMLParser:
         ar_object.timestamp = self.readElementOptionalAttrib(element, "T")              # read the timestamp
         ar_object.uuid = self.readElementOptionalAttrib(element, "UUID")                # read the uuid
 
+        AUTOSAR.getInstance().addARObject(ar_object)
+
         # if ar_object.timestamp is not None:
         #    self.logger.debug("Timestamp: %s" % ar_object.timestamp)
+
+        '''
         if ar_object.uuid is not None:
             instance = AUTOSAR.getInstance()
             old_ar_object = instance.getARObjectByUUID(ar_object.uuid)
@@ -285,6 +292,7 @@ class AbstractARXMLParser:
             else:
                 instance.addARObject(ar_object)
             # self.logger.debug("UUID: %s" % ar_object.uuid)
+        '''
     
     def getAUTOSARInfo(self, element: ET.Element, document: AUTOSAR):
         key = "{http://www.w3.org/2001/XMLSchema-instance}schemaLocation"