[PATCH 0/2] Add support for 'id' attribute for 'cachetune' element
Kristina Hanicova (2): docs: Allow 'id' attribute for 'cachetune' element tests: Modify to test output value of <cachetune id='' docs/formatdomain.rst | 2 +- docs/schemas/domaincommon.rng | 5 ++++ tests/genericxml2xmlindata/cachetune.xml | 8 +++--- tests/genericxml2xmloutdata/cachetune.xml | 34 ----------------------- tests/genericxml2xmltest.c | 2 +- 5 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml -- 2.31.1
Even though 'id' attribute is output-only, we should accept xml files containing it. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941594 Signed-off-by: Kristina Hanicova <khanicov@redhat.com> --- docs/formatdomain.rst | 2 +- docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 25e6bf73ba..d3c91c2a6d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -850,7 +850,7 @@ CPU Tuning to which vCPUs this allocation applies. A vCPU can only be member of one ``cachetune`` element allocation. The vCPUs specified by cachetune can be identical with those in memorytune, however they are not allowed to overlap. - Supported subelements are: + The optional attribute ``id`` is output only. Supported subelements are: ``cache`` This optional element controls the allocation of CPU cache and has the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5ea14b6dbf..c6643bbc7f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1006,6 +1006,11 @@ <attribute name="vcpus"> <ref name="cpuset"/> </attribute> + <optional> + <attribute name="id"> + <data type="string"/> + </attribute> + </optional> <oneOrMore> <choice> <element name="cache"> -- 2.31.1
On 7/16/21 12:15 PM, Kristina Hanicova wrote:
Even though 'id' attribute is output-only, we should accept xml files containing it.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941594
Signed-off-by: Kristina Hanicova <khanicov@redhat.com> --- docs/formatdomain.rst | 2 +- docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 25e6bf73ba..d3c91c2a6d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -850,7 +850,7 @@ CPU Tuning to which vCPUs this allocation applies. A vCPU can only be member of one ``cachetune`` element allocation. The vCPUs specified by cachetune can be identical with those in memorytune, however they are not allowed to overlap. - Supported subelements are: + The optional attribute ``id`` is output only. Supported subelements are:
How about: The optional, output only ``id`` attribute identifies cache uniquely.
``cache`` This optional element controls the allocation of CPU cache and has the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5ea14b6dbf..c6643bbc7f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1006,6 +1006,11 @@ <attribute name="vcpus"> <ref name="cpuset"/> </attribute> + <optional> + <attribute name="id"> + <data type="string"/> + </attribute> + </optional> <oneOrMore> <choice> <element name="cache">
Michal
We can also delete out xml thanks to the change in the call of the test to DO_TEST instead of DO_TEST_DIFFERENT. Signed-off-by: Kristina Hanicova <khanicov@redhat.com> --- tests/genericxml2xmlindata/cachetune.xml | 8 +++--- tests/genericxml2xmloutdata/cachetune.xml | 34 ----------------------- tests/genericxml2xmltest.c | 2 +- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml diff --git a/tests/genericxml2xmlindata/cachetune.xml b/tests/genericxml2xmlindata/cachetune.xml index 40259cf2ee..07e81999a5 100644 --- a/tests/genericxml2xmlindata/cachetune.xml +++ b/tests/genericxml2xmlindata/cachetune.xml @@ -1,16 +1,16 @@ -<domain type='qemu'> +<domain type='qemu' id='42'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>4</vcpu> <cputune> - <cachetune vcpus='0-1'> - <monitor level='3' vcpus='0-1'/> + <cachetune vcpus='0-1' id='vcpus_0-1'> <cache id='0' level='3' type='both' size='3' unit='MiB'/> <cache id='1' level='3' type='both' size='3' unit='MiB'/> + <monitor level='3' vcpus='0-1'/> </cachetune> - <cachetune vcpus='3'> + <cachetune vcpus='3' id='vcpus_3'> <cache id='0' level='3' type='both' size='3' unit='MiB'/> </cachetune> </cputune> diff --git a/tests/genericxml2xmloutdata/cachetune.xml b/tests/genericxml2xmloutdata/cachetune.xml deleted file mode 100644 index f05cab70ff..0000000000 --- a/tests/genericxml2xmloutdata/cachetune.xml +++ /dev/null @@ -1,34 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>4</vcpu> - <cputune> - <cachetune vcpus='0-1'> - <cache id='0' level='3' type='both' size='3' unit='MiB'/> - <cache id='1' level='3' type='both' size='3' unit='MiB'/> - <monitor level='3' vcpus='0-1'/> - </cachetune> - <cachetune vcpus='3'> - <cache id='0' level='3' type='both' size='3' unit='MiB'/> - </cachetune> - </cputune> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index ac89422a32..17448a3465 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -214,7 +214,7 @@ mymain(void) DO_TEST("cachetune-small"); DO_TEST("cachetune-cdp"); - DO_TEST_DIFFERENT("cachetune"); + DO_TEST("cachetune"); DO_TEST_DIFFERENT("cachetune-extra-tunes"); DO_TEST_FULL("cachetune-colliding-allocs", false, true, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); -- 2.31.1
On 7/16/21 12:15 PM, Kristina Hanicova wrote:
We can also delete out xml thanks to the change in the call of the test to DO_TEST instead of DO_TEST_DIFFERENT.
I think the subject can be formatted better: genericxml2xmltest: Modify cachetune test to include id Alternatively, the element should be ended, like this: <cachetune id''/> And in the commit message you can explain why you want to change DO_TEST_DIFFERENT() to DO_TEST() - esp. that part about live XML. Michal
participants (2)
-
Kristina Hanicova -
Michal Prívozník