Revision 62c9ec92 lib/rpc.py
b/lib/rpc.py | ||
---|---|---|
346 | 346 |
return c.getresult().get(node, False) |
347 | 347 |
|
348 | 348 |
|
349 |
def call_node_verify(node_list, checkdict): |
|
349 |
def call_node_verify(node_list, checkdict, cluster_name):
|
|
350 | 350 |
"""Request verification of given parameters. |
351 | 351 |
|
352 | 352 |
This is a multi-node call. |
353 | 353 |
|
354 | 354 |
""" |
355 |
c = Client("node_verify", [checkdict]) |
|
355 |
c = Client("node_verify", [checkdict, cluster_name])
|
|
356 | 356 |
c.connect_list(node_list) |
357 | 357 |
c.run() |
358 | 358 |
return c.getresult() |
... | ... | |
652 | 652 |
return c.getresult().get(node, False) |
653 | 653 |
|
654 | 654 |
|
655 |
def call_snapshot_export(node, snap_bdev, dest_node, instance): |
|
655 |
def call_snapshot_export(node, snap_bdev, dest_node, instance, cluster_name):
|
|
656 | 656 |
"""Request the export of a given snapshot. |
657 | 657 |
|
658 | 658 |
This is a single-node call. |
659 | 659 |
|
660 | 660 |
""" |
661 |
params = [snap_bdev.ToDict(), dest_node, instance.ToDict()] |
|
661 |
params = [snap_bdev.ToDict(), dest_node, instance.ToDict(), cluster_name]
|
|
662 | 662 |
c = Client("snapshot_export", params) |
663 | 663 |
c.connect(node) |
664 | 664 |
c.run() |
... | ... | |
698 | 698 |
return objects.SerializableConfigParser.Loads(str(result)) |
699 | 699 |
|
700 | 700 |
|
701 |
def call_instance_os_import(node, inst, osdev, swapdev, src_node, src_image): |
|
701 |
def call_instance_os_import(node, inst, osdev, swapdev, |
|
702 |
src_node, src_image, cluster_name): |
|
702 | 703 |
"""Request the import of a backup into an instance. |
703 | 704 |
|
704 | 705 |
This is a single-node call. |
705 | 706 |
|
706 | 707 |
""" |
707 |
params = [inst.ToDict(), osdev, swapdev, src_node, src_image] |
|
708 |
params = [inst.ToDict(), osdev, swapdev, src_node, src_image, cluster_name]
|
|
708 | 709 |
c = Client("instance_os_import", params) |
709 | 710 |
c.connect(node) |
710 | 711 |
c.run() |
Also available in: Unified diff