Move message formatting functions to separate file

[ganeti-local] / qa / qa_cluster.py

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index e281178..ecdf369 100644 (file)
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -33,9 +33,10 @@ from ganeti import utils
 from ganeti import pathutils
 
 import qa_config
-import qa_utils
 import qa_error
 import qa_instance
+import qa_logging
+import qa_utils
 
 from qa_utils import AssertEqual, AssertCommand, GetCommandOutput
 
@@ -254,7 +255,7 @@ def TestClusterRename():
   original_name = qa_config.get("name")
   rename_target = qa_config.get("rename", None)
   if rename_target is None:
-    print qa_utils.FormatError('"rename" entry is missing')
+    print qa_logging.FormatError('"rename" entry is missing')
     return
 
   for data in [
@@ -578,7 +579,7 @@ def TestClusterModifyIPolicy():
 
   # Disk templates are treated slightly differently
   par = "disk-templates"
-  disp_str = "enabled disk templates"
+  disp_str = "allowed disk templates"
   curr_val = old_policy[disp_str]
   test_values = [
     (True, constants.DT_PLAIN),
@@ -832,10 +833,13 @@ def TestClusterMasterFailover():
   failovermaster = qa_config.AcquireNode(exclude=master)
 
   cmd = ["gnt-cluster", "master-failover"]
+  node_list_cmd = ["gnt-node", "list"]
   try:
     AssertCommand(cmd, node=failovermaster)
+    AssertCommand(node_list_cmd, node=failovermaster)
     # Back to original master node
     AssertCommand(cmd, node=master)
+    AssertCommand(node_list_cmd, node=master)
   finally:
     failovermaster.Release()