From 2704648936b0c3c78f47b54e72948373836ba1a0 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 28 Nov 2024 09:05:13 +0100
Subject: [PATCH] schemas: domain: Make <identity> subelement of NFS disk
 source optional

Both the 'user' and 'group' attribute are optional so <identity> can
be empty. Allow it to be omitted completely. The parser and qemu code
can handle that.

The schema was introduced in 943871f971d680f72726a9d6e9330eec264f6588
and in d018c8dc9ebcd0496c7a564bc2e8b1c9cbd8d96f an offending test was
added.

Fixes: 943871f971d680f72726a9d6e9330eec264f6588
Fixes: d018c8dc9ebcd0496c7a564bc2e8b1c9cbd8d96f
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/schemas/domaincommon.rng | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 7415c37b65..b3fdbf7ffb 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -2010,18 +2010,20 @@
   </define>
 
   <define name="diskSourceNetworkNFS">
-    <element name="identity">
-      <optional>
-        <attribute name="user">
-          <ref name="genericName"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="group">
-          <ref name="genericName"/>
-        </attribute>
-      </optional>
-    </element>
+    <optional>
+      <element name="identity">
+        <optional>
+          <attribute name="user">
+            <ref name="genericName"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="group">
+            <ref name="genericName"/>
+          </attribute>
+        </optional>
+      </element>
+    </optional>
   </define>
 
   <define name="diskSourceNetworkProtocolRBD">
-- 
2.47.2