Revision 6f665bf7 qa/ganeti-qa.py
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 577 | 577 |
|
| 578 | 578 |
def RunInstanceTests(): |
| 579 | 579 |
"""Create and exercise instances.""" |
| 580 |
instance_tests = [ |
|
| 581 |
("instance-add-plain-disk", constants.DT_PLAIN,
|
|
| 582 |
qa_instance.TestInstanceAddWithPlainDisk, 1), |
|
| 583 |
("instance-add-drbd-disk", constants.DT_DRBD8,
|
|
| 584 |
qa_instance.TestInstanceAddWithDrbdDisk, 2), |
|
| 585 |
("instance-add-diskless", constants.DT_DISKLESS,
|
|
| 586 |
qa_instance.TestInstanceAddDiskless, 1), |
|
| 587 |
("instance-add-file", constants.DT_FILE,
|
|
| 588 |
qa_instance.TestInstanceAddFile, 1), |
|
| 589 |
] |
|
| 580 |
instance_tests = [] |
|
| 581 |
enabled_disk_templates = qa_config.GetEnabledDiskTemplates() |
|
| 582 |
# FIXME: Refactor this to make the code more elegant wrt to disk templates. |
|
| 583 |
if constants.DT_PLAIN in enabled_disk_templates: |
|
| 584 |
instance_tests.append(("instance-add-plain-disk", constants.DT_PLAIN,
|
|
| 585 |
qa_instance.TestInstanceAddWithPlainDisk, 1)) |
|
| 586 |
if constants.DT_DRBD8 in enabled_disk_templates: |
|
| 587 |
instance_tests.append(("instance-add-drbd-disk", constants.DT_DRBD8,
|
|
| 588 |
qa_instance.TestInstanceAddWithDrbdDisk, 2)) |
|
| 589 |
if constants.DT_DISKLESS in enabled_disk_templates: |
|
| 590 |
instance_tests.append(("instance-add-diskless", constants.DT_DISKLESS,
|
|
| 591 |
qa_instance.TestInstanceAddDiskless, 1)) |
|
| 592 |
if constants.DT_FILE in enabled_disk_templates: |
|
| 593 |
instance_tests.append(("instance-add-file", constants.DT_FILE,
|
|
| 594 |
qa_instance.TestInstanceAddFile, 1)) |
|
| 590 | 595 |
|
| 591 | 596 |
for (test_name, templ, create_fun, num_nodes) in instance_tests: |
| 592 | 597 |
if (qa_config.TestEnabled(test_name) and |
| ... | ... | |
| 626 | 631 |
qa_config.ReleaseManyNodes(inodes) |
| 627 | 632 |
qa_cluster.AssertClusterVerify() |
| 628 | 633 |
|
| 634 |
RunTestIf( |
|
| 635 |
"instance-add-restricted-by-disktemplates", |
|
| 636 |
qa_instance.TestInstanceCreationRestrictedByDiskTemplates) |
|
| 637 |
|
|
| 629 | 638 |
|
| 630 | 639 |
def RunQa(): |
| 631 | 640 |
"""Main QA body. |
Also available in: Unified diff