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

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

@@ -1,8 +1,12 @@
 from typing import List
+
+from ....M2.AUTOSARTemplates.SystemTemplate.EcuResourceMapping import ECUMapping
 from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
+from ....M2.AUTOSARTemplates.SystemTemplate.SWmapping import SwcToImplMapping
 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
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, RefType, RevisionLabelString, TRefType
+
 
 class SwcToEcuMapping(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
@@ -41,6 +45,7 @@ class SwcToEcuMapping(Identifiable):
         self.processingUnitRef = value
         return self
 
+
 class SystemMapping(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -51,7 +56,7 @@ class SystemMapping(Identifiable):
         self.cryptoServiceMappings = []
         self.dataMappings = []
         self.ddsISignalToTopicMappings = []
-        self.ecuResourceMappings = []
+        self.ecuResourceMappings = []                                                   # type: List[ECUMapping]
         self.j1939ControllerApplicationToJ1939NmNodeMappings = []
         self.mappingConstraints = []
         self.pncMappings = []
@@ -65,8 +70,8 @@ class SystemMapping(Identifiable):
         self.softwareClusterToResourceMappings = []
         self.swClusterMappings = []
         self.swcToApplicationPartitionMappings = []
-        self.swImplMappings = []
-        self.swMappings = []                                                        # type: List[SwcToEcuMapping]
+        self.swImplMappings = []                                                        # type: List[SwcToImplMapping]
+        self.swMappings = []                                                            # type: List[SwcToEcuMapping]
         self.systemSignalGroupToComResourceMappings = []
         self.systemSignalToComResourceMappings = []
 
@@ -115,9 +120,12 @@ class SystemMapping(Identifiable):
     def getEcuResourceMappings(self):
         return self.ecuResourceMappings
 
-    def addEcuResourceMapping(self, value):
-        self.ecuResourceMappings.append(value)
-        return self
+    def createECUMapping(self, short_name: str) -> ECUMapping:
+        if short_name not in self.elements:
+            mapping = ECUMapping(self, short_name)
+            self.addElement(mapping)
+            self.ecuResourceMappings.append(mapping)
+        return self.getElement(short_name)
 
     def getJ1939ControllerApplicationToJ1939NmNodeMappings(self):
         return self.j1939ControllerApplicationToJ1939NmNodeMappings
@@ -210,15 +218,21 @@ class SystemMapping(Identifiable):
         self.swcToApplicationPartitionMappings.append(value)
         return self
 
-    def getSwImplMapping(self):
+    def getSwImplMappings(self):
         return self.swImplMappings
 
-    def addSwImplMappings(self, value):
-        self.swImplMappings.append(value)
-        return self
+    def createSwcToImplMapping(self, short_name: str) -> SwcToImplMapping:
+        if short_name not in self.elements:
+            mapping = SwcToImplMapping(self, short_name)
+            self.addElement(mapping)
+            self.swImplMappings.append(mapping)
+        return self.getElement(short_name)
 
     def getSwMappings(self):
         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))
 
     def createSwcToEcuMapping(self, short_name: str) -> SwcToEcuMapping:
         if short_name not in self.elements:
@@ -241,6 +255,7 @@ 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)
@@ -270,6 +285,7 @@ class RootSwCompositionPrototype(Identifiable):
         self.softwareCompositionTRef = value
         return self
 
+
 class System(ARElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -310,7 +326,7 @@ class System(ARElement):
         return self
 
     def getFibexElementRefs(self):
-        #return sorted(self.fibexElements, key= lambda i: i.getShortValue())
+        # return sorted(self.fibexElements, key= lambda i: i.getShortValue())
         return self.fibexElements
 
     def addFibexElementRef(self, value):
@@ -333,14 +349,17 @@ 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.values()), 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))
 
     def createSystemMapping(self, short_name) -> SystemMapping:
         if (short_name not in self.elements):
             mapping = SystemMapping(self, short_name)
             self.elements[short_name] = mapping
         return self.elements[short_name]
-
+    
     def getPncVectorLength(self):
         return self.pncVectorLength
 
@@ -385,10 +404,3 @@ class System(ARElement):
     def setSystemVersion(self, value):
         self.systemVersion = value
         return self
-
-
-
-
-   
-
-

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

@@ -1,7 +1,6 @@
 from ....M2.MSR.Documentation.TextModel.LanguageDataModel import LEnum
 from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguagePlainText
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....M2.MSR.AsamHdo.SpecialData import Sdg
 from typing import List
 
 class AdminData(ARObject):
@@ -10,7 +9,7 @@ class AdminData(ARObject):
 
         self.DocRevisions = []                              # type: List[DocRevision]
         self.language = None                                # type: LEnum
