[PATCH 0/3] test: Fix regression parsing nested <volume> XML
This adds a couple extensions to the example/ testdriver XML, and fixes a regression introduced in b3e33a0ef7e Cole Robinson (3): examples: testdriver: Add xmlns runstate example examples: testdriver: Add a nested inline <volume> example test: Fix parsing nested <volume> XML examples/xml/test/testnodeinline.xml | 25 ++++++++++++++++++++++++- src/test/test_driver.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) -- 2.37.3
The testdriver has xmlns support for overriding object default state. demo it by pausing a VM Signed-off-by: Cole Robinson <crobinso@redhat.com> --- examples/xml/test/testnodeinline.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/xml/test/testnodeinline.xml b/examples/xml/test/testnodeinline.xml index 9165d9302d..90805f025a 100644 --- a/examples/xml/test/testnodeinline.xml +++ b/examples/xml/test/testnodeinline.xml @@ -86,7 +86,8 @@ <console tty="/dev/pts/5"/> </devices> </domain> - <domain type='test'> + <domain type='test' xmlns:test='http://libvirt.org/schemas/domain/test/1.0'> + <test:runstate>3</test:runstate> <!-- paused --> <name>fc5</name> <uuid>08721f993d1d4aec96eb97803297bb36</uuid> <cpu mode='custom'> -- 2.37.3
On Mon, Oct 17, 2022 at 12:16:39 -0400, Cole Robinson wrote:
The testdriver has xmlns support for overriding object default state. demo it by pausing a VM
Signed-off-by: Cole Robinson <crobinso@redhat.com> --- examples/xml/test/testnodeinline.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com> --- examples/xml/test/testnodeinline.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/examples/xml/test/testnodeinline.xml b/examples/xml/test/testnodeinline.xml index 90805f025a..4657ecadd2 100644 --- a/examples/xml/test/testnodeinline.xml +++ b/examples/xml/test/testnodeinline.xml @@ -177,6 +177,28 @@ </capability> </device> +<pool type='dir'> + <name>default-pool</name> + <uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid> + <capacity>107374182400</capacity> + <allocation>0</allocation> + <available>107374182400</available> + <target> + <path>/default-pool</path> + <permissions> + <mode>0700</mode> + <owner>10736</owner> + <group>10736</group> + </permissions> + </target> + + <volume> + <name>default-vol</name> + <capacity>1000000</capacity> + <allocation>50000</allocation> + <target/> + </volume> +</pool> <cpu> <mhz>6000</mhz> -- 2.37.3
On Mon, Oct 17, 2022 at 12:16:40 -0400, Cole Robinson wrote:
Signed-off-by: Cole Robinson <crobinso@redhat.com> --- examples/xml/test/testnodeinline.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reproducer: ./build/tools/virsh \ --connect test:///`pwd`/examples/xml/test/testnodeinline.xml \ vol-list default-pool Fixes: b3e33a0ef7e62169175280c647aa9ac361bd554d Signed-off-by: Cole Robinson <crobinso@redhat.com> --- src/test/test_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8675f8ad07..67c70de11d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1152,7 +1152,7 @@ testOpenVolumesForPool(const char *file, g_autofree xmlNodePtr *nodes = NULL; g_autoptr(virStorageVolDef) volDef = NULL; - num = virXPathNodeSet("/pool/volume", ctxt, &nodes); + num = virXPathNodeSet("./volume", ctxt, &nodes); if (num < 0) return -1; -- 2.37.3
On Mon, Oct 17, 2022 at 12:16:41 -0400, Cole Robinson wrote:
Reproducer:
./build/tools/virsh \ --connect test:///`pwd`/examples/xml/test/testnodeinline.xml \ vol-list default-pool
Fixes: b3e33a0ef7e62169175280c647aa9ac361bd554d
Signed-off-by: Cole Robinson <crobinso@redhat.com> ---
Oops. Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (2)
-
Cole Robinson -
Peter Krempa