Revision 0bbec3af lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
2704 2704
    if (self.op.pnode is not None and self.op.pnode != pnode and
2705 2705
        not self.op.force):
2706 2706
      # verify that the instance is not up
2707
      instance_info = self.rpc.call_instance_info(pnode, instance.name,
2708
                                                  instance.hypervisor)
2707
      instance_info = self.rpc.call_instance_info(
2708
          pnode, instance.name, instance.hypervisor, instance.hvparams)
2709 2709
      if instance_info.fail_msg:
2710 2710
        self.warn.append("Can't get instance runtime information: %s" %
2711 2711
                         instance_info.fail_msg)
......
2820 2820
        # either we changed auto_balance to yes or it was from before
2821 2821
        mem_check_list.extend(instance.secondary_nodes)
2822 2822
      instance_info = self.rpc.call_instance_info(
2823
          pnode, instance.name, instance.hypervisor,
2824
          cluster.hvparams[instance.hypervisor])
2823
          pnode, instance.name, instance.hypervisor, instance.hvparams)
2825 2824
      hvspecs = [(instance.hypervisor, cluster.hvparams[instance.hypervisor])]
2826 2825
      nodeinfo = self.rpc.call_node_info(mem_check_list, None,
2827 2826
                                         hvspecs, False)
......
2876 2875
                                       errors.ECODE_STATE)
2877 2876

  
2878 2877
    if self.op.runtime_mem:
2879
      remote_info = self.rpc.call_instance_info(instance.primary_node,
2880
                                                instance.name,
2881
                                                instance.hypervisor)
2878
      remote_info = self.rpc.call_instance_info(
2879
         instance.primary_node, instance.name, instance.hypervisor,
2880
         instance.hvparams)
2882 2881
      remote_info.Raise("Error checking node %s" % instance.primary_node)
2883 2882
      if not remote_info.payload: # not running already
2884 2883
        raise errors.OpPrereqError("Instance %s is not running" %

Also available in: Unified diff