Revision 2ef21e6e

b/qa/ganeti-qa.py
626 626
        qa_config.ReleaseManyNodes(inodes)
627 627
      qa_cluster.AssertClusterVerify()
628 628

  
629
  RunTestIf(
630
    "instance-add-restricted-by-disktemplates",
631
    qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
632

  
633 629

  
634 630
def RunQa():
635 631
  """Main QA body.
......
729 725
  RunTestIf(["cluster-instance-policy", "instance-add-plain-disk"],
730 726
            TestIPolicyPlainInstance)
731 727

  
728
  RunTestIf(
729
    "instance-add-restricted-by-disktemplates",
730
    qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
731

  
732 732
  # Test removing instance with offline drbd secondary
733 733
  if qa_config.TestEnabled(["instance-remove-drbd-offline",
734 734
                            "instance-add-drbd-disk"]):
b/qa/qa_instance.py
1007 1007

  
1008 1008

  
1009 1009
def TestInstanceCreationRestrictedByDiskTemplates():
1010
  """Test if adding instances is only possible if they use an enabled
1011
     disk template."""
1010
  """Test adding instances for disbled disk templates."""
1012 1011
  enabled_disk_templates = qa_config.GetEnabledDiskTemplates()
1013 1012
  nodes = qa_config.AcquireManyNodes(2)
1014 1013

  

Also available in: Unified diff