From 4a04af38f1399ed448ac28e7780a91656b5fa2fb Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 8 Jun 2019 15:33:37 -0400
Subject: [PATCH] tests: clitest: Add windows unattended unittest

---
 .../virt-install-osinfo-win7-unattended.xml   | 133 ++++++++++++++++++
 tests/cli-test-xml/fake-win7.iso              | Bin 0 -> 380928 bytes
 tests/clitest.py                              |   3 +
 virtinst/installer.py                         |   6 +
 4 files changed, 142 insertions(+)
 create mode 100644 tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
 create mode 100755 tests/cli-test-xml/fake-win7.iso

diff --git a/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml b/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
new file mode 100644
index 00000000..f075c6fc
--- /dev/null
+++ b/tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
@@ -0,0 +1,133 @@
+<domain type="kvm">
+  <name>foobar</name>
+  <uuid>00000000-1111-2222-3333-444444444444</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://microsoft.com/win/7"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>65536</memory>
+  <currentMemory>65536</currentMemory>
+  <vcpu>2</vcpu>
+  <os>
+    <type arch="x86_64" machine="q35">hvm</type>
+    <boot dev="cdrom"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <hyperv>
+      <relaxed state="on"/>
+      <vapic state="on"/>
+      <spinlocks state="on" retries="8191"/>
+    </hyperv>
+  </features>
+  <cpu mode="host-model"/>
+  <clock offset="localtime">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+    <timer name="hypervclock" present="yes"/>
+  </clock>
+  <on_reboot>destroy</on_reboot>
+  <pm>
+    <suspend-to-mem enabled="no"/>
+    <suspend-to-disk enabled="no"/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type="file" device="cdrom">
+      <driver name="qemu"/>
+      <source file="/tmp/fake-win7.iso"/>
+      <target dev="sda" bus="sata"/>
+      <readonly/>
+    </disk>
+    <disk type="file" device="cdrom">
+      <driver name="qemu"/>
+      <source file="/TESTSUITE_UNATTENDED_ISO"/>
+      <target dev="sdb" bus="sata"/>
+      <readonly/>
+    </disk>
+    <controller type="usb" index="0" model="ich9-ehci1"/>
+    <controller type="usb" index="0" model="ich9-uhci1">
+      <master startport="0"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci2">
+      <master startport="2"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci3">
+      <master startport="4"/>
+    </controller>
+    <interface type="bridge">
+      <source bridge="testsuitebr0"/>
+      <mac address="00:11:22:33:44:55"/>
+      <model type="e1000e"/>
+    </interface>
+    <console type="pty"/>
+  </devices>
+</domain>
+<domain type="kvm">
+  <name>foobar</name>
+  <uuid>00000000-1111-2222-3333-444444444444</uuid>
+  <metadata>
+    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
+      <libosinfo:os id="http://microsoft.com/win/7"/>
+    </libosinfo:libosinfo>
+  </metadata>
+  <memory>65536</memory>
+  <currentMemory>65536</currentMemory>
+  <vcpu>2</vcpu>
+  <os>
+    <type arch="x86_64" machine="q35">hvm</type>
+    <boot dev="cdrom"/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <hyperv>
+      <relaxed state="on"/>
+      <vapic state="on"/>
+      <spinlocks state="on" retries="8191"/>
+    </hyperv>
+  </features>
+  <cpu mode="host-model"/>
+  <clock offset="localtime">
+    <timer name="rtc" tickpolicy="catchup"/>
+    <timer name="pit" tickpolicy="delay"/>
+    <timer name="hpet" present="no"/>
+    <timer name="hypervclock" present="yes"/>
+  </clock>
+  <pm>
+    <suspend-to-mem enabled="no"/>
+    <suspend-to-disk enabled="no"/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/qemu-kvm</emulator>
+    <disk type="file" device="cdrom">
+      <driver name="qemu"/>
+      <source file="/tmp/fake-win7.iso"/>
+      <target dev="sda" bus="sata"/>
+      <readonly/>
+    </disk>
+    <disk type="file" device="cdrom">
+      <target dev="sdb" bus="sata"/>
+      <readonly/>
+    </disk>
+    <controller type="usb" index="0" model="ich9-ehci1"/>
+    <controller type="usb" index="0" model="ich9-uhci1">
+      <master startport="0"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci2">
+      <master startport="2"/>
+    </controller>
+    <controller type="usb" index="0" model="ich9-uhci3">
+      <master startport="4"/>
+    </controller>
+    <interface type="bridge">
+      <source bridge="testsuitebr0"/>
+      <mac address="00:11:22:33:44:55"/>
+      <model type="e1000e"/>
+    </interface>
+    <console type="pty"/>
+  </devices>
+</domain>
diff --git a/tests/cli-test-xml/fake-win7.iso b/tests/cli-test-xml/fake-win7.iso
new file mode 100755
index 0000000000000000000000000000000000000000..2bfe75cd499f74ab52b721fb369cd6a7ae9d66d9
GIT binary patch
literal 380928
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
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkL{|DVAB
E0BD@YO#lD@

literal 0
HcmV?d00001

diff --git a/tests/clitest.py b/tests/clitest.py
index 70b5ba1f..23421b41 100644
--- a/tests/clitest.py
+++ b/tests/clitest.py
@@ -50,6 +50,7 @@ iso_links = [
     "/tmp/fake-fedora17-tree.iso",
     "/tmp/fake-centos65-label.iso",
     "/tmp/fake-no-osinfo.iso",
+    "/tmp/fake-win7.iso",
 ]
 
 exist_files = exist_images
@@ -78,6 +79,7 @@ test_files = {
     'ISOTREE': iso_links[0],
     'ISOLABEL': iso_links[1],
     'ISO-NO-OS': iso_links[2],
+    'ISO-WIN7': iso_links[3],
     'TREEDIR': "%s/fakefedoratree" % XMLDIR,
     'COLLIDE': "/dev/default-pool/collidevol1.img",
 }
@@ -786,6 +788,7 @@ c.add_compare("--location ftp://example.com", "fake-ftp")  # fake ftp:// install
 c.add_compare("--location https://foobar.com", "fake-http")  # fake https:// install using urlfetcher.py mocking
 c.add_compare("--connect %(URI-KVM)s --os-variant fedora26,install=location", "osinfo-url")  # getting URL from osinfo
 c.add_compare("--connect %(URI-KVM)s --os-variant fedora26 --unattended profile=desktop,admin-password=foobar", "osinfo-url-unattended")  # unattended install for fedora, using initrd injection
+c.add_compare("--connect %(URI-KVM)s --os-variant win7 --cdrom %(ISO-WIN7)s --unattended profile=desktop,admin-password=foobar", "osinfo-win7-unattended")  # unattended install for win7
 c.add_invalid("--pxe --virt-type bogus")  # Bogus virt-type
 c.add_invalid("--pxe --arch bogus")  # Bogus arch
 c.add_invalid("--livecd")  # LiveCD with no media
diff --git a/virtinst/installer.py b/virtinst/installer.py
index 96a8211a..7fcee454 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -129,6 +129,12 @@ class Installer(object):
         self._unattended_install_cdrom_device = dev
         guest.add_device(self._unattended_install_cdrom_device)
 
+        if self.conn.in_testsuite():
+            # pylint: disable=protected-access
+            # Hack to set just the XML path differently for the test suite.
+            # Setting this via regular 'path' will error that it doesn't exist
+            dev._source_file = "/TESTSUITE_UNATTENDED_ISO"
+
     def _remove_unattended_install_cdrom_device(self, guest):
         dummy = guest
         if not self._unattended_install_cdrom_device: