Revision 6f88e076
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 290 | 290 |
RunTestIf("rapi", qa_rapi.TestRapiInstanceRenameAndBack,
|
| 291 | 291 |
rename_source, rename_target) |
| 292 | 292 |
finally: |
| 293 |
qa_config.ReleaseInstance(tgt_instance)
|
|
| 293 |
tgt_instance.Release()
|
|
| 294 | 294 |
|
| 295 | 295 |
RunTestIf(["instance-grow-disk"], qa_instance.TestInstanceGrowDisk, instance) |
| 296 | 296 |
|
| ... | ... | |
| 375 | 375 |
RunTest(qa_instance.TestInstanceStartup, newinst) |
| 376 | 376 |
RunTest(qa_instance.TestInstanceRemove, newinst) |
| 377 | 377 |
finally: |
| 378 |
qa_config.ReleaseInstance(newinst)
|
|
| 378 |
newinst.Release()
|
|
| 379 | 379 |
finally: |
| 380 | 380 |
qa_config.ReleaseNode(expnode) |
| 381 | 381 |
|
| ... | ... | |
| 389 | 389 |
finally: |
| 390 | 390 |
qa_config.ReleaseNode(tnode) |
| 391 | 391 |
finally: |
| 392 |
qa_config.ReleaseInstance(newinst)
|
|
| 392 |
newinst.Release()
|
|
| 393 | 393 |
|
| 394 | 394 |
|
| 395 | 395 |
def RunDaemonTests(instance): |
| ... | ... | |
| 482 | 482 |
qa_instance.TestInstanceRemove(instance2) |
| 483 | 483 |
qa_instance.TestInstanceRemove(instance1) |
| 484 | 484 |
finally: |
| 485 |
qa_config.ReleaseInstance(instance2)
|
|
| 485 |
instance2.Release()
|
|
| 486 | 486 |
finally: |
| 487 |
qa_config.ReleaseInstance(instance1)
|
|
| 487 |
instance1.Release()
|
|
| 488 | 488 |
|
| 489 | 489 |
if qa_config.TestEnabled("instance-add-drbd-disk"):
|
| 490 | 490 |
snode = qa_config.AcquireNode() |
| ... | ... | |
| 497 | 497 |
qa_cluster.AssertClusterVerify(fail=True, errors=exp_err) |
| 498 | 498 |
qa_instance.TestInstanceRemove(instance) |
| 499 | 499 |
finally: |
| 500 |
qa_config.ReleaseInstance(instance)
|
|
| 500 |
instance.Release()
|
|
| 501 | 501 |
finally: |
| 502 | 502 |
qa_config.ReleaseNode(snode) |
| 503 | 503 |
qa_cluster.TestSetExclStorCluster(old_es) |
| ... | ... | |
| 541 | 541 |
RunRepairDiskSizes() |
| 542 | 542 |
RunTest(qa_instance.TestInstanceRemove, instance) |
| 543 | 543 |
finally: |
| 544 |
qa_config.ReleaseInstance(instance)
|
|
| 544 |
instance.Release()
|
|
| 545 | 545 |
|
| 546 | 546 |
del instance |
| 547 | 547 |
finally: |
| ... | ... | |
| 601 | 601 |
RunCommonInstanceTests(rapi_instance) |
| 602 | 602 |
RunTest(qa_rapi.TestRapiInstanceRemove, rapi_instance, use_client) |
| 603 | 603 |
finally: |
| 604 |
qa_config.ReleaseInstance(rapi_instance)
|
|
| 604 |
rapi_instance.Release()
|
|
| 605 | 605 |
del rapi_instance |
| 606 | 606 |
|
| 607 | 607 |
finally: |
| ... | ... | |
| 635 | 635 |
finally: |
| 636 | 636 |
qa_config.ReleaseNode(expnode) |
| 637 | 637 |
finally: |
| 638 |
qa_config.ReleaseInstance(instance)
|
|
| 638 |
instance.Release()
|
|
| 639 | 639 |
del expnode |
| 640 | 640 |
del instance |
| 641 | 641 |
qa_cluster.AssertClusterVerify() |
| b/qa/qa_cluster.py | ||
|---|---|---|
| 553 | 553 |
|
| 554 | 554 |
finally: |
| 555 | 555 |
for inst in instances: |
| 556 |
qa_config.ReleaseInstance(inst)
|
|
| 556 |
inst.Release()
|
|
| 557 | 557 |
|
| 558 | 558 |
|
| 559 | 559 |
def TestClusterMasterFailover(): |
| b/qa/qa_config.py | ||
|---|---|---|
| 88 | 88 |
except KeyError: |
| 89 | 89 |
return default |
| 90 | 90 |
|
| 91 |
def Release(self): |
|
| 92 |
"""Releases instance and makes it available again. |
|
| 93 |
|
|
| 94 |
""" |
|
| 95 |
assert self.used, \ |
|
| 96 |
("Instance '%s' was never acquired or released more than once" %
|
|
| 97 |
self.name) |
|
| 98 |
|
|
| 99 |
self.used = False |
|
| 100 |
self.disk_template = None |
|
| 101 |
|
|
| 91 | 102 |
def GetNicMacAddr(self, idx, default): |
| 92 | 103 |
"""Returns MAC address for NIC. |
| 93 | 104 |
|
| ... | ... | |
| 422 | 433 |
return inst |
| 423 | 434 |
|
| 424 | 435 |
|
| 425 |
def ReleaseInstance(inst): |
|
| 426 |
inst.used = False |
|
| 427 |
inst.disk_template = None |
|
| 428 |
|
|
| 429 |
|
|
| 430 | 436 |
def GetInstanceTemplate(inst): |
| 431 | 437 |
"""Return the disk template of an instance. |
| 432 | 438 |
|
| b/qa/qa_instance.py | ||
|---|---|---|
| 80 | 80 |
|
| 81 | 81 |
return instance |
| 82 | 82 |
except: |
| 83 |
qa_config.ReleaseInstance(instance)
|
|
| 83 |
instance.Release()
|
|
| 84 | 84 |
raise |
| 85 | 85 |
|
| 86 | 86 |
|
| b/qa/qa_rapi.py | ||
|---|---|---|
| 598 | 598 |
|
| 599 | 599 |
return instance |
| 600 | 600 |
except: |
| 601 |
qa_config.ReleaseInstance(instance)
|
|
| 601 |
instance.Release()
|
|
| 602 | 602 |
raise |
| 603 | 603 |
|
| 604 | 604 |
|
| b/test/py/qa.qa_config_unittest.py | ||
|---|---|---|
| 285 | 285 |
self.assertTrue(inst.used) |
| 286 | 286 |
self.assertTrue(inst.disk_template is None) |
| 287 | 287 |
|
| 288 |
qa_config.ReleaseInstance(inst)
|
|
| 288 |
inst.Release()
|
|
| 289 | 289 |
|
| 290 | 290 |
self.assertFalse(inst.used) |
| 291 | 291 |
self.assertTrue(inst.disk_template is None) |
Also available in: Unified diff