From ad658827f4009415ccb8cfe62e9876acea81ba05 Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Tue, 12 Mar 2013 14:11:32 +0100
Subject: [PATCH] Fix QA: skip reinstall for diskless instances

Diskless instances cannot really be reinstalled, not even through RAPI.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 qa/qa_rapi.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index 02b62ad80..b2ff4f0b2 100644
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -681,6 +681,10 @@ def TestRapiInstanceRenameAndBack(rename_source, rename_target):
 @InstanceCheck(INST_DOWN, INST_DOWN, FIRST_ARG)
 def TestRapiInstanceReinstall(instance):
   """Test reinstalling an instance via RAPI"""
+  if instance.disk_template == constants.DT_DISKLESS:
+    print qa_utils.FormatInfo("Test not supported for diskless instances")
+    return
+
   _WaitForRapiJob(_rapi_client.ReinstallInstance(instance.name))
   # By default, the instance is started again
   qa_utils.RunInstanceCheck(instance, True)
-- 
GitLab