Revision a295eb80 lib/cmdlib/instance_migration.py

b/lib/cmdlib/instance_migration.py
370 370 
    # check memory requirements on the secondary node
371 371 
    if (not self.cleanup and
372 372 
         (not self.failover or instance.admin_state == constants.ADMINST_UP)):
373 
      self.tgt_free_mem = CheckNodeFreeMemory(self.lu, target_node,
374 
                                              "migrating instance %s" %
375 
                                              instance.name,
376 
                                              i_be[constants.BE_MINMEM],
377 
                                              instance.hypervisor)
373 
      self.tgt_free_mem = CheckNodeFreeMemory(
374 
          self.lu, target_node, "migrating instance %s" % instance.name,
375 
          i_be[constants.BE_MINMEM], instance.hypervisor,
376 
          self.cfg.GetClusterInfo().hvparams[instance.hypervisor])
378 377 
    else:
379 378 
      self.lu.LogInfo("Not checking memory on the secondary node as"
380 379 
                      " instance will not be started")
......
654 653 
    source_node = self.source_node
655 654 

  		





  656
  655
  
    
    # Check for hypervisor version mismatch and warn the user.


  		





  
  656
  
    
    hvspecs = [(instance.hypervisor,


  		





  
  657
  
    
                self.cfg.GetClusterInfo().hvparams[instance.hypervisor])]


  		





  657
  658
  
    
    nodeinfo = self.rpc.call_node_info([source_node, target_node],


  		





  658
  
  
    
                                       None, [self.instance.hypervisor], False)


  		





  
  659
  
    
                                       None, hvspecs, False)


  		





  659
  660
  
    
    for ninfo in nodeinfo.values():


  		





  660
  661
  
    
      ninfo.Raise("Unable to retrieve node information from node '%s'" %


  		





  661
  662
  
    
                  ninfo.node)


  		












Also available in:
  Unified diff