[libvirt] [PATCH 2/3] tests: qemustatusxml2xml: Add a seclabel for a disk with privateData

Peter Krempa pkrempa at redhat.com
Mon Jun 24 16:27:12 UTC 2019


Adding a seclabel breaks the output by improperly handling the XPath
context and thus not being able to parse the <privateData>.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemustatusxml2xmldata/modern-in.xml  |  3 +++
 tests/qemustatusxml2xmldata/modern-out.xml | 15 ++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
index 08f7f40761..80d71fd9b4 100644
--- a/tests/qemustatusxml2xmldata/modern-in.xml
+++ b/tests/qemustatusxml2xmldata/modern-in.xml
@@ -314,6 +314,9 @@
             <reservations managed='yes'>
               <source type='unix' path='/somepath/ux.sck' mode='client'/>
             </reservations>
+            <seclabel model='dac' relabel='yes'>
+              <label>qemu:qemu</label>
+            </seclabel>
             <privateData>
               <nodenames>
                 <nodename type='storage' name='test-storage'/>
diff --git a/tests/qemustatusxml2xmldata/modern-out.xml b/tests/qemustatusxml2xmldata/modern-out.xml
index 08f7f40761..108e07eee0 100644
--- a/tests/qemustatusxml2xmldata/modern-out.xml
+++ b/tests/qemustatusxml2xmldata/modern-out.xml
@@ -311,21 +311,14 @@
         <backingStore type='file' index='1'>
           <format type='qcow2'/>
           <source file='/var/lib/libvirt/images/base.qcow2'>
+            <seclabel model='dac' relabel='yes'>
+              <label>qemu:qemu</label>
+            </seclabel>
             <reservations managed='yes'>
               <source type='unix' path='/somepath/ux.sck' mode='client'/>
             </reservations>
             <privateData>
-              <nodenames>
-                <nodename type='storage' name='test-storage'/>
-                <nodename type='format' name='test-format'/>
-              </nodenames>
-              <reservations mgralias='test-alias'/>
-              <relPath>base.qcow2</relPath>
-              <objects>
-                <secret type='auth' alias='test-auth-alias'/>
-                <secret type='encryption' alias='test-encryption-alias'/>
-                <TLSx509 alias='transport-alias'/>
-              </objects>
+              <reservations mgralias='(null)'/>
             </privateData>
           </source>
           <backingStore/>
-- 
2.21.0




More information about the libvir-list mailing list