From 1ca0d01738590f46f506e49382db19feae610625 Mon Sep 17 00:00:00 2001 From: zsdc <taras@vyos.io> Date: Tue, 15 Jun 2021 13:52:22 +0300 Subject: OVF: T2343: Fixed wrong order for items in OVF According to OVF Specification (ver. 2.1.1, line 630), rasd class elements should be ordered by Unicode code point. This commit fixes the wrong order to conform to specification requirements. --- scripts/template.ovf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/template.ovf b/scripts/template.ovf index 4464e381..26d6cc62 100644 --- a/scripts/template.ovf +++ b/scripts/template.ovf @@ -144,27 +144,27 @@ <rasd:Description>Memory Size</rasd:Description> <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">512 MB of memory</rasd:ElementName> <rasd:InstanceID xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</rasd:InstanceID> + <rasd:Reservation>512</rasd:Reservation> <rasd:ResourceType>4</rasd:ResourceType> <rasd:VirtualQuantity>512</rasd:VirtualQuantity> - <rasd:Reservation>512</rasd:Reservation> </Item> <Item configuration="4CPU-16GB"> <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> <rasd:Description>Memory Size</rasd:Description> <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">16 GB of memory</rasd:ElementName> <rasd:InstanceID xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</rasd:InstanceID> + <rasd:Reservation>16384</rasd:Reservation> <rasd:ResourceType>4</rasd:ResourceType> <rasd:VirtualQuantity>16384</rasd:VirtualQuantity> - <rasd:Reservation>16384</rasd:Reservation> </Item> <Item configuration="8CPU-32GB"> <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits> <rasd:Description>Memory Size</rasd:Description> <rasd:ElementName xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">32 GB of memory</rasd:ElementName> <rasd:InstanceID xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">2</rasd:InstanceID> + <rasd:Reservation>32768</rasd:Reservation> <rasd:ResourceType>4</rasd:ResourceType> <rasd:VirtualQuantity>32768</rasd:VirtualQuantity> - <rasd:Reservation>32768</rasd:Reservation> </Item> <Item> <rasd:Address xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData">0</rasd:Address> -- cgit v1.2.3