Revision 5de31440 qa/qa_rapi.py

b/qa/qa_rapi.py
46 46
import qa_utils
47 47
import qa_error
48 48

  
49
from qa_instance import IsFailoverSupported
50
from qa_instance import IsMigrationSupported
51
from qa_instance import IsDiskReplacingSupported
49 52
from qa_utils import (AssertEqual, AssertIn, AssertMatch, StartLocalCommand)
50 53
from qa_utils import InstanceCheck, INST_DOWN, INST_UP, FIRST_ARG
51 54

  
......
617 620
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
618 621
def TestRapiInstanceMigrate(instance):
619 622
  """Test migrating instance via RAPI"""
623
  if not IsMigrationSupported(instance):
624
    print qa_utils.FormatInfo("Instance doesn't support migration, skipping"
625
                              " test")
626
    return
620 627
  # Move to secondary node
621 628
  _WaitForRapiJob(_rapi_client.MigrateInstance(instance["name"]))
622 629
  qa_utils.RunInstanceCheck(instance, True)
......
627 634
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
628 635
def TestRapiInstanceFailover(instance):
629 636
  """Test failing over instance via RAPI"""
637
  if not IsFailoverSupported(instance):
638
    print qa_utils.FormatInfo("Instance doesn't support failover, skipping"
639
                              " test")
640
    return
630 641
  # Move to secondary node
631 642
  _WaitForRapiJob(_rapi_client.FailoverInstance(instance["name"]))
632 643
  qa_utils.RunInstanceCheck(instance, True)
......
676 687
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
677 688
def TestRapiInstanceReplaceDisks(instance):
678 689
  """Test replacing instance disks via RAPI"""
690
  if not IsDiskReplacingSupported(instance):
691
    print qa_utils.FormatInfo("Instance doesn't support disk replacing,"
692
                              " skipping test")
693
    return
679 694
  fn = _rapi_client.ReplaceInstanceDisks
680 695
  _WaitForRapiJob(fn(instance["name"],
681 696
                     mode=constants.REPLACE_DISK_AUTO, disks=[]))

Also available in: Unified diff