github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 21:47:22 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: fix move_enablement in the upgrader

Browse Source 
The EnablementType is now obsolete and config items having this type have
been updated to use the Boolean type. However, the upgrader is not changed
accordingly and it still converts "y" or "n" of certain config items to
"Enable" or "Disable".

This patch drops the EnablementType in the schema and updates the upgrader
to respect the latest definitions.

Tracked-On: #6690
Signed-off-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Junjie Mao 2022-05-25 16:32:30 +08:00 committed by acrnsi-robot
parent 7c8231f8b1
commit ba2ea5503f
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/config_tools/scenario_config/upgrader.py
View File

@ -594,13 +594,13 @@ class ScenarioUpgrader(ScenarioTransformer):
return False return False
def move_enablement(self, xpath, xsd_element_node, xml_parent_node, new_nodes, values_as_enabled = ["y"], values_as_disabled = ["n"]): def move_enablement(self, xpath, xsd_element_node, xml_parent_node, new_nodes, values_as_enabled = ["Enable"], values_as_disabled = ["Disable"]):
ret = self.move_data_by_xpath(xpath, xsd_element_node, xml_parent_node, new_nodes) ret = self.move_data_by_xpath(xpath, xsd_element_node, xml_parent_node, new_nodes)
for n in new_nodes: for n in new_nodes:
if n.text in values_as_enabled: if n.text in values_as_enabled:
n.text = "Enable" n.text = "y"
elif n.text in values_as_disabled: elif n.text in values_as_disabled:
n.text = "Disable" n.text = "n"
return ret return ret
def move_data_by_xpath(self, xpath, xsd_element_node, xml_parent_node, new_nodes, scenario_xml_only = False, launch_xml_only = False): def move_data_by_xpath(self, xpath, xsd_element_node, xml_parent_node, new_nodes, scenario_xml_only = False, launch_xml_only = False):

10
misc/config_tools/schema/types.xsd
View File

@ -13,16 +13,6 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="EnablementType">
<xs:annotation>
<xs:documentation>A string with value: ``Enable`` or ``Disable``.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="Enable" />
<xs:enumeration value="Disable" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="HexFormat"> <xs:simpleType name="HexFormat">
<xs:annotation acrn:widget-options="'placeholder': 'A hexadecimal number with a leading 0x, e.g. 0x1000.'"> <xs:annotation acrn:widget-options="'placeholder': 'A hexadecimal number with a leading 0x, e.g. 0x1000.'">
<xs:documentation>An Integer value in hexadecimal format (with a leading ``0x``).</xs:documentation> <xs:documentation>An Integer value in hexadecimal format (with a leading ``0x``).</xs:documentation>