Revision 37889387

b/qa/ganeti-qa.py
703 703

  
704 704
def RunInstanceTests():
705 705
  """Create and exercise instances."""
706
  instance_tests = [
707
    ("instance-add-plain-disk", constants.DT_PLAIN,
708
     qa_instance.TestInstanceAddWithPlainDisk, 1),
709
    ("instance-add-drbd-disk", constants.DT_DRBD8,
710
     qa_instance.TestInstanceAddWithDrbdDisk, 2),
711
    ("instance-add-diskless", constants.DT_DISKLESS,
712
     qa_instance.TestInstanceAddDiskless, 1),
713
    ("instance-add-file", constants.DT_FILE,
714
     qa_instance.TestInstanceAddFile, 1),
715
    ("instance-add-shared-file", constants.DT_SHARED_FILE,
716
     qa_instance.TestInstanceAddSharedFile, 1),
717
    ]
718

  
719
  for (test_name, templ, create_fun, num_nodes) in instance_tests:
706

  
707
  for (test_name, templ, create_fun, num_nodes) in \
708
      qa_instance.available_instance_tests:
720 709
    if (qa_config.TestEnabled(test_name) and
721 710
        qa_config.IsTemplateSupported(templ)):
722 711
      inodes = qa_config.AcquireManyNodes(num_nodes)
b/qa/qa_instance.py
1084 1084
                 "--ipolicy-disk-templates=%s" %
1085 1085
                   ",".join(enabled_disk_templates)],
1086 1086
                 fail=False)
1087

  
1088
available_instance_tests = [
1089
  ("instance-add-plain-disk", constants.DT_PLAIN,
1090
   TestInstanceAddWithPlainDisk, 1),
1091
  ("instance-add-drbd-disk", constants.DT_DRBD8,
1092
   TestInstanceAddWithDrbdDisk, 2),
1093
  ("instance-add-diskless", constants.DT_DISKLESS,
1094
   TestInstanceAddDiskless, 1),
1095
  ("instance-add-file", constants.DT_FILE,
1096
   TestInstanceAddFile, 1),
1097
  ("instance-add-shared-file", constants.DT_SHARED_FILE,
1098
   TestInstanceAddSharedFile, 1),
1099
  ]

Also available in: Unified diff