QA: Run cluster-verify after instance tests

We want to make sure that instance operations don't leave the cluster in a
bad state. The "instance-remove-drbd-offline" test leaves some debris
behind, so it's been moved to the last position.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

qa/ganeti-qa.py

@@ -514,6 +514,9 @@ def RunQa():
   finally:
     qa_config.ReleaseNode(pnode)
 
+  # Make sure the cluster is clean before running instance tests
+  qa_cluster.AssertClusterVerify()
+
   pnode = qa_config.AcquireNode()
   try:
     RunTestIf("tags", qa_tags.TestNodeTags, pnode)
@@ -568,24 +571,7 @@ def RunQa():
         del instance
       finally:
         qa_config.ReleaseManyNodes(inodes)
-
-  # Test removing instance with offline drbd secondary
-  if qa_config.TestEnabled("instance-remove-drbd-offline"):
-    # Make sure the master is not put offline
-    snode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode())
-    try:
-      pnode = qa_config.AcquireNode(exclude=snode)
-      try:
-        instance = qa_instance.TestInstanceAddWithDrbdDisk([pnode, snode])
-        qa_node.MakeNodeOffline(snode, "yes")
-        try:
-          RunTest(qa_instance.TestInstanceRemove, instance)
-        finally:
-          qa_node.MakeNodeOffline(snode, "no")
-      finally:
-        qa_config.ReleaseNode(pnode)
-    finally:
-      qa_config.ReleaseNode(snode)
+      qa_cluster.AssertClusterVerify()
 
   pnode = qa_config.AcquireNode()
   try:
@@ -603,12 +589,33 @@ def RunQa():
           qa_config.ReleaseNode(expnode)
         del expnode
         del instance
+      qa_cluster.AssertClusterVerify()
 
   finally:
     qa_config.ReleaseNode(pnode)
 
   RunExclusiveStorageTests()
 
+  # Test removing instance with offline drbd secondary
+  if qa_config.TestEnabled("instance-remove-drbd-offline"):
+    # Make sure the master is not put offline
+    snode = qa_config.AcquireNode(exclude=qa_config.GetMasterNode())
+    try:
+      pnode = qa_config.AcquireNode(exclude=snode)
+      try:
+        instance = qa_instance.TestInstanceAddWithDrbdDisk([pnode, snode])
+        qa_node.MakeNodeOffline(snode, "yes")
+        try:
+          RunTest(qa_instance.TestInstanceRemove, instance)
+        finally:
+          qa_node.MakeNodeOffline(snode, "no")
+      finally:
+        qa_config.ReleaseNode(pnode)
+    finally:
+      qa_config.ReleaseNode(snode)
+    # FIXME: This test leaves a DRBD device and two LVs behind
+    # Cluster-verify would fail
+
   RunTestIf("create-cluster", qa_node.TestNodeRemoveAll)
 
   RunTestIf("cluster-destroy", qa_cluster.TestClusterDestroy)