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

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py

@@ -1,8 +1,12 @@
 from typing import List
-from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagnosticCommunicationManagerNeeds, DiagnosticEventInfoNeeds, DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds, EcuStateMgrUserNeeds, NvBlockNeeds, RoleBasedDataAssignment, ServiceNeeds
+from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagnosticCommunicationManagerNeeds, DiagnosticEventInfoNeeds
+from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds
+from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import DtcStatusChangeNotificationNeeds, EcuStateMgrUserNeeds, NvBlockNeeds
+from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceNeeds, ServiceDependency
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Identifier, RefType
-from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import ServiceDependency
+
+
 class RoleBasedPortAssignment(ARObject):
     def __init__(self):
         super().__init__()
@@ -24,6 +28,7 @@ class RoleBasedPortAssignment(ARObject):
         self.role = value
         return self
 
+
 class SwcServiceDependency(ServiceDependency):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -91,6 +96,12 @@ class SwcServiceDependency(ServiceDependency):
             self.addElement(needs)
         return self.getElement(short_name)
     
+    def createDtcStatusChangeNotificationNeeds(self, short_name: str) -> DtcStatusChangeNotificationNeeds:
+        if (short_name not in self.elements):
+            needs = DtcStatusChangeNotificationNeeds(self, short_name)
+            self.addElement(needs)
+        return self.getElement(short_name)
+    
     def getNvBlockNeeds(self) -> List[NvBlockNeeds]:
         return sorted(filter(lambda c: isinstance(c, NvBlockNeeds), self.elements.values()), key=lambda e: e.short_name)
     
@@ -108,6 +119,9 @@ class SwcServiceDependency(ServiceDependency):
     
     def getEcuStateMgrUserNeeds(self) -> List[EcuStateMgrUserNeeds]:
         return sorted(filter(lambda c: isinstance(c, EcuStateMgrUserNeeds), self.elements.values()), key=lambda e: e.short_name)
+    
+    def getDtcStatusChangeNotificationNeeds(self) -> List[DtcStatusChangeNotificationNeeds]:
+        return sorted(filter(lambda c: isinstance(c, DtcStatusChangeNotificationNeeds), self.elements.values()), key=lambda e: e.short_name)
 
     def getServiceNeeds(self) -> List[ServiceNeeds]:
         return sorted(filter(lambda c: isinstance(c, ServiceNeeds), self.elements.values()), key=lambda e: e.short_name)

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetTopology.py

@@ -2,9 +2,12 @@ from abc import ABCMeta
 from typing import List
 
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable, Referrable
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Integer, MacAddressString, PositiveInteger, RefType, TimeValue
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Integer, MacAddressString, PositiveInteger
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, TimeValue
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationCluster, CommunicationConnector, CommunicationController
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationCluster, CommunicationConnector
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationController
+
 
 class MacMulticastGroup(Identifiable):
     def __init__(self, parent, short_name):
@@ -19,6 +22,8 @@ class MacMulticastGroup(Identifiable):
         if value is not None:
             self.macMulticastAddress = value
         return self
+
+
 class EthernetCluster(CommunicationCluster):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -62,13 +67,15 @@ class EthernetCluster(CommunicationCluster):
             self.macMulticastGroups.append(group)
         return self.getElement(short_name)
     
