py-eb-model 1.1.7__py3-none-any.whl → 1.1.9__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- eb_model/cli/pref_system_importer_cli.py +22 -13
- eb_model/models/importer_xdm.py +3 -1
- eb_model/models/nvm_xdm.py +321 -12
- eb_model/parser/eb_parser.py +6 -0
- eb_model/parser/nvm_xdm_parser.py +89 -12
- eb_model/parser/os_xdm_parser.py +29 -20
- eb_model/reporter/excel_reporter/abstract.py +7 -1
- eb_model/reporter/excel_reporter/nvm_xdm.py +97 -7
- eb_model/tests/parser/test_nvm_xdm_parser.py +259 -0
- eb_model/tests/parser/test_os_xdm_parser.py +246 -0
- eb_model/writer/text_writer.py +4 -2
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/METADATA +14 -1
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/RECORD +17 -16
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/LICENSE +0 -0
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/WHEEL +0 -0
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/entry_points.txt +0 -0
- {py_eb_model-1.1.7.dist-info → py_eb_model-1.1.9.dist-info}/top_level.txt +0 -0
eb_model/parser/os_xdm_parser.py
CHANGED
@@ -45,11 +45,11 @@ class OsXdmParser(AbstractEbModelParser):
|
|
45
45
|
def read_os_tasks(self, element: ET.Element, os: Os):
|
46
46
|
for ctr_tag in self.find_ctr_tag_list(element, "OsTask"):
|
47
47
|
os_task = OsTask(os, ctr_tag.attrib["name"])
|
48
|
-
os_task.setOsTaskPriority(int(self.read_value(ctr_tag, "OsTaskPriority")))
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
48
|
+
os_task.setOsTaskPriority(int(self.read_value(ctr_tag, "OsTaskPriority")))
|
49
|
+
os_task.setOsTaskActivation(self.read_value(ctr_tag, "OsTaskActivation"))
|
50
|
+
os_task.setOsTaskSchedule(self.read_value(ctr_tag, "OsTaskSchedule"))
|
51
|
+
os_task.setOsTaskType(self.read_optional_value(ctr_tag, "OsTaskType"))
|
52
|
+
os_task.setOsStacksize(int(self.read_value(ctr_tag, "OsStacksize")))
|
53
53
|
|
54
54
|
for resource_ref in self.read_ref_value_list(ctr_tag, "OsTaskResourceRef"):
|
55
55
|
os_task.addOsTaskResourceRef(resource_ref)
|
@@ -62,22 +62,22 @@ class OsXdmParser(AbstractEbModelParser):
|
|
62
62
|
def read_os_isrs(self, element: ET.Element, os: Os):
|
63
63
|
for ctr_tag in self.find_ctr_tag_list(element, "OsIsr"):
|
64
64
|
os_isr = OsIsr(os, ctr_tag.attrib["name"])
|
65
|
-
os_isr.setOsIsrCategory(self.read_value(ctr_tag, "OsIsrCategory"))
|
66
|
-
|
67
|
-
|
68
|
-
|
65
|
+
os_isr.setOsIsrCategory(self.read_value(ctr_tag, "OsIsrCategory"))
|
66
|
+
os_isr.setOsIsrPeriod(self.read_optional_value(ctr_tag, "OsIsrPeriod", 0.0))
|
67
|
+
os_isr.setOsStacksize(int(self.read_value(ctr_tag, "OsStacksize")))
|
68
|
+
os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsIsrPriority"))
|
69
69
|
|
70
70
|
# Infineon Aurix Tricore
|
71
|
-
os_isr.setOsIsrPriority(self.
|
72
|
-
os_isr.setOsIsrVector(self.
|
73
|
-
os_isr.setOsTricoreIrqLevel(self.
|
74
|
-
os_isr.setOsTricoreVector(self.
|
71
|
+
os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsTricoreIrqLevel"))
|
72
|
+
os_isr.setOsIsrVector(self.read_eb_origin_value(ctr_tag, "OsTricoreVector"))
|
73
|
+
os_isr.setOsTricoreIrqLevel(self.read_eb_origin_value(ctr_tag, "OsTricoreIrqLevel"))
|
74
|
+
os_isr.setOsTricoreVector(self.read_eb_origin_value(ctr_tag, "OsTricoreVector"))
|
75
75
|
|
76
76
|
# ARM Core
|
77
|
-
os_isr.setOsIsrPriority(self.
|
78
|
-
os_isr.setOsIsrVector(self.
|
79
|
-
os_isr.setOsARMIrqLevel(self.
|
80
|
-
os_isr.setOsARMVector(self.
|
77
|
+
os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsARMIrqLevel"))
|
78
|
+
os_isr.setOsIsrVector(self.read_eb_origin_value(ctr_tag, "OsARMVector"))
|
79
|
+
os_isr.setOsARMIrqLevel(self.read_eb_origin_value(ctr_tag, "OsARMIrqLevel"))
|
80
|
+
os_isr.setOsARMVector(self.read_eb_origin_value(ctr_tag, "OsARMVector"))
|
81
81
|
|
82
82
|
# EB Safety OS
|
83
83
|
for ref in self.read_ref_value_list(ctr_tag, "OsIsrMkMemoryRegionRef"):
|
@@ -186,15 +186,24 @@ class OsXdmParser(AbstractEbModelParser):
|
|
186
186
|
os_app = OsApplication(os, ctr_tag.attrib["name"]) \
|
187
187
|
.setOsTrusted(self.read_value(ctr_tag, "OsTrusted"))
|
188
188
|
|
189
|
+
for ref in self.read_ref_value_list(ctr_tag, "OsAppAlarmRef"):
|
190
|
+
os_app.addOsAppAlarmRef(ref)
|
191
|
+
|
192
|
+
for ref in self.read_ref_value_list(ctr_tag, "OsAppCounterRef"):
|
193
|
+
os_app.addOsAppCounterRefs(ref)
|
194
|
+
|
195
|
+
for ref in self.read_ref_value_list(ctr_tag, "OsAppIsrRef"):
|
196
|
+
os_app.addOsAppIsrRef(ref)
|
197
|
+
|
189
198
|
for ref in self.read_ref_value_list(ctr_tag, "OsAppResourceRef"):
|
190
199
|
os_app.addOsAppResourceRef(ref)
|
191
200
|
|
201
|
+
for ref in self.read_ref_value_list(ctr_tag, "OsAppScheduleTableRef"):
|
202
|
+
os_app.addOsAppScheduleTableRef(ref)
|
203
|
+
|
192
204
|
for ref in self.read_ref_value_list(ctr_tag, "OsAppTaskRef"):
|
193
205
|
os_app.addOsAppTaskRef(ref)
|
194
206
|
|
195
|
-
for ref in self.read_ref_value_list(ctr_tag, "OsAppIsrRef"):
|
196
|
-
os_app.addOsAppIsrRef(ref)
|
197
|
-
|
198
207
|
self.logger.debug("Read OsApplication <%s>" % os_app.getName())
|
199
208
|
os.addOsApplication(os_app)
|
200
209
|
|
@@ -41,11 +41,17 @@ class ExcelReporter:
|
|
41
41
|
cell.number_format = format['number_format']
|
42
42
|
return cell
|
43
43
|
|
44
|
+
def write_cell_center(self, sheet: Worksheet, row: int, column: int, value) -> Cell:
|
45
|
+
self.write_cell(sheet, row, column, value, format={"alignment": Alignment(horizontal="center")})
|
46
|
+
|
47
|
+
def write_bool_cell(self, sheet: Worksheet, row: int, column: int, value) -> Cell:
|
48
|
+
self.write_cell_center(sheet, row, column, self.format_boolean(value))
|
49
|
+
|
44
50
|
def format_boolean(self, value: bool) -> str:
|
45
51
|
if value is True:
|
46
52
|
return "Y"
|
47
53
|
else:
|
48
|
-
return "
|
54
|
+
return ""
|
49
55
|
|
50
56
|
def save(self, name: str):
|
51
57
|
self.wb.save(name)
|
@@ -1,30 +1,91 @@
|
|
1
1
|
from ...models.eb_doc import EBModel
|
2
|
+
from ...models.nvm_xdm import NvMEaRef, NvMFeeRef
|
2
3
|
from ...reporter.excel_reporter.abstract import ExcelReporter
|
4
|
+
from openpyxl.styles.alignment import Alignment
|
3
5
|
|
4
6
|
|
5
7
|
class NvMXdmXlsWriter(ExcelReporter):
|
6
8
|
def __init__(self) -> None:
|
7
9
|
super().__init__()
|
8
10
|
|
11
|
+
def write_nvm_general(self, doc: EBModel):
|
12
|
+
sheet = self.wb.create_sheet("General", 0)
|
13
|
+
|
14
|
+
title_row = ["Key", "Value"]
|
15
|
+
self.write_title_row(sheet, title_row)
|
16
|
+
|
17
|
+
nvm_common = doc.getNvM().getNvMCommon()
|
18
|
+
|
19
|
+
if nvm_common is None:
|
20
|
+
self.logger.error("NvMCommon is Invalid and General updating is skipped.")
|
21
|
+
return
|
22
|
+
|
23
|
+
row = 2
|
24
|
+
self.write_cell(sheet, row, 1, "NvMCompiledConfigId")
|
25
|
+
self.write_cell_center(sheet, row, 2, nvm_common.getNvMCompiledConfigId())
|
26
|
+
row += 1
|
27
|
+
self.write_cell(sheet, row, 1, "NvMDatasetSelectionBits")
|
28
|
+
self.write_cell_center(sheet, row, 2, nvm_common.getNvMDatasetSelectionBits())
|
29
|
+
row += 1
|
30
|
+
self.write_cell(sheet, row, 1, "NvMMaxNumOfReadRetries")
|
31
|
+
self.write_cell_center(sheet, row, 2, "3")
|
32
|
+
row += 1
|
33
|
+
self.write_cell(sheet, row, 1, "NvMMaxNumOfWriteRetries")
|
34
|
+
self.write_cell_center(sheet, row, 2, "3")
|
35
|
+
row += 1
|
36
|
+
|
37
|
+
self.auto_width(sheet)
|
38
|
+
|
9
39
|
def write_nvm_block_descriptors(self, doc: EBModel):
|
10
|
-
sheet = self.wb.create_sheet("
|
40
|
+
sheet = self.wb.create_sheet("Block List", 2)
|
11
41
|
|
12
42
|
title_row = [
|
13
43
|
"BlockId", "Name", "NvMBlockEcucPartitionRef", "NvMRamBlockDataAddress", "NvMRomBlockDataAddress",
|
14
|
-
"
|
44
|
+
"NvMBlockJobPriority", "NvMResistantToChangedSw", "NvMBlockManagementType", "NvMNvBlockLength", "NvMBlockCrcType",
|
45
|
+
"NvMNvBlockNum", "NvMSelectBlockForReadAll", "NvMSelectBlockForWriteAll", "NvMProvideRteJobFinishedPort", "NvMProvideRteServicePort",
|
46
|
+
"NvMInitBlockCallbackFnc", "NvMSingleBlockCallbackFnc", "NvMReadRamBlockFromNvCallback", "NvMWriteRamBlockToNvCallback", "NvMBlockUseSyncMechanism", # noqa E501
|
47
|
+
"NvMNvBlockBaseNumber", "NvMFeeRef"]
|
15
48
|
self.write_title_row(sheet, title_row)
|
16
49
|
|
17
50
|
row = 2
|
18
51
|
for nvm_block in doc.getNvM().getNvMBlockDescriptorList():
|
19
|
-
self.
|
52
|
+
self.write_cell_center(sheet, row, 1, nvm_block.getNvMNvramBlockIdentifier())
|
20
53
|
self.write_cell(sheet, row, 2, nvm_block.getName())
|
21
|
-
|
54
|
+
if nvm_block.getNvMBlockEcucPartitionRef() is not None:
|
55
|
+
self.write_cell_center(sheet, row, 3, nvm_block.getNvMBlockEcucPartitionRef().getShortName())
|
22
56
|
self.write_cell(sheet, row, 4, nvm_block.getNvMRamBlockDataAddress())
|
23
57
|
self.write_cell(sheet, row, 5, nvm_block.getNvMRomBlockDataAddress())
|
24
|
-
self.write_cell(sheet, row, 6, nvm_block.getNvMBlockManagementType())
|
25
|
-
self.write_cell(sheet, row, 7, nvm_block.getNvMNvBlockLength())
|
26
|
-
self.write_cell(sheet, row, 8, nvm_block.getNvMNvBlockNum())
|
27
58
|
|
59
|
+
self.write_cell_center(sheet, row, 6, nvm_block.getNvMBlockJobPriority())
|
60
|
+
self.write_bool_cell(sheet, row, 7, nvm_block.getNvMResistantToChangedSw())
|
61
|
+
self.write_cell_center(sheet, row, 8, nvm_block.getNvMBlockManagementType())
|
62
|
+
self.write_cell_center(sheet, row, 9, nvm_block.getNvMNvBlockLength())
|
63
|
+
if nvm_block.getNvMBlockUseCrc():
|
64
|
+
self.write_cell_center(sheet, row, 10, nvm_block.getNvMBlockCrcType())
|
65
|
+
|
66
|
+
self.write_cell(sheet, row, 11, nvm_block.getNvMNvBlockNum())
|
67
|
+
self.write_bool_cell(sheet, row, 12, nvm_block.getNvMSelectBlockForReadAll())
|
68
|
+
self.write_bool_cell(sheet, row, 13, nvm_block.getNvMSelectBlockForWriteAll())
|
69
|
+
self.write_bool_cell(sheet, row, 14, nvm_block.getNvMProvideRteJobFinishedPort())
|
70
|
+
self.write_bool_cell(sheet, row, 15, nvm_block.getNvMProvideRteServicePort())
|
71
|
+
|
72
|
+
if nvm_block.getNvMInitBlockCallback() is not None:
|
73
|
+
self.write_cell(sheet, row, 16, nvm_block.getNvMInitBlockCallback().getNvMInitBlockCallbackFnc())
|
74
|
+
if nvm_block.getNvMSingleBlockCallback() is not None:
|
75
|
+
self.write_cell(sheet, row, 17, nvm_block.getNvMSingleBlockCallback().getNvMSingleBlockCallbackFnc())
|
76
|
+
if nvm_block.getNvMReadRamBlockFromNvCallback() is not None:
|
77
|
+
self.write_cell(sheet, row, 18, nvm_block.getNvMReadRamBlockFromNvCallback())
|
78
|
+
if nvm_block.getNvMWriteRamBlockToNvCallback() is not None:
|
79
|
+
self.write_cell(sheet, row, 19, nvm_block.getNvMWriteRamBlockToNvCallback())
|
80
|
+
self.write_bool_cell(sheet, row, 20, nvm_block.getNvMBlockUseSyncMechanism())
|
81
|
+
|
82
|
+
self.write_cell_center(sheet, row, 21, nvm_block.getNvMNvBlockBaseNumber())
|
83
|
+
block_reference = nvm_block.getNvMTargetBlockReference()
|
84
|
+
if block_reference is not None:
|
85
|
+
if isinstance(block_reference, NvMFeeRef):
|
86
|
+
self.write_cell(sheet, row, 22, block_reference.getNvMNameOfFeeBlock().getShortName())
|
87
|
+
else:
|
88
|
+
raise NotImplementedError("Unsupported Target block reference.")
|
28
89
|
|
29
90
|
row += 1
|
30
91
|
|
@@ -32,9 +93,38 @@ class NvMXdmXlsWriter(ExcelReporter):
|
|
32
93
|
|
33
94
|
self.auto_width(sheet)
|
34
95
|
|
96
|
+
def write_nvm_bsw_distribution(self, doc: EBModel):
|
97
|
+
sheet = self.wb.create_sheet("BSW Distribution", 1)
|
98
|
+
|
99
|
+
title_row = ["NvMEcucPartitionRef", "Master"]
|
100
|
+
self.write_title_row(sheet, title_row)
|
101
|
+
|
102
|
+
nvm_common = doc.getNvM().getNvMCommon()
|
103
|
+
|
104
|
+
if nvm_common is None:
|
105
|
+
self.logger.error("NvMCommon is Invalid and BSW Distribution updating is skipped.")
|
106
|
+
return
|
107
|
+
|
108
|
+
master_partition_ref = nvm_common.getNvMMasterEcucPartitionRef()
|
109
|
+
|
110
|
+
row = 2
|
111
|
+
for ref_link in nvm_common.getNvMEcucPartitionRefList():
|
112
|
+
self.write_cell(sheet, row, 1, ref_link.getShortName())
|
113
|
+
if ref_link.getShortName() == master_partition_ref.getShortName():
|
114
|
+
self.write_cell(sheet, row, 2, "Y", format={"alignment": Alignment(horizontal="center")})
|
115
|
+
else:
|
116
|
+
self.write_cell(sheet, row, 2, "N", format={"alignment": Alignment(horizontal="center")})
|
117
|
+
row += 1
|
118
|
+
|
119
|
+
self.logger.debug("Write NvM EcucPartition <%s>" % ref_link.getShortName())
|
120
|
+
|
121
|
+
self.auto_width(sheet)
|
122
|
+
|
35
123
|
def write(self, filename, doc: EBModel, options):
|
36
124
|
self.logger.info("Writing <%s>" % filename)
|
37
125
|
|
126
|
+
self.write_nvm_general(doc)
|
127
|
+
self.write_nvm_bsw_distribution(doc)
|
38
128
|
self.write_nvm_block_descriptors(doc)
|
39
129
|
|
40
130
|
self.save(filename)
|
@@ -0,0 +1,259 @@
|
|
1
|
+
from eb_model.parser.nvm_xdm_parser import NvMXdmParser
|
2
|
+
from eb_model.models.eb_doc import EBModel
|
3
|
+
|
4
|
+
import xml.etree.ElementTree as ET
|
5
|
+
import pytest
|
6
|
+
|
7
|
+
|
8
|
+
class TestNvmXdmParser:
|
9
|
+
def test_read_nvm_block_descriptors(self):
|
10
|
+
|
11
|
+
# Create a mock XML element for testing
|
12
|
+
xml_content = """
|
13
|
+
<datamodel version="8.0"
|
14
|
+
xmlns="http://www.tresos.de/_projects/DataModel2/18/root.xsd"
|
15
|
+
xmlns:a="http://www.tresos.de/_projects/DataModel2/18/attribute.xsd"
|
16
|
+
xmlns:v="http://www.tresos.de/_projects/DataModel2/06/schema.xsd"
|
17
|
+
xmlns:d="http://www.tresos.de/_projects/DataModel2/06/data.xsd">
|
18
|
+
<d:lst name="NvMBlockDescriptor" type="MAP">
|
19
|
+
<d:ctr name="NvmBlock_TestData" type="IDENTIFIABLE">
|
20
|
+
<d:ref name="NvMBlockEcucPartitionRef" type="REFERENCE" value="ASPath:/EcuC/EcuC/EcucPartitionCollection/OsApplication_C0">
|
21
|
+
</d:ref>
|
22
|
+
<d:var name="NvMAdvancedRecovery" type="BOOLEAN" value="false">
|
23
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
24
|
+
</d:var>
|
25
|
+
<d:var name="NvMBlockUsePort" type="BOOLEAN" value="false">
|
26
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
27
|
+
</d:var>
|
28
|
+
<d:var name="NvMBlockUseCompression" type="BOOLEAN" value="false">
|
29
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
30
|
+
</d:var>
|
31
|
+
<d:ref name="NvMBlockCipheringRef" type="REFERENCE">
|
32
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
33
|
+
</d:ref>
|
34
|
+
<d:var name="NvMBlockHeaderInclude" type="STRING">
|
35
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
36
|
+
</d:var>
|
37
|
+
<d:var name="NvMBlockCrcType" type="ENUMERATION" value="NVM_CRC16">
|
38
|
+
<a:a name="ENABLE" value="true"/>
|
39
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
40
|
+
</d:var>
|
41
|
+
<d:var name="NvMBlockJobPriority" type="INTEGER" value="64">
|
42
|
+
</d:var>
|
43
|
+
<d:var name="NvMBlockManagementType" type="ENUMERATION" value="NVM_BLOCK_NATIVE">
|
44
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
45
|
+
</d:var>
|
46
|
+
<d:var name="NvMBlockUseCrc" type="BOOLEAN" value="true">
|
47
|
+
</d:var>
|
48
|
+
<d:var name="NvMBlockUseSyncMechanism" type="BOOLEAN" value="false">
|
49
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
50
|
+
</d:var>
|
51
|
+
<d:var name="ASR2011CallbackEnabled" type="BOOLEAN" value="false">
|
52
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
53
|
+
</d:var>
|
54
|
+
<d:var name="NvMBlockWriteProt" type="BOOLEAN" value="false">
|
55
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
56
|
+
</d:var>
|
57
|
+
<d:var name="NvMBswMBlockStatusInformation" type="BOOLEAN" value="false">
|
58
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
59
|
+
</d:var>
|
60
|
+
<d:var name="NvMCalcRamBlockCrc" type="BOOLEAN" value="false">
|
61
|
+
<a:a name="ENABLE" value="false"/>
|
62
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
63
|
+
</d:var>
|
64
|
+
<d:var name="NvMBlockUseCRCCompMechanism" type="BOOLEAN" value="false">
|
65
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
66
|
+
</d:var>
|
67
|
+
<d:var name="NvMBlockUseSetRamBlockStatus" type="BOOLEAN" value="true">
|
68
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
69
|
+
</d:var>
|
70
|
+
<d:var name="NvMExtraBlockChecks" type="BOOLEAN" value="false">
|
71
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
72
|
+
</d:var>
|
73
|
+
<d:ctr name="NvMInitBlockCallback" type="IDENTIFIABLE">
|
74
|
+
<a:a name="ENABLE" value="false"/>
|
75
|
+
<d:var name="NvMInitBlockCallbackFnc" type="FUNCTION-NAME" >
|
76
|
+
<a:a name="ENABLE" value="false"/>
|
77
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
78
|
+
</d:var>
|
79
|
+
</d:ctr>
|
80
|
+
<d:var name="NvMMaxNumOfReadRetries" type="INTEGER" value="0">
|
81
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
82
|
+
</d:var>
|
83
|
+
<d:var name="NvMMaxNumOfWriteRetries" type="INTEGER" value="3">
|
84
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
85
|
+
</d:var>
|
86
|
+
<d:var name="NvMNvBlockBaseNumber" type="INTEGER" value="6">
|
87
|
+
<a:a name="IMPORTER_INFO">
|
88
|
+
<a:v>@DEF</a:v>
|
89
|
+
<a:v>@CALC</a:v>
|
90
|
+
</a:a>
|
91
|
+
</d:var>
|
92
|
+
<d:var name="NvMNvBlockLength" type="INTEGER" value="64">
|
93
|
+
</d:var>
|
94
|
+
<d:var name="NvMNvBlockNum" type="INTEGER" value="1">
|
95
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
96
|
+
</d:var>
|
97
|
+
<d:var name="NvMNvramBlockIdentifier" type="INTEGER" value="9">
|
98
|
+
<a:a name="IMPORTER_INFO">
|
99
|
+
<a:v>@DEF</a:v>
|
100
|
+
<a:v>@CALC</a:v>
|
101
|
+
</a:a>
|
102
|
+
</d:var>
|
103
|
+
<d:var name="NvMNvramDeviceId" type="INTEGER" value="0">
|
104
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
105
|
+
</d:var>
|
106
|
+
<d:var name="NvMProvideRteAdminPort" type="BOOLEAN" value="false">
|
107
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
108
|
+
</d:var>
|
109
|
+
<d:var name="NvMProvideRteInitBlockPort" type="BOOLEAN" value="false">
|
110
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
111
|
+
</d:var>
|
112
|
+
<d:var name="NvMProvideRteJobFinishedPort" type="BOOLEAN" value="true">
|
113
|
+
</d:var>
|
114
|
+
<d:var name="NvMProvideRteMirrorPort" type="BOOLEAN" value="false">
|
115
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
116
|
+
</d:var>
|
117
|
+
<d:var name="NvMProvideRteServicePort" type="BOOLEAN" value="true">
|
118
|
+
</d:var>
|
119
|
+
<d:var name="NvMRPortInterfacesASRVersion" type="ENUMERATION" value="DEFAULT">
|
120
|
+
</d:var>
|
121
|
+
<d:var name="NvMRamBlockDataAddress" type="STRING" value="&Ram_TestData">
|
122
|
+
<a:a name="ENABLE" value="TRUE"/>
|
123
|
+
</d:var>
|
124
|
+
<d:var name="NvMReadRamBlockFromNvCallback" type="FUNCTION-NAME" value="">
|
125
|
+
<a:a name="ENABLE" value="FALSE"/>
|
126
|
+
</d:var>
|
127
|
+
<d:var name="NvMResistantToChangedSw" type="BOOLEAN" value="true">
|
128
|
+
</d:var>
|
129
|
+
<d:var name="NvMRomBlockDataAddress" type="STRING" value="&Rom_TestData">
|
130
|
+
<a:a name="ENABLE" value="TRUE"/>
|
131
|
+
</d:var>
|
132
|
+
<d:var name="NvMRomBlockNum" type="INTEGER" value="1">
|
133
|
+
</d:var>
|
134
|
+
<d:var name="NvMSelectBlockForReadAll" type="BOOLEAN" value="true">
|
135
|
+
<a:a name="ENABLE" value="TRUE"/>
|
136
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
137
|
+
</d:var>
|
138
|
+
<d:var name="NvMSelectBlockForWriteAll" type="BOOLEAN" value="true">
|
139
|
+
<a:a name="ENABLE" value="TRUE"/>
|
140
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
141
|
+
</d:var>
|
142
|
+
<d:var name="NvMSelectBlockForFirstInitAll" type="BOOLEAN" value="false">
|
143
|
+
<a:a name="ENABLE" value="TRUE"/>
|
144
|
+
</d:var>
|
145
|
+
<d:ctr name="NvMSingleBlockCallback" type="IDENTIFIABLE">
|
146
|
+
<a:a name="ENABLE" value="false"/>
|
147
|
+
<d:var name="NvMSingleBlockCallbackFnc" type="FUNCTION-NAME" >
|
148
|
+
<a:a name="ENABLE" value="false"/>
|
149
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
150
|
+
</d:var>
|
151
|
+
</d:ctr>
|
152
|
+
<d:var name="NvMStaticBlockIDCheck" type="BOOLEAN" value="false">
|
153
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
154
|
+
</d:var>
|
155
|
+
<d:var name="NvMBlockUseAutoValidation" type="BOOLEAN" value="false">
|
156
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
157
|
+
</d:var>
|
158
|
+
<d:chc name="NvMTargetBlockReference" type="IDENTIFIABLE" value="NvMFeeRef">
|
159
|
+
<d:ctr name="NvMEaRef" type="IDENTIFIABLE">
|
160
|
+
<d:ref name="NvMNameOfEaBlock" type="REFERENCE" ><a:a name="IMPORTER_INFO" value="@DEF"/>
|
161
|
+
</d:ref>
|
162
|
+
</d:ctr>
|
163
|
+
<d:ctr name="NvMFeeRef" type="IDENTIFIABLE">
|
164
|
+
<d:ref name="NvMNameOfFeeBlock" type="REFERENCE" value="ASPath:/Fee/Fee/Fee_NvmBlock_TestData"/>
|
165
|
+
</d:ctr>
|
166
|
+
</d:chc>
|
167
|
+
<d:var name="NvMUserProvidesSpaceForBlockAndCrc" type="BOOLEAN" value="false">
|
168
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
169
|
+
</d:var>
|
170
|
+
<d:var name="NvMEnBlockCheck" type="BOOLEAN" value="false">
|
171
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
172
|
+
</d:var>
|
173
|
+
<d:var name="NvMEnableBlockCryptoSecurityHandling" type="BOOLEAN" value="false">
|
174
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
175
|
+
</d:var>
|
176
|
+
<d:var name="NvMCryptoExtraInfoSize" type="INTEGER" value="0">
|
177
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
178
|
+
</d:var>
|
179
|
+
<d:var name="NvMBcEnSetAPI" type="BOOLEAN" value="true">
|
180
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
181
|
+
</d:var>
|
182
|
+
<d:var name="NvMBcEnAutoStart" type="BOOLEAN" value="true">
|
183
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
184
|
+
</d:var>
|
185
|
+
<d:var name="NvMBcEnCrcComp" type="BOOLEAN" value="false">
|
186
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
187
|
+
</d:var>
|
188
|
+
<d:var name="NvMBcEnRamComp" type="BOOLEAN" value="false">
|
189
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
190
|
+
</d:var>
|
191
|
+
<d:var name="NvMBcEnReddCopiesComp" type="BOOLEAN" value="false">
|
192
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
193
|
+
</d:var>
|
194
|
+
<d:var name="NvMBcEnAutoRepair" type="BOOLEAN" value="false">
|
195
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
196
|
+
</d:var>
|
197
|
+
<d:var name="NvMBcDelayCounter" type="INTEGER" value="0">
|
198
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
199
|
+
</d:var>
|
200
|
+
<d:var name="NvMWriteBlockOnce" type="BOOLEAN" value="false">
|
201
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
202
|
+
</d:var>
|
203
|
+
<d:var name="NvMWriteRamBlockToNvCallback" type="FUNCTION-NAME" value="">
|
204
|
+
<a:a name="ENABLE" value="FALSE"/>
|
205
|
+
</d:var>
|
206
|
+
<d:var name="NvMWriteVerification" type="BOOLEAN" value="false">
|
207
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
208
|
+
</d:var>
|
209
|
+
<d:var name="NvMWriteVerificationDataSize" type="INTEGER" value="1">
|
210
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
211
|
+
</d:var>
|
212
|
+
<d:var name="NvMPreWriteDataComp" type="BOOLEAN" value="false">
|
213
|
+
<a:a name="ENABLE" value="false"/>
|
214
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
215
|
+
</d:var>
|
216
|
+
<d:var name="NvMPreWriteDataCompDataSize" type="INTEGER" value="1">
|
217
|
+
<a:a name="IMPORTER_INFO" value="@DEF"/>
|
218
|
+
</d:var>
|
219
|
+
</d:ctr>
|
220
|
+
</d:lst>
|
221
|
+
</datamodel>
|
222
|
+
"""
|
223
|
+
element = ET.fromstring(xml_content)
|
224
|
+
|
225
|
+
model = EBModel.getInstance()
|
226
|
+
nvm = model.getNvM()
|
227
|
+
|
228
|
+
# Create parser instance
|
229
|
+
parser = NvMXdmParser()
|
230
|
+
parser.nsmap = {
|
231
|
+
'': "http://www.tresos.de/_projects/DataModel2/18/root.xsd",
|
232
|
+
'a': "http://www.tresos.de/_projects/DataModel2/18/attribute.xsd",
|
233
|
+
'v': "http://www.tresos.de/_projects/DataModel2/06/schema.xsd",
|
234
|
+
'd': "http://www.tresos.de/_projects/DataModel2/06/data.xsd"
|
235
|
+
}
|
236
|
+
|
237
|
+
# Call the method
|
238
|
+
parser.read_nvm_block_descriptors(element, nvm)
|
239
|
+
|
240
|
+
# Assertions
|
241
|
+
blocks = nvm.getNvMBlockDescriptorList()
|
242
|
+
assert len(blocks) == 1
|
243
|
+
|
244
|
+
# Validate first block
|
245
|
+
block1 = blocks[0]
|
246
|
+
assert block1.getName() == "NvmBlock_TestData"
|
247
|
+
assert block1.getNvMBlockCrcType() == "NVM_CRC16"
|
248
|
+
assert block1.getNvMBlockEcucPartitionRef().getShortName() == "OsApplication_C0"
|
249
|
+
assert block1.getNvMNvramBlockIdentifier() == 9
|
250
|
+
assert block1.getNvMRamBlockDataAddress() == "&Ram_TestData"
|
251
|
+
assert block1.getNvMRomBlockDataAddress() == "&Rom_TestData"
|
252
|
+
assert block1.getNvMRomBlockNum() == 1
|
253
|
+
assert block1.getNvMBlockManagementType() == "NVM_BLOCK_NATIVE"
|
254
|
+
assert block1.getNvMNvBlockLength() == 64
|
255
|
+
assert block1.getNvMNvBlockNum() == 1
|
256
|
+
assert block1.getNvMSelectBlockForReadAll() is True
|
257
|
+
assert block1.getNvMSelectBlockForWriteAll() is True
|
258
|
+
|
259
|
+
|