Revision 9c8f7bf4 lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
2809 2809
    assert self.op.instance_name in self.owned_locks(locking.LEVEL_INSTANCE)
2810 2810
    self.instance = self.cfg.GetInstanceInfo(self.op.instance_uuid)
2811 2811
    self.cluster = self.cfg.GetClusterInfo()
2812
    cluster_hvparams = self.cluster.hvparams[self.instance.hypervisor]
2812 2813

  
2813 2814
    assert self.instance is not None, \
2814 2815
      "Cannot retrieve locked instance %s" % self.op.instance_name
......
2822 2823
      # verify that the instance is not up
2823 2824
      instance_info = self.rpc.call_instance_info(
2824 2825
          pnode_uuid, self.instance.name, self.instance.hypervisor,
2825
          self.instance.hvparams)
2826
          cluster_hvparams)
2826 2827
      if instance_info.fail_msg:
2827 2828
        self.warn.append("Can't get instance runtime information: %s" %
2828 2829
                         instance_info.fail_msg)
......
2941 2942
        mem_check_list.extend(self.instance.secondary_nodes)
2942 2943
      instance_info = self.rpc.call_instance_info(
2943 2944
          pnode_uuid, self.instance.name, self.instance.hypervisor,
2944
          self.instance.hvparams)
2945
          cluster_hvparams)
2945 2946
      hvspecs = [(self.instance.hypervisor,
2946
                  self.cluster.hvparams[self.instance.hypervisor])]
2947
                  cluster_hvparams)]
2947 2948
      nodeinfo = self.rpc.call_node_info(mem_check_list, None,
2948 2949
                                         hvspecs)
2949 2950
      pninfo = nodeinfo[pnode_uuid]
......
3004 3005
      remote_info = self.rpc.call_instance_info(
3005 3006
         self.instance.primary_node, self.instance.name,
3006 3007
         self.instance.hypervisor,
3007
         self.cluster.hvparams[self.instance.hypervisor])
3008
         cluster_hvparams)
3008 3009
      remote_info.Raise("Error checking node %s" %
3009 3010
                        self.cfg.GetNodeName(self.instance.primary_node))
3010 3011
      if not remote_info.payload: # not running already

Also available in: Unified diff