Revision 46747143 qa/ganeti-qa.py

b/qa/ganeti-qa.py
201 201
  if qa_config.TestEnabled('instance-rename'):
202 202
    rename_source = instance["name"]
203 203
    rename_target = qa_config.get("rename", None)
204
    if rename_target is None:
205
      print qa_utils.FormatError("Can rename instance, 'rename' entry is"
206
                                 " missing from configuration")
207
    else:
208
      RunTest(qa_instance.TestInstanceShutdown, instance)
204
    RunTest(qa_instance.TestInstanceShutdown, instance)
205
    # perform instance rename to the same name
206
    RunTest(qa_instance.TestInstanceRename, rename_source, rename_source)
207
    RunTestIf("rapi", qa_rapi.TestRapiInstanceRename, rename_source, rename_source)
208
    if rename_target is not None:
209
      # perform instance rename to a different name, if we have one configured
209 210
      RunTest(qa_instance.TestInstanceRename, rename_source, rename_target)
210 211
      RunTest(qa_instance.TestInstanceRename, rename_target, rename_source)
211 212
      RunTestIf("rapi", qa_rapi.TestRapiInstanceRename, rename_source, rename_target)
212 213
      RunTestIf("rapi", qa_rapi.TestRapiInstanceRename, rename_target, rename_source)
213
      RunTest(qa_instance.TestInstanceStartup, instance)
214
    RunTest(qa_instance.TestInstanceStartup, instance)
214 215

  
215 216
  RunTestIf("tags", qa_tags.TestInstanceTags, instance)
216 217

  

Also available in: Unified diff