After some more investigation, only the soft reboot type fails for Xen
3.4 (due to the reboot/uptime time counter). As such, it's better to
allow selective testing, since we do want to test in general these
opcodes/the command line script.
---
NOTE: I'll merge this into master, so I'll use your LGTM (if given) for the
merge too.
qa/qa-sample.json | 3 ++-
qa/qa_cluster.py | 3 +++
qa/qa_instance.py | 8 +++++---
tools/burnin | 12 +++++++++++-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index f60c596..ab76bbe 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -96,7 +96,8 @@
"burnin-in-parallel": false,
"burnin-check-instances": false,
"burnin-rename": "xen-test-rename",
- "burnin-reboot": true
+ "burnin-reboot": true,
+ "reboot-types": ["soft", "hard", "full"]
},
"# vim: set syntax=javascript :": null
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 8b53a09..e2a672e 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -232,6 +232,7 @@ def TestClusterBurnin():
check_inst = options.get('burnin-check-instances', False)
do_rename = options.get('burnin-rename', '')
do_reboot = options.get('burnin-reboot', True)
+ reboot_types = options.get("reboot-types", constants.REBOOT_TYPES)
# Get as many instances as we need
instances = []
@@ -263,6 +264,8 @@ def TestClusterBurnin():
cmd.append('--rename=%s' % do_rename)
if not do_reboot:
cmd.append('--no-reboot')
+ else:
+ cmd.append('--reboot-types=%s' % ",".join(reboot_types))
cmd += [inst['name'] for inst in instances]
AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 72b69de..2f18add 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -111,9 +111,11 @@ def TestInstanceReboot(instance):
"""gnt-instance reboot"""
master = qa_config.GetMasterNode()
- for reboottype in ["soft", "hard", "full"]:
- cmd = ['gnt-instance', 'reboot', '--type=%s' % reboottype,
- instance['name']]
+ options = qa_config.get('options', {})
+ reboot_types = options.get("reboot-types", constants.REBOOT_TYPES)
+
+ for rtype in reboot_types:
+ cmd = ['gnt-instance', 'reboot', '--type=%s' % rtype, instance['name']]
AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
diff --git a/tools/burnin b/tools/burnin
index 17e5850..4a0f567 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -157,6 +157,8 @@ OPTIONS = [
cli.cli_option("--no-reboot", dest="do_reboot",
help="Skip instance reboot", action="store_false",
default=True),
+ cli.cli_option("--reboot-types", dest="reboot_types",
+ help="Specify the reboot types", default=None),
cli.cli_option("--no-activate-disks", dest="do_activate_disks",
help="Skip disk activation/deactivation",
action="store_false", default=True),
@@ -482,6 +484,14 @@ class Burner(object):
if options.hypervisor:
self.hypervisor, self.hvp = options.hypervisor
+ if options.reboot_types is None:
+ options.reboot_types = constants.REBOOT_TYPES
+ else:
+ options.reboot_types = options.reboot_types.split(",")
+ rt_diff = set(options.reboot_types).difference(constants.REBOOT_TYPES)
+ if rt_diff:
+ Err("Invalid reboot types specified: %s" % utils.CommaJoin(rt_diff))
+
socket.setdefaulttimeout(options.net_timeout)
def GetState(self):
@@ -815,7 +825,7 @@ class Burner(object):
for instance in self.instances:
Log("instance %s", instance, indent=1)
ops = []
- for reboot_type in constants.REBOOT_TYPES:
+ for reboot_type in self.opts.reboot_types:
op = opcodes.OpRebootInstance(instance_name=instance,
reboot_type=reboot_type,
ignore_secondaries=False)
--
1.7.1
