|
 |
e2df08 |
From 5802a0a7e4d8aa7c182c316fb550fac6bd080706 Mon Sep 17 00:00:00 2001
|
|
|
e2df08 |
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
Date: Thu, 11 Sep 2014 18:39:24 +0200
|
|
|
e2df08 |
Subject: [PATCH 07/12] virt-install: add tests for OVMF
|
|
|
e2df08 |
|
|
|
e2df08 |
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1111986
|
|
|
e2df08 |
|
|
|
e2df08 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
e2df08 |
(cherry picked from commit 17a37ea39b2e0229430713de4b3c422a69556677)
|
|
|
e2df08 |
---
|
|
|
e2df08 |
tests/xmlparse-xml/change-boot-uefi-in.xml | 24 ++++++++++++++++++++++++
|
|
|
e2df08 |
tests/xmlparse-xml/change-boot-uefi-out.xml | 26 ++++++++++++++++++++++++++
|
|
|
e2df08 |
tests/xmlparse.py | 18 ++++++++++++++++++
|
|
|
e2df08 |
3 files changed, 68 insertions(+)
|
|
|
e2df08 |
create mode 100644 tests/xmlparse-xml/change-boot-uefi-in.xml
|
|
|
e2df08 |
create mode 100644 tests/xmlparse-xml/change-boot-uefi-out.xml
|
|
|
e2df08 |
|
|
|
e2df08 |
diff --git a/tests/xmlparse-xml/change-boot-uefi-in.xml b/tests/xmlparse-xml/change-boot-uefi-in.xml
|
|
|
e2df08 |
new file mode 100644
|
|
|
e2df08 |
index 0000000..ffbc280
|
|
|
e2df08 |
--- /dev/null
|
|
|
e2df08 |
+++ b/tests/xmlparse-xml/change-boot-uefi-in.xml
|
|
|
e2df08 |
@@ -0,0 +1,24 @@
|
|
|
e2df08 |
+<domain type="xen">
|
|
|
e2df08 |
+ <name>TestGuest</name>
|
|
|
e2df08 |
+ <currentMemory>204800</currentMemory>
|
|
|
e2df08 |
+ <memory>409600</memory>
|
|
|
e2df08 |
+ <uuid>12345678-1234-1234-1234-123456789012</uuid>
|
|
|
e2df08 |
+ <os>
|
|
|
e2df08 |
+ <type arch="i686">linux</type>
|
|
|
e2df08 |
+ <kernel>/boot/vmlinuz</kernel>
|
|
|
e2df08 |
+ <initrd>/boot/initrd</initrd>
|
|
|
e2df08 |
+ <cmdline>location</cmdline>
|
|
|
e2df08 |
+ </os>
|
|
|
e2df08 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
e2df08 |
+ <on_reboot>destroy</on_reboot>
|
|
|
e2df08 |
+ <on_crash>destroy</on_crash>
|
|
|
e2df08 |
+ <vcpu>5</vcpu>
|
|
|
e2df08 |
+ <devices>
|
|
|
e2df08 |
+ <disk type="block" device="disk">
|
|
|
e2df08 |
+ <source dev="/dev/null"/>
|
|
|
e2df08 |
+ <target dev="xvda" bus="xen"/>
|
|
|
e2df08 |
+ </disk>
|
|
|
e2df08 |
+ <input type="mouse" bus="xen"/>
|
|
|
e2df08 |
+ <graphics type="vnc" port="-1" keymap="ja"/>
|
|
|
e2df08 |
+ </devices>
|
|
|
e2df08 |
+</domain>
|
|
|
e2df08 |
diff --git a/tests/xmlparse-xml/change-boot-uefi-out.xml b/tests/xmlparse-xml/change-boot-uefi-out.xml
|
|
|
e2df08 |
new file mode 100644
|
|
|
e2df08 |
index 0000000..77ff454
|
|
|
e2df08 |
--- /dev/null
|
|
|
e2df08 |
+++ b/tests/xmlparse-xml/change-boot-uefi-out.xml
|
|
|
e2df08 |
@@ -0,0 +1,26 @@
|
|
|
e2df08 |
+<domain type="xen">
|
|
|
e2df08 |
+ <name>TestGuest</name>
|
|
|
e2df08 |
+ <currentMemory>204800</currentMemory>
|
|
|
e2df08 |
+ <memory>409600</memory>
|
|
|
e2df08 |
+ <uuid>12345678-1234-1234-1234-123456789012</uuid>
|
|
|
e2df08 |
+ <os>
|
|
|
e2df08 |
+ <type arch="i686">linux</type>
|
|
|
e2df08 |
+ <loader readonly="yes" type="pflash">OVMF_CODE.fd</loader>
|
|
|
e2df08 |
+ <nvram template="/tmp/template">/tmp/nvram_store</nvram>
|
|
|
e2df08 |
+ <boot dev="network"/>
|
|
|
e2df08 |
+ <boot dev="hd"/>
|
|
|
e2df08 |
+ <boot dev="fd"/>
|
|
|
e2df08 |
+ </os>
|
|
|
e2df08 |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
e2df08 |
+ <on_reboot>destroy</on_reboot>
|
|
|
e2df08 |
+ <on_crash>destroy</on_crash>
|
|
|
e2df08 |
+ <vcpu>5</vcpu>
|
|
|
e2df08 |
+ <devices>
|
|
|
e2df08 |
+ <disk type="block" device="disk">
|
|
|
e2df08 |
+ <source dev="/dev/null"/>
|
|
|
e2df08 |
+ <target dev="xvda" bus="xen"/>
|
|
|
e2df08 |
+ </disk>
|
|
|
e2df08 |
+ <input type="mouse" bus="xen"/>
|
|
|
e2df08 |
+ <graphics type="vnc" port="-1" keymap="ja"/>
|
|
|
e2df08 |
+ </devices>
|
|
|
e2df08 |
+</domain>
|
|
|
e2df08 |
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
|
|
|
e2df08 |
index d257f38..a9a4063 100644
|
|
|
e2df08 |
--- a/tests/xmlparse.py
|
|
|
e2df08 |
+++ b/tests/xmlparse.py
|
|
|
e2df08 |
@@ -286,6 +286,24 @@ class XMLParseTest(unittest.TestCase):
|
|
|
e2df08 |
|
|
|
e2df08 |
self._alter_compare(guest.get_xml_config(), outfile)
|
|
|
e2df08 |
|
|
|
e2df08 |
+ def testAlterBootUEFI(self):
|
|
|
e2df08 |
+ guest, outfile = self._get_test_content("change-boot-uefi")
|
|
|
e2df08 |
+
|
|
|
e2df08 |
+ check = self._make_checker(guest.os)
|
|
|
e2df08 |
+ check("bootorder", [], ["network", "hd", "fd"])
|
|
|
e2df08 |
+ check("loader_ro", None, True)
|
|
|
e2df08 |
+ check("loader_type", None, "pflash")
|
|
|
e2df08 |
+ check("nvram", None, "/tmp/nvram_store")
|
|
|
e2df08 |
+ check("nvram_template", None, "/tmp/template")
|
|
|
e2df08 |
+ check("loader", None, "OVMF_CODE.fd")
|
|
|
e2df08 |
+
|
|
|
e2df08 |
+ check("kernel", "/boot/vmlinuz", None)
|
|
|
e2df08 |
+
|
|
|
e2df08 |
+ check("initrd", "/boot/initrd", None)
|
|
|
e2df08 |
+ check("kernel_args", "location", None)
|
|
|
e2df08 |
+
|
|
|
e2df08 |
+ self._alter_compare(guest.get_xml_config(), outfile)
|
|
|
e2df08 |
+
|
|
|
e2df08 |
def testAlterCpuMode(self):
|
|
|
e2df08 |
guest, outfile = self._get_test_content("change-cpumode")
|
|
|
e2df08 |
|
|
|
e2df08 |
--
|
|
|
e2df08 |
1.9.3
|
|
|
e2df08 |
|