Commit 847a7b02 authored by Helga Velroyen's avatar Helga Velroyen
Browse files

QA: remove subsumed QA test wrt disk templates



This patch removes a QA test that was supposed to test
that unused disk templates can be disabled safely. The
test is now subsumed by unit tests and thus we remove it
here. Besides that, it was actually testing the wrong
thing, as it tested that a _used_ disk template could
be disabled.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent a6f90af4
......@@ -573,7 +573,6 @@ def TestClusterModifyDiskTemplates():
instance_template = enabled_disk_templates[0]
instance = qa_instance.CreateInstanceByDiskTemplate(nodes, instance_template)
_TestClusterModifyUnusedDiskTemplate(instance_template)
_TestClusterModifyUsedDiskTemplate(instance_template,
enabled_disk_templates)
......@@ -777,26 +776,6 @@ def _TestClusterModifyUsedDiskTemplate(instance_template,
fail=True)
def _TestClusterModifyUnusedDiskTemplate(instance_template):
"""Tests that unused disk templates can be disabled safely."""
all_disk_templates = constants.DISK_TEMPLATES
if not utils.IsLvmEnabled(qa_config.GetEnabledDiskTemplates()):
all_disk_templates = list(set(all_disk_templates) -
constants.DTS_LVM)
AssertCommand(
["gnt-cluster", "modify",
"--enabled-disk-templates=%s" % ",".join(all_disk_templates),
"--ipolicy-disk-templates=%s" % ",".join(all_disk_templates)],
fail=False)
new_disk_templates = [instance_template]
AssertCommand(
["gnt-cluster", "modify",
"--enabled-disk-templates=%s" % ",".join(new_disk_templates),
"--ipolicy-disk-templates=%s" % ",".join(new_disk_templates)],
fail=False)
def TestClusterModifyBe():
"""gnt-cluster modify -B"""
for fail, cmd in [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment