Make invocation of rapi test configurable by QA config

[ganeti-local] / qa / ganeti-qa.py

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 29eab43..712424f 100755 (executable)
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -267,6 +267,8 @@ def RunCommonInstanceTests(instance):
   RunTestIf(["instance-console", qa_rapi.Enabled],
             qa_rapi.TestRapiInstanceConsole, instance)
 
+  RunTestIf("instance-device-names", qa_instance.TestInstanceDeviceNames,
+            instance)
   DOWN_TESTS = qa_config.Either([
     "instance-reinstall",
     "instance-rename",
@@ -585,8 +587,8 @@ def RunInstanceTests():
     ("instance-add-diskless", constants.DT_DISKLESS,
      qa_instance.TestInstanceAddDiskless, 1),
     ("instance-add-file", constants.DT_FILE,
-     qa_instance.TestInstanceAddFile, 1),
-  ]
+     qa_instance.TestInstanceAddFile, 1)
+    ]
 
   for (test_name, templ, create_fun, num_nodes) in instance_tests:
     if (qa_config.TestEnabled(test_name) and
@@ -638,7 +640,8 @@ def RunQa():
   SetupCluster(rapi_user, rapi_secret)
 
   # Load RAPI certificate
-  qa_rapi.Setup(rapi_user, rapi_secret)
+  if qa_config.get("rapi"):
+    qa_rapi.Setup(rapi_user, rapi_secret)
 
   RunClusterTests()
   RunOsTests()
@@ -725,6 +728,10 @@ def RunQa():
   RunTestIf(["cluster-instance-policy", "instance-add-plain-disk"],
             TestIPolicyPlainInstance)
 
+  RunTestIf(
+    "instance-add-restricted-by-disktemplates",
+    qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
+
   # Test removing instance with offline drbd secondary
   if qa_config.TestEnabled(["instance-remove-drbd-offline",
                             "instance-add-drbd-disk"]):