From a74184486309d4d1c66126277e335e5897805528 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 22 Sep 2011 12:20:39 +0200
Subject: [PATCH] QA: Add tests for instance start/stop via RAPI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This would have detected the issue fixed in the previous patch.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
qa/ganeti-qa.py | 6 ++++++
qa/qa_rapi.py | 10 ++++++++++
2 files changed, 16 insertions(+)
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index fc7abbcfa..8b0c33889 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -225,6 +225,12 @@ def RunCommonInstanceTests(instance):
qa_rapi.TestRapiStoppedInstanceConsole, instance)
RunTestIf("instance-shutdown", qa_instance.TestInstanceStartup, instance)
+ # Test shutdown/start via RAPI
+ RunTestIf(["instance-shutdown", "rapi"],
+ qa_rapi.TestRapiInstanceShutdown, instance)
+ RunTestIf(["instance-shutdown", "rapi"],
+ qa_rapi.TestRapiInstanceStartup, instance)
+
RunTestIf("instance-list", qa_instance.TestInstanceList)
RunTestIf("instance-info", qa_instance.TestInstanceInfo, instance)
diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index ece6e6452..02218463c 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -598,6 +598,16 @@ def TestRapiInstanceFailover(instance):
_WaitForRapiJob(_rapi_client.FailoverInstance(instance["name"]))
+def TestRapiInstanceShutdown(instance):
+ """Test stopping an instance via RAPI"""
+ _WaitForRapiJob(_rapi_client.ShutdownInstance(instance["name"]))
+
+
+def TestRapiInstanceStartup(instance):
+ """Test starting an instance via RAPI"""
+ _WaitForRapiJob(_rapi_client.StartupInstance(instance["name"]))
+
+
def TestRapiInstanceRename(rename_source, rename_target):
"""Test renaming instance via RAPI"""
_WaitForRapiJob(_rapi_client.RenameInstance(rename_source, rename_target))
--
GitLab