From 42a769f90ef2b868aa1c43d4982af034d275a2ff Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Wed, 7 Dec 2011 17:19:44 +0100
Subject: [PATCH] Add tests for parameter "always_failover"
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/qa_instance.py | 14 ++++++++++++++
test/ganeti.rapi.rlib2_unittest.py | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 751176ffb..fbb6f795f 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -187,6 +187,18 @@ def TestInstanceMigrate(instance):
instance["name"]])
AssertCommand(["gnt-instance", "start", instance["name"]])
AssertCommand(cmd)
+ AssertCommand(["gnt-instance", "modify", "-B",
+ ("%s=%s" %
+ (constants.BE_ALWAYS_FAILOVER, constants.VALUE_TRUE)),
+ instance["name"]])
+ AssertCommand(cmd, fail=True)
+ AssertCommand(["gnt-instance", "migrate", "--force", "--allow-failover",
+ instance["name"]])
+ AssertCommand(["gnt-instance", "modify", "-B",
+ ("%s=%s" %
+ (constants.BE_ALWAYS_FAILOVER, constants.VALUE_FALSE)),
+ instance["name"]])
+ AssertCommand(cmd)
def TestInstanceInfo(instance):
@@ -211,6 +223,8 @@ def TestInstanceModify(instance):
["-B", "%s=2" % constants.BE_VCPUS],
["-B", "%s=1" % constants.BE_VCPUS],
["-B", "%s=%s" % (constants.BE_VCPUS, constants.VALUE_DEFAULT)],
+ ["-B", "%s=%s" % (constants.BE_ALWAYS_FAILOVER, constants.VALUE_TRUE)],
+ ["-B", "%s=%s" % (constants.BE_ALWAYS_FAILOVER, constants.VALUE_DEFAULT)],
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)],
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)],
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index 4fa038962..cde68cedc 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -823,7 +823,8 @@ class TestInstanceCreation(testutils.GanetiTestCase):
{ constants.BE_VCPUS: 2,
constants.BE_MAXMEM: 1024,
constants.BE_MINMEM: 1024,
- constants.BE_AUTO_BALANCE: True, }
+ constants.BE_AUTO_BALANCE: True,
+ constants.BE_ALWAYS_FAILOVER: True, }
]
hvparam_variants = [
--
GitLab