Revision 69bc7a38

b/qa/ganeti-qa.py
268 268
            qa_rapi.TestRapiInstanceReinstall, instance)
269 269

  
270 270
  if qa_config.TestEnabled("instance-rename"):
271
    rename_source = instance["name"]
272
    rename_target = qa_config.get("rename", None)
273
    # perform instance rename to the same name
274
    RunTest(qa_instance.TestInstanceRenameAndBack,
275
            rename_source, rename_source)
276
    RunTestIf("rapi", qa_rapi.TestRapiInstanceRenameAndBack,
277
              rename_source, rename_source)
278
    if rename_target is not None:
279
      # perform instance rename to a different name, if we have one configured
271
    tgt_instance = qa_config.AcquireInstance()
272
    try:
273
      rename_source = instance["name"]
274
      rename_target = tgt_instance["name"]
275
      # perform instance rename to the same name
280 276
      RunTest(qa_instance.TestInstanceRenameAndBack,
281
              rename_source, rename_target)
277
              rename_source, rename_source)
282 278
      RunTestIf("rapi", qa_rapi.TestRapiInstanceRenameAndBack,
279
                rename_source, rename_source)
280
      if rename_target is not None:
281
        # perform instance rename to a different name, if we have one configured
282
        RunTest(qa_instance.TestInstanceRenameAndBack,
283 283
                rename_source, rename_target)
284
        RunTestIf("rapi", qa_rapi.TestRapiInstanceRenameAndBack,
285
                  rename_source, rename_target)
286
    finally:
287
      qa_config.ReleaseInstance(tgt_instance)
284 288

  
285 289
  RunTestIf(["instance-grow-disk"], qa_instance.TestInstanceGrowDisk, instance)
286 290

  
b/qa/qa-sample.json
5 5
  "# sign (#).": null,
6 6

  
7 7
  "name": "xen-test",
8

  
9
  "# Name used for renaming cluster": null,
8 10
  "rename": "xen-test-rename",
11

  
9 12
  "enabled-hypervisors": "xen-pvm",
10 13
  "# Dict of hypervisor name and parameters (like on the cmd line)": null,
11 14
  "hypervisor-parameters": {},

Also available in: Unified diff