qa_utils: Support virtual cluster for backup files

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

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index bc31b7b..1a694f9 100755 (executable)
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -108,6 +108,7 @@ def RunTestIf(testnames, fn, *args, **kwargs):
   else:
     tstart = datetime.datetime.now()
     desc = _DescriptionOf(fn)
+    # TODO: Formatting test names when non-string names are involved
     print _FormatHeader("%s skipping %s, test(s) %s disabled" %
                         (tstart, desc, testnames))
 
@@ -276,8 +277,8 @@ def RunCommonInstanceTests(instance):
   if qa_config.TestEnabled("instance-rename"):
     tgt_instance = qa_config.AcquireInstance()
     try:
-      rename_source = instance["name"]
-      rename_target = tgt_instance["name"]
+      rename_source = instance.name
+      rename_target = tgt_instance.name
       # perform instance rename to the same name
       RunTest(qa_instance.TestInstanceRenameAndBack,
               rename_source, rename_source)
@@ -461,7 +462,7 @@ def RunExclusiveStorageTests():
   node = qa_config.AcquireNode()
   try:
     old_es = qa_cluster.TestSetExclStorCluster(False)
-    qa_cluster.TestExclStorSingleNode(node)
+    qa_node.TestExclStorSingleNode(node)
 
     qa_cluster.TestSetExclStorCluster(True)
     qa_cluster.TestExclStorSharedPv(node)