From: Helga Velroyen Date: Wed, 7 Aug 2013 13:39:14 +0000 (+0200) Subject: QA: adjust tests wrt to ipolicy disk templates X-Git-Tag: v2.9.0beta1~17 X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/eb161df2871eb0f92e3b7e3fe6133a50ed412bed QA: adjust tests wrt to ipolicy disk templates This adjusts the cluster QA with respect to the new checks between the ipolicy disk templates and the enabled disk templates. Signed-off-by: Helga Velroyen Reviewed-by: Thomas Thrainer --- diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py index c7e6058..d078b67 100644 --- a/qa/qa_cluster.py +++ b/qa/qa_cluster.py @@ -578,8 +578,11 @@ def _RestoreEnabledDiskTemplates(): other tests. """ - cmd = ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % - ",".join(qa_config.GetEnabledDiskTemplates())] + enabled_disk_templates = qa_config.GetEnabledDiskTemplates() + cmd = ["gnt-cluster", "modify", + "--enabled-disk-templates=%s" % ",".join(enabled_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates), + ] if utils.IsLvmEnabled(qa_config.GetEnabledDiskTemplates()): vgname = qa_config.get("vg-name", constants.DEFAULT_VG) @@ -606,7 +609,8 @@ def _TestClusterModifyDiskTemplatesArguments(default_disk_template, AssertCommand( ["gnt-cluster", "modify", "--enabled-disk-templates=%s,%s" % - (default_disk_template, default_disk_template)], + (default_disk_template, default_disk_template), + "--ipolicy-disk-templates=%s" % default_disk_template], fail=False) if constants.DT_DRBD8 in enabled_disk_templates: @@ -618,12 +622,15 @@ def _TestClusterModifyDiskTemplatesArguments(default_disk_template, # has to be installed on the nodes in this case AssertCommand(["gnt-cluster", "modify", "--drbd-usermode-helper=%s" % drbd_usermode_helper, - "--enabled-disk-templates=%s" % constants.DT_DISKLESS], + "--enabled-disk-templates=%s" % constants.DT_DISKLESS, + "--ipolicy-disk-templates=%s" % constants.DT_DISKLESS], fail=False) # specifying a helper when drbd is re-enabled AssertCommand(["gnt-cluster", "modify", "--drbd-usermode-helper=%s" % drbd_usermode_helper, "--enabled-disk-templates=%s" % + ",".join(enabled_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)], fail=False) @@ -650,13 +657,15 @@ def _TestClusterModifyDiskTemplatesVgName(enabled_disk_templates): AssertCommand( ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % non_lvm_template, + "--ipolicy-disk-templates=%s" % non_lvm_template, "--vg-name="], fail=False) # Try to enable lvm, when no volume group is given AssertCommand( ["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % lvm_template], + "--enabled-disk-templates=%s" % lvm_template, + "--ipolicy-disk-templates=%s" % lvm_template], fail=True) # Set volume group, with lvm still disabled: just a warning @@ -666,13 +675,15 @@ def _TestClusterModifyDiskTemplatesVgName(enabled_disk_templates): AssertCommand( ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % lvm_template, + "--ipolicy-disk-templates=%s" % lvm_template, "--vg-name="], fail=True) # Enable lvm with vg name present AssertCommand( ["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % lvm_template], + "--enabled-disk-templates=%s" % lvm_template, + "--ipolicy-disk-templates=%s" % lvm_template], fail=False) # Try unsetting vg name with lvm still enabled @@ -680,7 +691,10 @@ def _TestClusterModifyDiskTemplatesVgName(enabled_disk_templates): # Disable lvm with vg name still set AssertCommand( - ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % non_lvm_template], + ["gnt-cluster", "modify", + "--enabled-disk-templates=%s" % non_lvm_template, + "--ipolicy-disk-templates=%s" % non_lvm_template, + ], fail=False) # Try unsetting vg name with lvm disabled @@ -690,6 +704,7 @@ def _TestClusterModifyDiskTemplatesVgName(enabled_disk_templates): AssertCommand( ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % lvm_template, + "--ipolicy-disk-templates=%s" % lvm_template, "--vg-name=%s" % vgname], fail=False) @@ -697,6 +712,7 @@ def _TestClusterModifyDiskTemplatesVgName(enabled_disk_templates): AssertCommand( ["gnt-cluster", "modify", "--enabled-disk-templates=%s" % non_lvm_template, + "--ipolicy-disk-templates=%s" % non_lvm_template, "--vg-name="], fail=False) @@ -719,8 +735,8 @@ def _TestClusterModifyUsedDiskTemplate(instance_template, - set([instance_template])) AssertCommand( ["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % - ",".join(new_disk_templates)], + "--enabled-disk-templates=%s" % ",".join(new_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(new_disk_templates)], fail=True) @@ -733,14 +749,14 @@ def _TestClusterModifyUnusedDiskTemplate(instance_template): AssertCommand( ["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % - ",".join(all_disk_templates)], + "--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)], + "--enabled-disk-templates=%s" % ",".join(new_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(new_disk_templates)], fail=False) diff --git a/qa/qa_instance.py b/qa/qa_instance.py index 579518b..37b7fc4 100644 --- a/qa/qa_instance.py +++ b/qa/qa_instance.py @@ -1027,8 +1027,8 @@ def TestInstanceCreationRestrictedByDiskTemplates(): # Setup the cluster with the enabled_disk_templates AssertCommand( ["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % - ",".join(enabled_disk_templates)], + "--enabled-disk-templates=%s" % ",".join(enabled_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)], fail=False) # Test instance creation for enabled disk templates @@ -1054,8 +1054,8 @@ def TestInstanceCreationRestrictedByDiskTemplates(): for (enabled, disabled) in [(templates1, templates2), (templates2, templates1)]: AssertCommand(["gnt-cluster", "modify", - "--enabled-disk-templates=%s" % - ",".join(enabled)], + "--enabled-disk-templates=%s" % ",".join(enabled), + "--ipolicy-disk-templates=%s" % ",".join(enabled)], fail=False) for disk_template in disabled: CreateInstanceByDiskTemplate(nodes, disk_template, fail=True) @@ -1068,6 +1068,8 @@ def TestInstanceCreationRestrictedByDiskTemplates(): set(enabled_disk_templates)) AssertCommand(["gnt-cluster", "modify", "--enabled-disk-templates=%s" % + ",".join(other_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(other_disk_templates)], fail=False) CreateInstanceByDiskTemplate(nodes, enabled_disk_templates[0], fail=True) @@ -1078,5 +1080,7 @@ def TestInstanceCreationRestrictedByDiskTemplates(): # Restore initially enabled disk templates AssertCommand(["gnt-cluster", "modify", "--enabled-disk-templates=%s" % + ",".join(enabled_disk_templates), + "--ipolicy-disk-templates=%s" % ",".join(enabled_disk_templates)], fail=False)