volvocars/powertrain-build
Code Issues Proposed changes

Start adding io keys from ZC yaml files

Browse Source 
Change-Id: I02f07867b2c8211bf85014a9acebb617854091de
This commit is contained in:
Henrik Wahlqvist 2025-04-09 09:16:52 +02:00
parent aaef0189d4
commit 9fc9a2f40d
9 changed files with 156 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
powertrain_build/zone_controller/composition_yaml.py
View File

@ -514,6 +514,8 @@ class CompositionYaml(ProblemLogger):
if self.build_cfg.get_composition_config("includeStatic"):
swcs[software_component_name]["static"] = self.meas_class_info["autosar"]["class_info"]
swcs[software_component_name]["ports"] = self._get_ports_info()
if self.composition_spec.get("io") is not None:
swcs[software_component_name]["io"] = self.composition_spec["io"]
diagnostic_info = self._get_diagnostic_info()
if self.build_cfg.get_composition_config("includeDiagnostics"):
swcs[software_component_name]["diagnostics"] = diagnostic_info

56
test_data/zone_controller/test_composition_yaml/composition_yaml.py
View File

@ -27,6 +27,20 @@ expected_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},
@ -60,6 +74,20 @@ expected_extra_runnable_keys_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
}
@ -92,6 +120,20 @@ expected_custom_names_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},
@ -133,6 +175,20 @@ expected_cal_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.cal_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},

14
test_data/zone_controller/test_composition_yaml/composition_yaml_setup.py
View File

@ -406,6 +406,20 @@ get_per_cfg_unit_cfg_return_value = {
}
zc_spec = {
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_a2l_axis_data.py
View File

@ -217,6 +217,20 @@ expected_result = {
]
}
},
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_calls_all_fields.py
View File

@ -33,6 +33,20 @@ expected_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"},
"CallOne": {"direction": "IN", "interface": "InterfaceOne"}

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_calls_no_optional_fields.py
View File

@ -32,6 +32,20 @@ expected_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"},
"CallOne": {"direction": "IN", "interface": "CallOne"}

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_dids.py
View File

@ -89,6 +89,20 @@ expected_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"},
}

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_dtcs.py
View File

@ -71,6 +71,20 @@ expected_result = {
"nv-needs": {},
"static": composition_yaml_setup.base_static,
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"},
}

14
test_data/zone_controller/test_composition_yaml/composition_yaml_with_nvm.py
View File

@ -146,6 +146,20 @@ expected_result = {
**additional_static,
},
"shared": composition_yaml_setup.base_shared,
"io": {
"DUMMY1": {
"DUMMY1": {
"dataElement": "DUMMY1",
"runnable": ["DummyRunnable"]
},
"PPortPrototype_IoHwAb_GetDUMMY1": {
"operation": "Op_IoHwAb_GetDUMMY1",
"runnable": ["DummyRunnable"],
"timeout": 0,
"calltype": "sync"
}
}
},
"ports": {
"GlobSignNme": {"direction": "IN", "interface": "PIGlobSignNme"}
},