Fix validation of vgname in OpClusterSetParams

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

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index e7ad3b8..de9c194 100755 (executable)
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -44,10 +44,11 @@ import qa_tags
 import qa_utils
 
 from ganeti import utils
-from ganeti import rapi
+from ganeti import rapi # pylint: disable=W0611
 from ganeti import constants
 
 import ganeti.rapi.client # pylint: disable=W0611
+from ganeti.rapi.client import UsesRapiClient
 
 
 def _FormatHeader(line, end=72):
@@ -490,6 +491,8 @@ def RunQa():
         snode = qa_config.AcquireNode(exclude=pnode)
         try:
           instance = RunTest(func, pnode, snode)
+          RunTestIf("haskell-confd", qa_node.TestNodeListDrbd, pnode)
+          RunTestIf("haskell-confd", qa_node.TestNodeListDrbd, snode)
           RunCommonInstanceTests(instance)
           RunGroupListTests()
           RunTest(qa_group.TestAssignNodesIncludingSplit,
@@ -507,6 +510,18 @@ def RunQa():
         finally:
           qa_config.ReleaseNode(snode)
 
+    # Test removing instance with offline drbd secondary
+    if qa_config.TestEnabled("instance-remove-drbd-offline"):
+      snode = qa_config.AcquireNode(exclude=pnode)
+      instance = \
+        qa_instance.TestInstanceAddWithDrbdDisk(pnode, snode)
+      try:
+        qa_node.MakeNodeOffline(snode, "yes")
+        RunTest(qa_instance.TestInstanceRemove, instance)
+      finally:
+        qa_node.MakeNodeOffline(snode, "no")
+        qa_config.ReleaseNode(snode)
+
     if qa_config.TestEnabled(["instance-add-plain-disk", "instance-export"]):
       for shutdown in [False, True]:
         instance = RunTest(qa_instance.TestInstanceAddWithPlainDisk, pnode)
@@ -530,7 +545,7 @@ def RunQa():
   RunTestIf("cluster-destroy", qa_cluster.TestClusterDestroy)
 
 
-@rapi.client.UsesRapiClient
+@UsesRapiClient
 def main():
   """Main program.