Revision f56ab6d1

b/lib/backend.py
2439 2439
  return result
2440 2440

  
2441 2441

  
2442
def BlockdevExport(disk, dest_node, dest_path, cluster_name):
2442
def BlockdevExport(disk, dest_node_ip, dest_path, cluster_name):
2443 2443
  """Export a block device to a remote node.
2444 2444

  
2445 2445
  @type disk: L{objects.Disk}
2446 2446
  @param disk: the description of the disk to export
2447
  @type dest_node: str
2448
  @param dest_node: the destination node to export to
2447
  @type dest_node_ip: str
2448
  @param dest_node_ip: the destination node IP to export to
2449 2449
  @type dest_path: str
2450 2450
  @param dest_path: the destination path on the target node
2451 2451
  @type cluster_name: str
......
2469 2469
  destcmd = utils.BuildShellCmd("dd of=%s conv=nocreat,notrunc bs=65536"
2470 2470
                                " oflag=dsync", dest_path)
2471 2471

  
2472
  remotecmd = _GetSshRunner(cluster_name).BuildCmd(dest_node,
2472
  remotecmd = _GetSshRunner(cluster_name).BuildCmd(dest_node_ip,
2473 2473
                                                   constants.SSH_LOGIN_USER,
2474 2474
                                                   destcmd)
2475 2475

  
b/lib/cmdlib/instance.py
1821 1821
      dev_path = result.payload
1822 1822
      result = self.rpc.call_blockdev_export(source_node.uuid, (disk,
1823 1823
                                                                self.instance),
1824
                                             target_node.name, dev_path,
1825
                                             cluster_name)
1824
                                             target_node.secondary_ip,
1825
                                             dev_path, cluster_name)
1826 1826
      if result.fail_msg:
1827 1827
        self.LogWarning("Can't copy data over for disk %d: %s",
1828 1828
                        idx, result.fail_msg)
b/lib/rpc_defs.py
419 419
   " given amount"),
420 420
  ("blockdev_export", SINGLE, None, constants.RPC_TMO_1DAY, [
421 421
    ("cf_bdev", ED_SINGLE_DISK_DICT_DP, None),
422
    ("dest_node", None, None),
422
    ("dest_node_ip", None, None),
423 423
    ("dest_path", None, None),
424 424
    ("cluster_name", None, None),
425 425
    ], None, None, "Export a given disk to another node"),
b/lib/server/noded.py
393 393

  
394 394
    """
395 395
    disk = objects.Disk.FromDict(params[0])
396
    dest_node, dest_path, cluster_name = params[1:]
397
    return backend.BlockdevExport(disk, dest_node, dest_path, cluster_name)
396
    dest_node_ip, dest_path, cluster_name = params[1:]
397
    return backend.BlockdevExport(disk, dest_node_ip, dest_path, cluster_name)
398 398

  
399 399
  @staticmethod
400 400
  def perspective_blockdev_setinfo(params):

Also available in: Unified diff