From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 29 Sep 2010 15:56:19 +0000 (+0200)
Subject: qa_config: Use ganeti.serializer for loading config
X-Git-Tag: v2.3.0rc0~138
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/a705dc05c9affc91184ce7908f0c2ea9a31f32e5

qa_config: Use ganeti.serializer for loading config

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---

diff --git a/qa/qa_config.py b/qa/qa_config.py
index 4afe253..942be8b 100644
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -24,7 +24,8 @@
 """
 
 
-import simplejson
+from ganeti import utils
+from ganeti import serializer
 
 import qa_error
 
@@ -39,11 +40,7 @@ def Load(path):
   """
   global cfg
 
-  f = open(path, 'r')
-  try:
-    cfg = simplejson.load(f)
-  finally:
-    f.close()
+  cfg = serializer.LoadJson(utils.ReadFile(path))
 
   Validate()