From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 15 May 2023 12:28:06 +0000 (+0200)
Subject: schemas: backup: Allow missing 'type' attribute for backup disk
X-Git-Tag: v9.4.0-rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9884e89236374a4f94382d99451dbc9208d78a29;p=thirdparty%2Flibvirt.git

schemas: backup: Allow missing 'type' attribute for backup disk

One of our examples in the 'formatbackup.rst' page shows following
config:

  <disk name='vda' backup='yes'/>

The schema didn't allow it though. Fix the schema as the internals were
supposed to support it (except for the bug fixed in previous patches).

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/schemas/domainbackup.rng b/src/conf/schemas/domainbackup.rng
index bfc29a6c06..80ba155aad 100644
--- a/src/conf/schemas/domainbackup.rng
+++ b/src/conf/schemas/domainbackup.rng
@@ -166,6 +166,10 @@
                   <value>no</value>
                 </attribute>
               </group>
+              <!-- Allow to plainly select a disk for backup without any other config -->
+              <group>
+                <ref name="backupAttr"/>
+              </group>
               <group>
                 <ref name="backupAttr"/>
                 <attribute name="type">
diff --git a/tests/domainbackupxml2xmlin/backup-push.xml b/tests/domainbackupxml2xmlin/backup-push.xml
index a95833d407..f1cb38fa82 100644
--- a/tests/domainbackupxml2xmlin/backup-push.xml
+++ b/tests/domainbackupxml2xmlin/backup-push.xml
@@ -6,6 +6,8 @@
       <target file='/path/to/file'/>
     </disk>
     <disk name='vdb' type='file' backupmode='full'/>
+    <disk name='vdc'/>
+    <disk name='vdd' backup='yes'/>
     <disk name='hda' backup='no'/>
   </disks>
 </domainbackup>
diff --git a/tests/domainbackupxml2xmlout/backup-push.xml b/tests/domainbackupxml2xmlout/backup-push.xml
index fff7db716b..0c6fa6d4ee 100644
--- a/tests/domainbackupxml2xmlout/backup-push.xml
+++ b/tests/domainbackupxml2xmlout/backup-push.xml
@@ -8,6 +8,12 @@
     <disk name='vdb' backup='yes' type='file' backupmode='full'>
       <target file='/fake/vdb.qcow2.SUFFIX'/>
     </disk>
+    <disk name='vdc' backup='yes' type='file' backupmode='incremental' incremental='1525889631'>
+      <target file='/fake/vdc.qcow2.SUFFIX'/>
+    </disk>
+    <disk name='vdd' backup='yes' type='file' backupmode='incremental' incremental='1525889631'>
+      <target file='/fake/vdd.qcow2.SUFFIX'/>
+    </disk>
     <disk name='hda' backup='no'/>
     <disk name='vdextradisk' backup='no'/>
   </disks>