-class CouplingPortStructuralElement(Identifiable, metaclass = ABCMeta):
+
+class CouplingPortStructuralElement(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
-        if type(self) == CouplingPortStructuralElement:
+        if type(self) is CouplingPortStructuralElement:
             raise NotImplementedError("CouplingPortStructuralElement is an abstract class.")
         
         super().__init__(parent, short_name)
         
+
 class CouplingPortFifo(CouplingPortStructuralElement):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -109,7 +116,8 @@ class CouplingPortFifo(CouplingPortStructuralElement):
         if value is not None:
             self.trafficClassPreemptionSupport = value
         return self
-        
+
+
 class CouplingPortScheduler(CouplingPortStructuralElement):
     def __init__(self, parent, short_name):
         super().__init__(parent, short_name)
@@ -133,6 +141,7 @@ class CouplingPortScheduler(CouplingPortStructuralElement):
             self.predecessorRefs.append(value)
         return self
 
+
 class EthernetPriorityRegeneration(Referrable):
     def __init__(self, parent, short_name):
         super().__init__(parent, short_name)
@@ -253,6 +262,7 @@ class CouplingPortDetails(ARObject):
             self.vlanTranslationTables = value
         return self
 
+
 class VlanMembership(ARObject):
     def __init__(self):
         super().__init__()
@@ -427,7 +437,6 @@ class CouplingPort(Identifiable):
         return self
 
 
-
 class EthernetCommunicationController(CommunicationController):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -500,6 +509,7 @@ class EthernetCommunicationController(CommunicationController):
         self.slaveQualifiedUnexpectedLinkDownTime = value
         return self
 
+
 class EthernetCommunicationConnector(CommunicationConnector):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -554,6 +564,7 @@ class EthernetCommunicationConnector(CommunicationConnector):
         self.pathMtuTimeout = value
         return self
     
+
 class RequestResponseDelay(ARObject):
     def __init__(self):
         super().__init__()
@@ -577,6 +588,7 @@ class RequestResponseDelay(ARObject):
             self.minValue = value
         return self
 
+
 class InitialSdDelayConfig(ARObject):
     def __init__(self):
         super().__init__()

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

@@ -2,9 +2,10 @@ from typing import List
 from ....M2.MSR.Documentation.Annotation import Annotation
 from ....M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARFloat, RefType, ARLiteral
 from ....M2.AUTOSARTemplates.CommonStructure import ValueSpecification
 
+
 class SwDataDefPropsConditional(ARObject):
     '''
     Patch for the time-stamp
@@ -12,6 +13,14 @@ class SwDataDefPropsConditional(ARObject):
     def __init__(self):
         super().__init__()
 
+
+class SwImplPolicyEnum(AREnum):
+    def __init__(self, enum_values):
+        super().__init__([
+
+        ])
+
+
 class SwDataDefProps(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/M2/MSR/Documentation/BlockElements/Figure.py

@@ -0,0 +1,163 @@
+from typing import List
+
+from .....M2.MSR.Documentation.TextModel.LanguageDataModel import LanguageSpecific
+from .....M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import Paginateable
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import EngineeringObject
+from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, String
+
+
+class GraphicFitEnum(AREnum):
+    def __init__(self, enum_values):
+        super().__init__([
+
+        ])
+
+
+class Graphic(EngineeringObject):
+    def __init__(self):
+        super().__init__()
+
+        self.editfit = None                                     # type: GraphicFitEnum
+        self.editHeight = None                                  # type: String
+        self.editscale = None                                   # type: String
+        self.editWidth = None                                   # type: String
+        self.filename = None                                    # type: String
+        self.fit = None                                         # type: GraphicFitEnum
+
+    def getEditfit(self):
+        return self.editfit
+
+    def setEditfit(self, value):
+        if value is not None:
+            self.editfit = value
+        return self
+
+    def getEditHeight(self):
+        return self.editHeight
+
+    def setEditHeight(self, value):
+        if value is not None:
+            self.editHeight = value
+        return self
+
+    def getEditscale(self):
+        return self.editscale
+
+    def setEditscale(self, value):
+        if value is not None:
+            self.editscale = value
+        return self
+
+    def getEditWidth(self):
+        return self.editWidth
+
+    def setEditWidth(self, value):
+        if value is not None:
+            self.editWidth = value
+        return self
+
+    def getFilename(self):
+        return self.filename
+
+    def setFilename(self, value):
+        if value is not None:
+            self.filename = value
+        return self
+
+    def getFit(self):
+        return self.fit
+
+    def setFit(self, value):
+        if value is not None:
+            self.fit = value
+        return self
+    
+
+class Map(ARObject):
+    def __init__(self):
+        super().__init__()
+    
+
+class LGraphic(LanguageSpecific):
+    def __init__(self):
+        super().__init__()
+
+        self.l = None                                           # type: str                         # noqa E741
+        self.graphic = None                                     # type: Graphic
+        self.map = None                                         # type: Map
+
+    def getL(self):
+        return self.l
+
+    def setL(self, value):
+        if value is not None:
+            self.l = value                                                                          # noqa E741
+        return self
+
+    def getGraphic(self):
+        return self.graphic
+
+    def setGraphic(self, value):
+        if value is not None:
+            self.graphic = value
+        return self
+
+    def getMap(self):
+        return self.map
+
+    def setMap(self, value):
+        if value is not None:
+            self.map = value
+        return self
+
+
+class MlFigure(Paginateable):
+    def __init__(self):
+        super().__init__()
+
+        self.figureCaption = None                               # type: Caption
+        self.helpEntry = None                                   # type: String
+        self.lGraphics = []                                     # type: List[LGraphic]
+        self.pgwide = None                                      # type: PgwideEnum
+        self.verbatim = None                                    # type: MultiLanguageVerbatim
+
+    def getFigureCaption(self):
+        return self.figureCaption
+
+    def setFigureCaption(self, value):
+        if value is not None:
+            self.figureCaption = value
+        return self
+
+    def getHelpEntry(self):
+        return self.helpEntry
+
+    def setHelpEntry(self, value):
+        if value is not None:
+            self.helpEntry = value
+        return self
+
+    def getLGraphics(self):
+        return self.lGraphics
+
+    def addLGraphics(self, value):
+        if value is not None:
+            self.lGraphics.append(value)
+        return self
+
+    def getPgwide(self):
+        return self.pgwide
+
+    def setPgwide(self, value):
+        if value is not None:
+            self.pgwide = value
+        return self
+
+    def getVerbatim(self):
+        return self.verbatim
+
+    def setVerbatim(self, value):
+        if value is not None:
+            self.verbatim = value
+        return self

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/ListElements.py

@@ -3,6 +3,7 @@ from typing import List
 from ......M2.MSR.Documentation.TextModel.BlockElements.PaginationAndView import Paginateable
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum
 
+
 class ListEnum(AREnum):
 
     NUMBER = 'number'
@@ -14,6 +15,7 @@ class ListEnum(AREnum):
             ListEnum.UNNUMBER
         ))
 
+
 class Item(Paginateable):
     def __init__(self):
         super().__init__()
@@ -27,10 +29,11 @@ class Item(Paginateable):
         self.itemContents = value
         return self
 
-class ListElement(Paginateable):
+
+class ARList(Paginateable):
     '''
         This meta-class represents the ability to express a list. The kind of list is specified in the attribute.
-        In AUTOSAR standard class name shall be List, but it is conflict with Python List and renamed to ListElement
+        In AUTOSAR standard class name shall be List, but it is conflict with Python List and renamed to ARList
     '''
     def __init__(self):
         super().__init__()
@@ -51,4 +54,3 @@ class ListElement(Paginateable):
     def setType(self, value):
         self.type = value
         return self
-

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/PaginationAndView.py

@@ -1,9 +1,30 @@
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
+
 class DocumentViewSelectable(ARObject):
     def __init__(self):
         super().__init__()
 
+
 class Paginateable(DocumentViewSelectable):
     def __init__(self):
-        super().__init__()
+        super().__init__()
+
+        self.chapterBreak = None                                # type: ChapterEnumBreak
+        self.keepWithPrevious = None                            # type: KeepWithPreviousEnum
+
+    def getBreak(self):
+        return self.chapterBreak
+
+    def setBreak(self, value):
+        if value is not None:
+            self.chapterBreak = value
+        return self
+
+    def getKeepWithPrevious(self):
+        return self.keepWithPrevious
+
+    def setKeepWithPrevious(self, value):
+        if value is not None:
+            self.keepWithPrevious = value
+        return self

armodel/models/M2/MSR/Documentation/TextModel/BlockElements/__init__.py

@@ -1,25 +1,110 @@
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ......M2.MSR.Documentation.BlockElements.Figure import MlFigure
+from ......M2.MSR.Documentation.TextModel.BlockElements.ListElements import ARList
 from ......M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageParagraph
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from typing import List
 
+
 class DocumentationBlock(ARObject):
     def __init__(self):
         super().__init__()
 
+        self.defList = None                         # type: DefList
+        self.figures = []                           # type: List[MlFigure]
+        self.formula = None                         # type：MlFormula
+        self.labeledList = None                     # type: LabeledList
+        self.lists = []                             # type: List[ARList]
+        self.msrQueryP2 = None                      # type: MsrQueryP2
+        self.note = None                            # type: Note
         self.ps = []                                # type: List[MultiLanguageParagraph]
-        self.lists = []                             # type: List[ListElement]
+        self.structuredReq = None                   # type: StructuredReq
+        self.trace = None                           # type: TraceableText
+        self.verbatim = None                        # type: MultiLanguageVerbatim
 
-    def addP(self, p: MultiLanguageParagraph):
-        self.ps.append(p)
+    def getDefList(self):
+        return self.defList
+
+    def setDefList(self, value):
+        if value is not None:
+            self.defList = value
+        return self
+
+    def getFigures(self):
+        return self.figures
+
+    def addFigure(self, value):
+        if value is not None:
+            self.figures.append(value)  
+        return self
+
+    def getFormula(self):
+        return self.formula
+
+    def setFormula(self, value):
+        if value is not None:
+            self.formula = value
+        return self
+
+    def getLabeledList(self):
+        return self.labeledList
+
+    def setLabeledList(self, value):
+        if value is not None:
+            self.labeledList = value
         return self
 
-    def getPs(self) -> List[MultiLanguageParagraph]:
-        return self.ps
-    
     def getLists(self):
         return self.lists
 
     def addList(self, value):
-        self.lists.append(value)
+        if value is not None:
+            self.lists.append(value)
+        return self
+
+    def getMsrQueryP2(self):
+        return self.msrQueryP2
+
+    def setMsrQueryP2(self, value):
+        if value is not None:
+            self.msrQueryP2 = value
+        return self
+
+    def getNote(self):
+        return self.note
+
+    def setNote(self, value):
+        if value is not None:
+            self.note = value
+        return self
+
+    def getPs(self) -> List[MultiLanguageParagraph]:
+        return self.ps
+
+    def addP(self, value):
+        if value is not None:
+            self.ps.append(value)
+        return self
+
+    def getStructuredReq(self):
+        return self.structuredReq
+
+    def setStructuredReq(self, value):
+        if value is not None:
+            self.structuredReq = value
+        return self
+
+    def getTrace(self):
+        return self.trace
+
+    def setTrace(self, value):
+        if value is not None:
+            self.trace = value
+        return self
+
+    def getVerbatim(self):
+        return self.verbatim
+
+    def setVerbatim(self, value):
+        if value is not None:
+            self.verbatim = value
         return self

armodel/models/__init__.py

@@ -36,6 +36,8 @@ from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import
 from .M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.MemorySectionUsage import *
 from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import *
 from .M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import *
+from .M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.Keyword import *
+from .M2.AUTOSARTemplates.CommonStructure.StandardizationTemplate.BlueprintDedicated.PortPrototypeBlueprint import *
 from .M2.AUTOSARTemplates.CommonStructure.TriggerDeclaration import *
 from .M2.AUTOSARTemplates.DiagnosticExtract.DiagnosticContribution import *
 from .M2.AUTOSARTemplates.SWComponentTemplate import *

armodel/parser/abstract_arxml_parser.py

@@ -258,8 +258,11 @@ class AbstractARXMLParser:
         results = []
         for child_element in child_elements:
             ref = RefType()
-            ref.dest = child_element.attrib['DEST']
-            ref.value = child_element.text
+            if 'BASE' in child_element.attrib:
+                ref.setBase(child_element.attrib['BASE'])
+            if 'DEST' in child_element.attrib:
+                ref.setDest(child_element.attrib['DEST'])
+            ref.setValue(child_element.text)
             results.append(ref)
         return results