From d488adb679bc3fb4def46aa5ede39a8ab2bcef34 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 15 Jun 2012 15:14:47 +0200
Subject: [PATCH] QA: Test some instance parameters depending on hypervisor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
For example, the βinitrd_pathβ parameter is only available with xen-pvm,
whereas βboot_orderβ is only available with xen-hvm.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/qa_instance.py | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 5303f255a..0ea9f2b2c 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -259,6 +259,8 @@ def TestInstanceInfo(instance):
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
def TestInstanceModify(instance):
"""gnt-instance modify"""
+ default_hv = qa_config.GetDefaultHypervisor()
+
# Assume /sbin/init exists on all systems
test_kernel = "/sbin/init"
test_initrd = test_kernel
@@ -266,6 +268,7 @@ def TestInstanceModify(instance):
orig_maxmem = qa_config.get(constants.BE_MAXMEM)
orig_minmem = qa_config.get(constants.BE_MINMEM)
#orig_bridge = qa_config.get("bridge", "xen-br0")
+
args = [
["-B", "%s=128" % constants.BE_MINMEM],
["-B", "%s=128" % constants.BE_MAXMEM],
@@ -279,18 +282,24 @@ def TestInstanceModify(instance):
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)],
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)],
- ["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)],
- ["-H", "no_%s" % (constants.HV_INITRD_PATH, )],
- ["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
# TODO: bridge tests
#["--bridge", "xen-br1"],
#["--bridge", orig_bridge],
-
- # TODO: Do these tests only with xen-hvm
- #["-H", "%s=acn" % constants.HV_BOOT_ORDER],
- #["-H", "%s=%s" % (constants.HV_BOOT_ORDER, constants.VALUE_DEFAULT)],
]
+
+ if default_hv == constants.HT_XEN_PVM:
+ args.extend([
+ ["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)],
+ ["-H", "no_%s" % (constants.HV_INITRD_PATH, )],
+ ["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
+ ])
+ elif default_hv == constants.HT_XEN_HVM:
+ args.extend([
+ ["-H", "%s=acn" % constants.HV_BOOT_ORDER],
+ ["-H", "%s=%s" % (constants.HV_BOOT_ORDER, constants.VALUE_DEFAULT)],
+ ])
+
for alist in args:
AssertCommand(["gnt-instance", "modify"] + alist + [instance["name"]])
--
GitLab