[PATCH stable-2.12 3/3] QA: Check that the cluster verify doesn't change the config

['Petr Pudlak' via ganeti-devel]

Cluster verification must not do any changes to the configuration.

Signed-off-by: Petr Pudlak <pud...@google.com>
---
 qa/qa_cluster.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 1f789a2..adf508a 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -51,7 +51,8 @@ import qa_job_utils
 import qa_logging
 import qa_utils
 
-from qa_utils import AssertEqual, AssertCommand, GetCommandOutput
+from qa_utils import AssertEqual, AssertCommand, GetCommandOutput, \
+                     CheckFileUnmodified
 
 
 # Prefix for LVM volumes created by QA code during tests
@@ -150,8 +151,9 @@ def AssertClusterVerify(fail=False, errors=None,
   cvcmd = "gnt-cluster verify"
   mnode = qa_config.GetMasterNode()
   if errors or warnings or no_warnings:
-    cvout = GetCommandOutput(mnode.primary, cvcmd + " --error-codes",
-                             fail=(fail or errors))
+    with CheckFileUnmodified(mnode.primary, pathutils.CLUSTER_CONF_FILE):
+      cvout = GetCommandOutput(mnode.primary, cvcmd + " --error-codes",
+                               fail=(fail or errors))
     print cvout
     (act_errs, act_warns) = _GetCVErrorCodes(cvout)
     if errors:
@@ -162,7 +164,8 @@ def AssertClusterVerify(fail=False, errors=None,
       _CheckVerifyNoWarnings(act_warns, no_warnings)
 
   else:
-    AssertCommand(cvcmd, fail=fail, node=mnode)
+    with CheckFileUnmodified(mnode.primary, pathutils.CLUSTER_CONF_FILE):
+      AssertCommand(cvcmd, fail=fail, node=mnode)
 
 
 # data for testing failures due to bad keys/values for disk parameters
-- 
2.2.0.rc0.207.ga3a616c