-        self.sdgs = []                                      # type: List[Sdg]
+        self.sdgs = []                                      # type: List                       ## Sdg will cause the circular import
         self.usedLanguages = None                           # type: MultiLanguagePlainText
 
     def getDocRevisions(self):

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

@@ -1,7 +1,9 @@
 from typing import List
 from abc import ABCMeta
+
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, CIdentifier, Identifier, PositiveUnlimitedInteger, String
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import CIdentifier, Identifier, PositiveUnlimitedInteger, String
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit

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

@@ -1,3 +1,6 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import MultilanguageReferrable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
@@ -22,15 +25,30 @@ class Sd(ARObject):
         self.value = value
         return self
 
+class SdgCaption(MultilanguageReferrable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.desc = None                                    # type: MultiLanguageOverviewParagraph
+
+    def getDesc(self):
+        return self.desc
+
+    def setDesc(self, value):
+        if value is not None:
+            self.desc = value
+        return self
+
 
 class Sdg(ARObject):
     def __init__(self):
         super().__init__()
 
         self.gid = ""
-        self.sd = []                        # type: List[Sd]
-        self.sdgCaption = None
-        self.sdgContentsTypes = []          # type: List[Sdg]
+        self.sd = []                                        # type: List[Sd]
+        self.sdgCaption = None                              # type: SdgCaption
+        self.sdgContentsTypes = []                          # type: List[Sdg]
+        self.sdxRefs = []                                   # type: List[RefType]
 
     def getGID(self):
         return self.gid
@@ -49,12 +67,21 @@ class Sdg(ARObject):
     def getSdgCaption(self):
         return self.sdgCaption
 
-    def setSdgCaption(self, value):
-        self.sdgCaption = value
-        return self
+    def createSdgCaption(self, short_name: str) -> SdgCaption:
+        caption = SdgCaption(self, short_name)
+        self.sdgCaption = caption
+        return caption
 
+    def getSdgContentsTypes(self):
+        return self.sdgContentsTypes
+    
     def addSdgContentsType(self, sdg):
         self.sdgContentsTypes.append(sdg)
+    
+    def getSdxRefs(self):
+        return self.sdxRefs
 
-    def getSdgContentsTypes(self):
-        return self.sdgContentsTypes
+    def addSdxRef(self, value):
+        if value is not None:
+            self.sdxRefs.append(value)
+        return self

armodel/models/M2/MSR/DataDictionary/RecordLayout.py

@@ -72,9 +72,6 @@ class SwRecordLayoutV(ARObject):
         self.swRecordLayoutVProp = value
         return self
 
-
-    
-    
 class SwRecordLayoutGroupContent(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/__init__.py

@@ -15,6 +15,9 @@ from .M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import *
 from .M2.MSR.Documentation.TextModel.LanguageDataModel import *
 from .M2.MSR.Documentation.TextModel.MultilanguageData import *
 from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
+from .M2.AUTOSARTemplates.ECUCDescriptionTemplate import *
+from .M2.AUTOSARTemplates.EcuResourceTemplate import *
+from .M2.AUTOSARTemplates.EcuResourceTemplate.HwElementCategory import *
 from .M2.AUTOSARTemplates.BswModuleTemplate import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import *
 from .M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import *
@@ -52,11 +55,15 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents impo
 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 import *
+from .M2.AUTOSARTemplates.SystemTemplate.DoIp import *
 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.NetworkManagement import *
 from .M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import *
+from .M2.AUTOSARTemplates.SystemTemplate.SWmapping import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import *
@@ -67,6 +74,7 @@ from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology i
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.ServiceInstances import *
+from .M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Flexray.FlexrayCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import *
 from .M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import *

armodel/parser/abstract_arxml_parser.py

@@ -6,18 +6,19 @@ import re
 import logging
 import xml.etree.ElementTree as ET
 
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARFloat, ARLiteral, ARNumerical, Boolean, Integer, PositiveInteger, TimeValue
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
+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 Integer, PositiveInteger, TimeValue
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, Limit
+
 
 class AbstractARXMLParser:
     __metaclass__ = ABCMeta
      
-    def __init__(self, options = None) -> None:
-        if type(self) == AbstractARXMLParser:
+    def __init__(self, options=None) -> None:
+        if type(self) is AbstractARXMLParser:
             raise NotImplementedError("AbstractArxmlParser is an abstract class.")
         
         self.nsmap = {"xmlns": "http://autosar.org/schema/r4.0"}
@@ -40,13 +41,13 @@ class AbstractARXMLParser:
                 self.options['warning'] = options['warning']
 
     def raiseError(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise ValueError(error_msg)
         
     def notImplemented(self, error_msg):
-        if (self.options['warning'] == True):
+        if (self.options['warning'] is True):
             self.logger.error(Fore.RED + error_msg + Fore.WHITE)
         else:
             raise NotImplementedError(error_msg)
@@ -96,11 +97,11 @@ class AbstractARXMLParser:
         child_element = self.find(element, key)
         literal = None
         if (child_element is not None):
-            self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
+            # self.logger.debug("getChildElementOptionalLiteral : %s" % child_element.text)
             literal = ARLiteral()
             self.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -110,14 +111,14 @@ class AbstractARXMLParser:
         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)
+            # 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.readARObjectAttributes(child_element, literal)
             # Patch for empty element <USED-CODE-GENERATOR></USED-CODE-GENERATOR>
-            if child_element.text is None:      
+            if child_element.text is None:
                 literal.setValue("")
             else:
                 literal.setValue(child_element.text)
@@ -165,7 +166,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalBooleanValue(self, element: ET.Element, key: str) -> Boolean:
         literal = self.getChildElementOptionalLiteral(element, key)
-        if literal == None:
+        if literal is None:
             return None
         if literal.getText() == "":
             return None
@@ -182,7 +183,7 @@ class AbstractARXMLParser:
 
     def getChildElementOptionalNumericalValue(self, element: ET.Element, key: str) -> ARNumerical:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = ARNumerical()
         self.readARObjectAttributes(child_element, numerical)
@@ -191,7 +192,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalIntegerValue(self, element: ET.Element, key: str) -> Integer:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = Integer()
         self.readARObjectAttributes(child_element, numerical)
@@ -200,7 +201,7 @@ class AbstractARXMLParser:
     
     def getChildElementOptionalPositiveInteger(self, element: ET.Element, key: str) -> PositiveInteger:
         child_element = self.find(element, key)
-        if child_element == None:
+        if child_element is None:
             return None
         numerical = PositiveInteger()
         self.readARObjectAttributes(child_element, numerical)
@@ -231,7 +232,7 @@ class AbstractARXMLParser:
             return limit
         return None
     
-    def _getChildElementRefTypeDestAndValue(self, element) -> RefType:
+    def _getChildElementRefTypeDestAndValue(self, element: ET.Element) -> RefType:
         ref = RefType()
         if 'BASE' in element.attrib:
             ref.setBase(element.attrib['BASE'])
@@ -246,7 +247,7 @@ class AbstractARXMLParser:
             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:
+    def getChildElementOptionalRefType(self, element: ET.Element, key: str) -> RefType:
         child_element = self.find(element, key)
         if (child_element is not None):
             return self._getChildElementRefTypeDestAndValue(child_element)
@@ -268,13 +269,19 @@ class AbstractARXMLParser:
         return None
     
     def readARObjectAttributes(self, element: ET.Element, ar_object: ARObject):
-        ar_object.timestamp = self.readElementOptionalAttrib(element, "T")             # read the timestamp
-        ar_object.uuid      = self.readElementOptionalAttrib(element, "UUID")          # read the uuid
+        ar_object.timestamp = self.readElementOptionalAttrib(element, "T")              # read the timestamp
+        ar_object.uuid = self.readElementOptionalAttrib(element, "UUID")                # read the uuid
 
-        if ar_object.timestamp is not None:
-            self.logger.debug("Timestamp: %s" % ar_object.timestamp)
+        # if ar_object.timestamp is not None:
+        #    self.logger.debug("Timestamp: %s" % ar_object.timestamp)
         if ar_object.uuid is not None:
-            self.logger.debug("UUID: %s" % ar_object.uuid)
+            instance = AUTOSAR.getInstance()
+            old_ar_object = instance.getARObjectByUUID(ar_object.uuid)
+            if old_ar_object is not None:
+                self.logger.warning(Fore.YELLOW + "Duplicate UUID <%s> / type <%s>" % (ar_object.uuid, type(old_ar_object)) + Fore.WHITE)
+            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"
@@ -295,9 +302,9 @@ class AbstractARXMLParser:
             if item != "*" and item != ".":
                 keys[idx] = "xmlns:%s" % item
         return "/".join(keys)
-    
-    def find(self, parent:ET.Element, key: str) -> ET.Element:
+       
+    def find(self, parent: ET.Element, key: str) -> ET.Element:
         return parent.find(self.convert_find_key(key), self.nsmap)
     
     def findall(self, parent: ET.Element, key: str) -> List[ET.Element]:
-        return parent.findall(self.convert_find_key(key), self.nsmap)
+        return parent.findall(self.convert_find_key(key), self.nsmap)