Revision e75f80b9

b/qa/qa_instance.py
1086 1086

  
1087 1087

  
1088 1088
def TestInstanceCreationRestrictedByDiskTemplates():
1089
  """Test adding instances for disbled disk templates."""
1089
  """Test adding instances for disabled disk templates."""
1090 1090
  enabled_disk_templates = qa_config.GetEnabledDiskTemplates()
1091 1091
  nodes = qa_config.AcquireManyNodes(2)
1092 1092

  
......
1099 1099

  
1100 1100
  # Test instance creation for enabled disk templates
1101 1101
  for disk_template in enabled_disk_templates:
1102
    instance = CreateInstanceByDiskTemplate(nodes, disk_template, False)
1102
    instance = CreateInstanceByDiskTemplate(nodes, disk_template, fail=False)
1103 1103
    TestInstanceRemove(instance)
1104
    instance.Release()
1104 1105

  
1105 1106
  # Test that instance creation fails for disabled disk templates
1106 1107
  disabled_disk_templates = list(constants.DISK_TEMPLATES
1107 1108
                                 - set(enabled_disk_templates))
1108 1109
  for disk_template in disabled_disk_templates:
1109
    instance = CreateInstanceByDiskTemplate(nodes, disk_template, True)
1110
    instance = CreateInstanceByDiskTemplate(nodes, disk_template, fail=True)
1110 1111

  
1111 1112
  # Test instance creation for after disabling enabled disk templates
1112 1113
  if (len(enabled_disk_templates) > 1):
......
1123 1124
                       ",".join(enabled)],
1124 1125
                    fail=False)
1125 1126
      for disk_template in disabled:
1126
        CreateInstanceByDiskTemplate(nodes, disk_template, True)
1127
        CreateInstanceByDiskTemplate(nodes, disk_template, fail=True)
1127 1128
  elif (len(enabled_disk_templates) == 1):
1128 1129
    # If only one disk template is enabled in the QA config, we have to enable
1129 1130
    # some of the disabled disk templates in order to test if the disabling the
......
1132 1133
                   "--enabled-disk-template=%s" %
1133 1134
                     ",".join(disabled_disk_templates)],
1134 1135
                  fail=False)
1135
    CreateInstanceByDiskTemplate(nodes, enabled_disk_templates[0], True)
1136
    CreateInstanceByDiskTemplate(nodes, enabled_disk_templates[0], fail=True)
1136 1137
  else:
1137 1138
    raise qa_error.Error("Please enable at least one disk template"
1138 1139
                         " in your QA setup.")

Also available in: Unified diff