From 03be1ce8cd5ad6d9891cd4ef2fb3a8f7bef735c8 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 15 Dec 2023 16:12:21 +0100
Subject: [PATCH] qemuxmlargvdata: disk-network-nfs: Drop 'index' attribute
 from backing store
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Index is auto-allocated normally. Additionally we now don't need the
extra active/inactive version of this test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 tests/qemuxml2argvdata/disk-network-nfs.xml   |  2 +-
 ...isk-network-nfs-inactive.x86_64-latest.xml | 55 -------------------
 .../disk-network-nfs.x86_64-latest.xml        |  2 +-
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml

diff --git a/tests/qemuxml2argvdata/disk-network-nfs.xml b/tests/qemuxml2argvdata/disk-network-nfs.xml
index 403ff1efe6..328afbc46c 100644
--- a/tests/qemuxml2argvdata/disk-network-nfs.xml
+++ b/tests/qemuxml2argvdata/disk-network-nfs.xml
@@ -29,7 +29,7 @@
       <source protocol='gluster' name='Volume2/Image'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
-      <backingStore type='network' index='1'>
+      <backingStore type='network'>
         <format type='qcow2'/>
         <source protocol='nfs' name='/backing/store/nfs'>
           <host name='example.org'/>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml
deleted file mode 100644
index 19e269c531..0000000000
--- a/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml
+++ /dev/null
@@ -1,55 +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'>1</vcpu>
-  <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>qemu64</model>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='network' device='disk'>
-      <driver name='qemu' type='raw' cache='none'/>
-      <source protocol='nfs' name='/foo/bar/baz'>
-        <host name='example.com'/>
-        <identity user='+6234' group='+12354'/>
-      </source>
-      <target dev='vda' bus='virtio'/>
-      <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </disk>
-    <disk type='network' device='disk'>
-      <driver name='qemu' type='qcow2'/>
-      <source protocol='gluster' name='Volume2/Image'>
-        <host transport='unix' socket='/path/to/sock'/>
-      </source>
-      <backingStore type='network'>
-        <format type='qcow2'/>
-        <source protocol='nfs' name='/backing/store/nfs'>
-          <host name='example.org'/>
-          <identity user='+1234' group='+5678'/>
-        </source>
-        <backingStore/>
-      </backingStore>
-      <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
index 51b09b836d..19e269c531 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
@@ -32,7 +32,7 @@
       <source protocol='gluster' name='Volume2/Image'>
         <host transport='unix' socket='/path/to/sock'/>
       </source>
-      <backingStore type='network' index='1'>
+      <backingStore type='network'>
         <format type='qcow2'/>
         <source protocol='nfs' name='/backing/store/nfs'>
           <host name='example.org'/>