virtinstall: Set VM name earlier so disks are named correctly

We need to change the flow from

  * parse all the strings
  * set capabilities defaults
  * build installer
  * fill in all guest defaults

To

  * parse boot and metadata strings
  * set capabilities defaults
  * build installer
  * set --name default
  * parse all the remaining strings
  * fill in all guest defaults

Because --disk parsing depends on --name for some path generation.
So this fixes --disk names when --name is implicitly specified by
--install or --osinfo

Signed-off-by: Cole Robinson <crobinso@redhat.com>

9 files changed, 17 insertions, 17 deletions

diff --git a/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml
index 94617d17..92e17eda 100644
--- a/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml
@@ -23,7 +23,7 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/fedora22.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <controller type="scsi" model="virtio-scsi">
diff --git a/tests/data/cli/compare/virt-install-boot-uefi-oldcaps.xml b/tests/data/cli/compare/virt-install-boot-uefi-oldcaps.xml
index b941efa1..357f348b 100644
--- a/tests/data/cli/compare/virt-install-boot-uefi-oldcaps.xml
+++ b/tests/data/cli/compare/virt-install-boot-uefi-oldcaps.xml
@@ -29,7 +29,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/vm1.qcow2"/>
       <target dev="sda" bus="sata"/>
     </disk>
     <controller type="usb" model="ich9-ehci1"/>
diff --git a/tests/data/cli/compare/virt-install-boot-uefi.xml b/tests/data/cli/compare/virt-install-boot-uefi.xml
index 533d8f08..2c23dbb9 100644
--- a/tests/data/cli/compare/virt-install-boot-uefi.xml
+++ b/tests/data/cli/compare/virt-install-boot-uefi.xml
@@ -27,7 +27,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/vm1.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <controller type="usb" model="ich9-ehci1"/>
diff --git a/tests/data/cli/compare/virt-install-cdrom-double.xml b/tests/data/cli/compare/virt-install-cdrom-double.xml
index 50a351a7..6b10c70b 100644
--- a/tests/data/cli/compare/virt-install-cdrom-double.xml
+++ b/tests/data/cli/compare/virt-install-cdrom-double.xml
@@ -20,7 +20,7 @@
   <devices>
     <emulator>/usr/bin/test-hv</emulator>
     <disk type="file" device="disk">
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/vm1.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <disk type="file" device="cdrom">
@@ -72,7 +72,7 @@
   <devices>
     <emulator>/usr/bin/test-hv</emulator>
     <disk type="file" device="disk">
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/vm1.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <disk type="file" device="cdrom">
diff --git a/tests/data/cli/compare/virt-install-kvm-session-defaults.xml b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
index 3e4539eb..fe62a068 100644
--- a/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml
@@ -33,7 +33,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>
+      <source file="/tmp/.local/share/libvirt/images/fedora21.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <disk type="file" device="cdrom">
@@ -106,7 +106,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/tmp/.local/share/libvirt/images/disk.qcow2"/>
+      <source file="/tmp/.local/share/libvirt/images/fedora21.qcow2"/>
       <target dev="vda" bus="virtio"/>
     </disk>
     <disk type="file" device="cdrom">
diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index 9826aecd..a73343a9 100644
--- a/tests/data/cli/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
@@ -246,7 +246,7 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/fedora.qcow2"/>
       <target dev="vdc" bus="virtio"/>
     </disk>
     <disk type="block" device="lun" sgio="filtered" rawio="yes">
@@ -293,7 +293,7 @@
       <auth username="admin">
         <secret type="ceph" uuid="f65cc5a8-b77b-4254-9030-d50a528fb456"/>
       </auth>
-      <source protocol="rbd" name="rbd-sourcename/disk">
+      <source protocol="rbd" name="rbd-sourcename/fedora">
         <host name="ceph-mon-1.example.com" port="6789"/>
         <host name="ceph-mon-2.example.com" port="6789"/>
         <host name="ceph-mon-3.example.com" port="6789"/>
@@ -392,13 +392,13 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="raw" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.img"/>
+      <source file="/var/lib/libvirt/images/fedora.img"/>
       <target dev="vdp" bus="virtio"/>
       <transient shareBacking="yes"/>
     </disk>
     <disk type="block" device="disk">
       <driver name="qemu" type="raw" cache="none" discard="unmap" io="native"/>
-      <source dev="/dev/pool-logical/disk"/>
+      <source dev="/dev/pool-logical/fedora"/>
       <target dev="vdq" bus="virtio"/>
     </disk>
     <disk type="dir" device="disk">
diff --git a/tests/data/cli/compare/virt-install-openbsd-defaults.xml b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
index 71e66f09..64137916 100644
--- a/tests/data/cli/compare/virt-install-openbsd-defaults.xml
+++ b/tests/data/cli/compare/virt-install-openbsd-defaults.xml
@@ -32,7 +32,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/openbsd4.9.qcow2"/>
       <target dev="hda" bus="ide"/>
     </disk>
     <controller type="usb" model="ich9-ehci1"/>
diff --git a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
index ce568372..99fb90fb 100644
--- a/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
+++ b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml
@@ -38,7 +38,7 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/fedora27.qcow2"/>
       <target dev="vdb" bus="virtio"/>
     </disk>
     <controller type="usb" model="qemu-xhci" ports="15"/>
@@ -112,7 +112,7 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/fedora27.qcow2"/>
       <target dev="vdb" bus="virtio"/>
     </disk>
     <controller type="usb" model="qemu-xhci" ports="15"/>
diff --git a/tests/data/cli/compare/virt-install-storage-creation.xml b/tests/data/cli/compare/virt-install-storage-creation.xml
index 3fa75c4b..567ad6ed 100644
--- a/tests/data/cli/compare/virt-install-storage-creation.xml
+++ b/tests/data/cli/compare/virt-install-storage-creation.xml
@@ -37,12 +37,12 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/pool-dir/disk.qcow2"/>
+      <source file="/pool-dir/fedora.qcow2"/>
       <target dev="vdb" bus="virtio"/>
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/pool-dir/disk-1.qcow2"/>
+      <source file="/pool-dir/fedora-1.qcow2"/>
       <target dev="vdc" bus="virtio"/>
     </disk>
     <disk type="file" device="disk">
@@ -168,7 +168,7 @@
     </disk>
     <disk type="file" device="disk">
       <driver name="qemu" type="qcow2" discard="unmap"/>
-      <source file="/var/lib/libvirt/images/disk.qcow2"/>
+      <source file="/var/lib/libvirt/images/fedora.qcow2"/>
       <target dev="vdg" bus="virtio"/>
     </disk>
     <disk type="file" device="disk">