Revision 5ae4945a qa/qa_rapi.py

b/qa/qa_rapi.py
342 342

  
343 343
    if what == constants.QR_NODE:
344 344
      # Test with filter
345
      (nodes, ) = _DoTests([("/2/query/%s" % what,
346
        compat.partial(_Check, ["name", "master"]), "PUT", {
347
        "fields": ["name", "master"],
348
        "filter": [qlang.OP_TRUE, "master"],
349
        })])
345
      (nodes, ) = _DoTests(
346
        [("/2/query/%s" % what,
347
          compat.partial(_Check, ["name", "master"]), "PUT",
348
          {"fields": ["name", "master"],
349
           "filter": [qlang.OP_TRUE, "master"],
350
           })])
350 351
      qresult = objects.QueryResponse.FromDict(nodes)
351 352
      AssertEqual(qresult.data, [
352 353
        [[constants.RS_NORMAL, master_name], [constants.RS_NORMAL, True]],
......
675 676
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
676 677
def TestRapiInstanceReplaceDisks(instance):
677 678
  """Test replacing instance disks via RAPI"""
678
  _WaitForRapiJob(_rapi_client.ReplaceInstanceDisks(instance["name"],
679
    mode=constants.REPLACE_DISK_AUTO, disks=[]))
680
  _WaitForRapiJob(_rapi_client.ReplaceInstanceDisks(instance["name"],
681
    mode=constants.REPLACE_DISK_SEC, disks="0"))
679
  fn = _rapi_client.ReplaceInstanceDisks
680
  _WaitForRapiJob(fn(instance["name"],
681
                     mode=constants.REPLACE_DISK_AUTO, disks=[]))
682
  _WaitForRapiJob(fn(instance["name"],
683
                     mode=constants.REPLACE_DISK_SEC, disks="0"))
682 684

  
683 685

  
684 686
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)

Also available in: Unified diff