Revision e431074f test/ganeti.query_unittest.py

b/test/ganeti.query_unittest.py
539 539
        nics=[objects.NIC(ip="192.0.2.99", nicparams={})]),
540 540
      ]
541 541

  
542
    iqd = query.InstanceQueryData(instances, cluster, None, [], [], {})
542
    iqd = query.InstanceQueryData(instances, cluster, None, [], [], {}, set())
543 543
    self.assertEqual(q.Query(iqd),
544 544
      [[(constants.RS_NORMAL, "inst1"),
545 545
        (constants.RS_NORMAL, 128),
......
694 694
        "memory": 768,
695 695
        },
696 696
      }
697
    wrongnode_inst = set("inst2")
697 698

  
698 699
    iqd = query.InstanceQueryData(instances, cluster, disk_usage,
699
                                  offline_nodes, bad_nodes, live_data)
700
                                  offline_nodes, bad_nodes, live_data,
701
                                  wrongnode_inst)
700 702
    result = q.Query(iqd)
701 703
    self.assertEqual(len(result), len(instances))
702 704
    self.assert_(compat.all(len(row) == len(selected)
......
718 720
      elif inst.primary_node in bad_nodes:
719 721
        exp_status = "ERROR_nodedown"
720 722
      elif inst.name in live_data:
721
        if inst.admin_up:
723
        if inst.name in wrongnode_inst:
724
          exp_status = "ERROR_wrongnode"
725
        elif inst.admin_up:
722 726
          exp_status = "running"
723 727
        else:
724 728
          exp_status = "ERROR_up"

Also available in: Unified diff