py-eb-model 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

eb_model/models/__init__.py

@@ -1,3 +1,4 @@
 from .abstract import *
 from .os_xdm import *
+from .rte_xdm import *
 from .eb_doc import *

eb_model/models/os_xdm.py

@@ -159,11 +159,179 @@ class OsAlarm(EcucContainer):
 
         return "\n".join(result)
 
+class OsApplicationHooks(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.OsAppErrorHook = False                                     # type: bool
+        self.OsAppShutdownHook = False                                  # type: bool
+        self.OsAppStartupHook = False                                   # type: bool
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
+
+    def getOsAppErrorHook(self):
+        return self.OsAppErrorHook
+
+    def setOsAppErrorHook(self, value):
+        self.OsAppErrorHook = value
+        return self
+
+    def getOsAppShutdownHook(self):
+        return self.OsAppShutdownHook
+
+    def setOsAppShutdownHook(self, value):
+        self.OsAppShutdownHook = value
+        return self
+
+    def getOsAppStartupHook(self):
+        return self.OsAppStartupHook
+
+    def setOsAppStartupHook(self, value):
+        self.OsAppStartupHook = value
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
+
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+
+class OsApplicationTrustedFunction(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
+
+        self.OsTrustedFunctionName = None                               # type: str
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
 
+    def getOsTrustedFunctionName(self):
+        return self.OsTrustedFunctionName
+
+    def setOsTrustedFunctionName(self, value):
+        self.OsTrustedFunctionName = value
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
+
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+class OsAppMode(EcucContainer):
+    def __init__(self, parent, name):
+        super().__init__(parent, name)
 class OsApplication(EcucContainer):
     def __init__(self, parent, name) -> None:
         super().__init__(parent, name)
 
+        self.OsTrusted = False                                          # type: bool
+        self.OsTrustedApplicationDelayTimingViolationCall = False       # type: bool
+        self.OsTrustedApplicationWithProtection = False                 # type: bool
+        self.OsAppAlarmRefs = []                                        # type: List[EcucRefType]
+        self.OsAppCounterRefs = []                                      # type: List[EcucRefType]
+        self.OsAppEcucPartitionRefs = []                                # type: List[EcucRefType]
+        self.OsAppIsrRefs = []                                          # type: List[EcucRefType]
+        self.OsApplicationCoreRefs = []                                 # type: List[EcucRefType]
+        self.OsAppScheduleTableRefs = []                                # type: List[EcucRefType]
+        self.OsAppTaskRefs = []                                         # type: List[EcucRefType]
+        self.OsMemoryMappingCodeLocationRef = None                      # type: EcucRefType
+        self.OsRestartTask = None                                       # type: EcucRefType
+
+        '''
+        EB Tresos
+        '''
+        self.OsAppResourceRefs = []                                     # type: List[EcucRefType] 
+
+    def getOsTrusted(self):
+        return self.OsTrusted
+
+    def setOsTrusted(self, value):
+        self.OsTrusted = value
+        return self
+
+    def getOsTrustedApplicationDelayTimingViolationCall(self):
+        return self.OsTrustedApplicationDelayTimingViolationCall
+
+    def setOsTrustedApplicationDelayTimingViolationCall(self, value):
+        self.OsTrustedApplicationDelayTimingViolationCall = value
+        return self
+
+    def getOsTrustedApplicationWithProtection(self):
+        return self.OsTrustedApplicationWithProtection
+
+    def setOsTrustedApplicationWithProtection(self, value):
+        self.OsTrustedApplicationWithProtection = value
+        return self
+
+    def getOsAppAlarmRefs(self):
+        return self.OsAppAlarmRefs
+
+    def addOsAppAlarmRef(self, value):
+        self.OsAppAlarmRefs.append(value)
+        return self
+
+    def getOsAppCounterRefs(self):
+        return self.OsAppCounterRefs
+
+    def addOsAppCounterRefs(self, value):
+        self.OsAppCounterRefs.append(value)
+        return self
+
+    def getOsAppEcucPartitionRefs(self):
+        return self.OsAppEcucPartitionRefs
+
+    def addOsAppEcucPartitionRefs(self, value):
+        self.OsAppEcucPartitionRefs.append(value)
+        return self
+
+    def getOsAppIsrRefs(self):
+        return self.OsAppIsrRefs
+
+    def addOsAppIsrRefs(self, value):
+        self.OsAppIsrRefs.append(value)
+        return self
+
+    def getOsApplicationCoreRefs(self):
+        return self.OsApplicationCoreRefs
+
+    def addOsApplicationCoreRefs(self, value):
+        self.OsApplicationCoreRefs.append(value)
+        return self
+
+    def getOsAppScheduleTableRefs(self):
+        return self.OsAppScheduleTableRefs
+
+    def addOsAppScheduleTableRef(self, value):
+        self.OsAppScheduleTableRefs.append(value)
+        return self
+
+    def getOsAppTaskRefs(self):
+        return self.OsAppTaskRefs
+
+    def addOsAppTaskRefs(self, value):
+        self.OsAppTaskRefs.append(value)
+        return self
+
+    def getOsMemoryMappingCodeLocationRef(self):
+        return self.OsMemoryMappingCodeLocationRef
+
+    def setOsMemoryMappingCodeLocationRef(self, value):
+        self.OsMemoryMappingCodeLocationRef = value
+        return self
+
+    def getOsRestartTask(self):
+        return self.OsRestartTask
+
+    def setOsRestartTask(self, value):
+        self.OsRestartTask = value
+        return self
+    
+    def getOsAppResourceRefs(self):
+        return self.OsAppResourceRefs
+
+    def addOsAppResourceRef(self, value):
+        self.OsAppResourceRefs.append(value)
+        return self
+
 
 class OsDriver(EcucContainer):
     def __init__(self, parent, name) -> None:
@@ -435,9 +603,9 @@ class OsTask(EcucObject):
         self.osTaskPriority = None                      # type: int
         self.osTaskSchedule = ""
         self.osStacksize = 0                            # type: int
-        self.osMemoryMappingCodeLocationRef = None
+        self.osMemoryMappingCodeLocationRef = None      # type: EcucRefType
         self.osTaskAccessingApplication = None
-        self.osTaskEventRef = None
+        self.osTaskEventRef = None                      # type: EcucRefType
         self.osTaskResourceRefs = []                    # type: List[EcucRefType]
 
     def getOsTaskActivation(self):
@@ -750,6 +918,7 @@ class Os(EcucContainer):
         self.osAlarms = []                              # type: List[OsAlarm]
         self.osScheduleTables = []                      # type: List[OsScheduleTable]
         self.osCounters = []                            # type: List[OsCounter]
+        self.osApplications = []                        # type: List[OsApplication]
 
     def getOsTaskList(self) -> List[OsTask]:
         return list(sorted(filter(lambda a: isinstance(a, OsTask), self.elements.values()), key=lambda o: o.name))
@@ -789,4 +958,12 @@ class Os(EcucContainer):
     def addOsCounter(self, os_counter: OsCounter):
         self.addElement(os_counter)
         self.osCounters.append(os_counter)
-        return self
+        return self
+    
+    def getOsApplicationList(self) -> List[OsApplication]:
+        return list(sorted(filter(lambda a: isinstance(a, OsApplication), self.elements.values()), key=lambda o: o.name))
+
+    def addOsApplication(self, value):
+        self.addElement(value)
+        self.osApplications.append(value)
+        return self

eb_model/models/rte_xdm.py

@@ -402,11 +402,11 @@ class RteBswModuleInstance(AbstractRteInstance):
         self.rteBswImplementationRef = None
         self.rteBswModuleConfigurationRefs = []
         self.rteBswEventToIsrMappings = []
-        self.rteBswEventToTaskMappings = []                     # List[RteBswEventToTaskMapping]
+        self.rteBswEventToTaskMappings = []                     # type: List[RteBswEventToTaskMapping]
         self.rteBswExclusiveAreaImpls = []
         self.rteBswExternalTriggerConfigs = []
         self.rteBswInternalTriggerConfigs = []
-        self.rteMappedToOsApplicationRef = None
+        self.rteMappedToOsApplicationRef = None                 # type: EcucRefType
         self.rteBswModeMachineInstanceConfigs = []
         self.rteBswRequiredClientServerConnections = []
         self.rteBswRequiredModeGroupConnections = []
@@ -515,7 +515,7 @@ class Rte(EcucContainer):
         self.elements[value.getName()] = value
 
     def getRteSwComponentInstanceList(self) -> List[RteSwComponentInstance]:
-        return list(sorted(filter(lambda a: isinstance(a, RteBswModuleInstance), self.elements.values()), key= lambda o:o.name))
+        return list(sorted(filter(lambda a: isinstance(a, RteSwComponentInstance), self.elements.values()), key= lambda o:o.name))
 
     def addRteSwComponentInstance(self, value: RteSwComponentInstance):
         self.elements[value.getName()] = value

eb_model/parser/__init__.py

@@ -1 +1,2 @@
 from .os_xdm_parser import OsXdmParser
+from .rte_xdm_parser import RteXdmParser

eb_model/parser/os_xdm_parser.py

@@ -1,10 +1,9 @@
 import xml.etree.ElementTree as ET
-
 from ..models.eb_doc import EBModel
-from ..models.os_xdm import Os, OsAlarm, OsAlarmActivateTask, OsAlarmCallback, OsAlarmIncrementCounter, OsAlarmSetEvent, OsCounter, OsScheduleTable, OsScheduleTableEventSetting, OsScheduleTableExpiryPoint, OsScheduleTableTaskActivation, OsScheduleTblAdjustableExpPoint, OsTask, OsIsr
+from ..models.os_xdm import Os, OsAlarm, OsAlarmActivateTask, OsAlarmCallback, OsAlarmIncrementCounter, OsAlarmSetEvent, OsCounter, OsScheduleTable, OsScheduleTableEventSetting, OsScheduleTableExpiryPoint, OsScheduleTableTaskActivation, OsScheduleTblAdjustableExpPoint
+from ..models.os_xdm import OsTask, OsIsr, OsApplication
 from .eb_parser import AbstractEbModelParser
 
-
 class OsXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()
@@ -20,6 +19,7 @@ class OsXdmParser(AbstractEbModelParser):
         self.read_os_alarms(element, os)
         self.read_os_schedule_tables(element, os)
         self.read_os_counters(element, os)
+        self.read_os_applications(element, os)
 
     def read_os_tasks(self, element: ET.Element, os: Os):
         for ctr_tag in self.find_ctr_tag_list(element, "OsTask"):
@@ -62,7 +62,7 @@ class OsXdmParser(AbstractEbModelParser):
                 .setOsAlarmSetEventTaskRef(self.read_ref_value(element, "OsAlarmSetEventTaskRef"))
         elif chc == "OsAlarmCallback":
             os_alarm_action = OsAlarmCallback(os_alarm, "OsAlarmCallback") \
-                .setOsAlarmCallbackName(self.read_value(os_alarm, "OsAlarmCallbackName"))
+                .setOsAlarmCallbackName(self.read_value(element, "OsAlarmCallbackName"))
         else:
             raise ValueError("Unsupported OsAlarmAction <%s>" % chc)
         os_alarm.setOsAlarmAction(os_alarm_action)
@@ -140,3 +140,14 @@ class OsXdmParser(AbstractEbModelParser):
 
             self.logger.debug("Read OsCounter <%s>" % counter.getName())
             os.addOsScheduleTable(counter)
+
+    def read_os_applications(self, element: ET.Element, os: Os):
+        for ctr_tag in self.find_ctr_tag_list(element, "OsApplication"):
+            os_app = OsApplication(os, ctr_tag.attrib["name"]) \
+                .setOsTrusted(self.read_value(ctr_tag, "OsTrusted")) 
+            
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppResourceRef"):
+                os_app.addOsAppResourceRef(ref)
+
+            self.logger.debug("Read OsApplication <%s>" % os_app.getName())
+            os.addOsApplication(os_app)

eb_model/parser/rte_xdm_parser.py

@@ -4,7 +4,6 @@ from ..models.rte_xdm import Rte, RteBswEventToTaskMapping, RteBswModuleInstance
 from ..models.eb_doc import EBModel
 from .eb_parser import AbstractEbModelParser
 
-
 class RteXdmParser(AbstractEbModelParser):
     def __init__(self, ) -> None:
         super().__init__()

{py_eb_model-1.0.1.dist-info → py_eb_model-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.0.1
+Version: 1.0.2
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -89,6 +89,9 @@ rte-xdm-xlsx -r data/Rte.xdm data/Os.xdm data/Runnable.xlsx
 1. Change the attribute to start with lowercase 
 2. *read_ref_value* and *read_optional_ref_value* method returns EcucRefType.
 3. Read the OsScheduleTable and export to excel
-4. REad the OsCounter and export to excel
+4. Read the OsCounter and export to excel
 
+**Version 1.0.2**
+
+1. Fix the setOsAlarmCallbackName bug
 

{py_eb_model-1.0.1.dist-info → py_eb_model-1.0.2.dist-info}/RECORD

@@ -2,16 +2,16 @@ eb_model/__init__.py,sha256=u3VUin2V_1eExLd9NIpw_LGHIAwaG2vEoyhssZurrvM,69
 eb_model/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eb_model/cli/os_xdm_2_xls_cli.py,sha256=lTIYNVDDMIKu6sosjV8I3pLQxD-I11cKjUDXTyKDrLE,1643
 eb_model/cli/rte_xdm_2_xls_cli.py,sha256=83uzE2Vk0h267gWxF9mnWN3Bh69RJpYyKULFXpxTByY,2127
-eb_model/models/__init__.py,sha256=_WDgFMwl8w3WnI4ZpjHXMdJVdmqPRpwJ8GLMb4_RGk0,71
+eb_model/models/__init__.py,sha256=TH1OtmIdLdd_sLh9o4rczuRDL68OXxdKjDVuxj4Lfsw,95
 eb_model/models/abstract.py,sha256=4jy328yy2sedIHNwfxjzW3CnVsnTCoskatT8JXjv-rE,2402
 eb_model/models/eb_doc.py,sha256=wWMHdLYpyvmEVlgNLzFLvC8C_uGnlPP4xnx_DlkslY4,1417
-eb_model/models/os_xdm.py,sha256=KouM8Gh4ELl7oQUcgeQ-3Sm1gk4GhTOVZUNt25Rvowo,25163
-eb_model/models/rte_xdm.py,sha256=8nYX567TgOH6BzsgaNOd2WTPGCxETTYXO9MQICrfCfQ,19328
-eb_model/parser/__init__.py,sha256=5qHXKEfEMcE0WvvinJQu_21bNzWFdXTJxUudy-85DEE,40
+eb_model/models/os_xdm.py,sha256=Wk_B3yBvXwZpxwKyTKJBIBhr4ovpiglGCq2XEmYX6gs,31678
+eb_model/models/rte_xdm.py,sha256=3fygp2zmvVL9enWqvrERAp5sexNowbsscCKZbIdZiKU,19372
+eb_model/parser/__init__.py,sha256=aQxwzw9OSziRSoZERED_vDxUUGU5GG0yhwMn14ugACw,82
 eb_model/parser/eb_parser.py,sha256=H5NTDdM0DaGiHsZ6VjaA1pKla5mDePmTDp1jjbeFAbE,7057
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-eb_model/parser/os_xdm_parser.py,sha256=rczz4YjDzCqNhOb4xAlGLfmWhIMBT9fQ6tSDmIk9kRs,8405
-eb_model/parser/rte_xdm_parser.py,sha256=VbzrowPLpSww8E-Zl--aKTJ9ltHaZ9-wlVGL1nF79FE,4029
+eb_model/parser/os_xdm_parser.py,sha256=5qF8LouRHjA95YjpXtJwa7s2Vm1eIwvp49FMwc4oacs,9032
+eb_model/parser/rte_xdm_parser.py,sha256=ywAJiBTgI2WifB-rSdoh6PWvRZ4hSSdy4hmdilSTfU0,4027
 eb_model/reporter/__init__.py,sha256=H8D_23UwJi1Ph6yjBfZhxWVbu9ci5_O4471gqXGiZCM,36
 eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
 eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,9 +37,9 @@ py_eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtb
 py_eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_eb_model/reporter/excel_reporter/abstract.py,sha256=BOuLhWwwTwqBzErtmwPrelB1iByMfZP9haFmg9ayFQw,1488
 py_eb_model/reporter/excel_reporter/os_xdm.py,sha256=WGMxK0PYxi9J5fUZ-EeiiM8NBpIg2WyxRsrN-gK37YE,1589
-py_eb_model-1.0.1.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.0.1.dist-info/METADATA,sha256=9Z-Evx5Ti6je_cIEhCiwJeYSux4bHJb1ZW5GdCu9wK0,2400
-py_eb_model-1.0.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.0.1.dist-info/entry_points.txt,sha256=vC-sGaF_j37QgkuYsJooGZBN1jnHYWQC4jehliu37fY,119
-py_eb_model-1.0.1.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.0.1.dist-info/RECORD,,
+py_eb_model-1.0.2.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.0.2.dist-info/METADATA,sha256=Fzh5KTLcGdBnJALQrNXQKEiw0Qv-iTlCLcw0Zz6u7NM,2460
+py_eb_model-1.0.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.0.2.dist-info/entry_points.txt,sha256=vC-sGaF_j37QgkuYsJooGZBN1jnHYWQC4jehliu37fY,119
+py_eb_model-1.0.2.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.0.2.dist-info/RECORD,,