Revision 319856a9 lib/rpc.py
| b/lib/rpc.py | ||
|---|---|---|
| 293 | 293 |
This is a single-node call. |
| 294 | 294 |
|
| 295 | 295 |
""" |
| 296 |
c = Client("instance_start", [instance.Dumps(), extra_args])
|
|
| 296 |
c = Client("instance_start", [instance.ToDict(), extra_args])
|
|
| 297 | 297 |
c.connect(node) |
| 298 | 298 |
c.run() |
| 299 | 299 |
return c.getresult().get(node, False) |
| ... | ... | |
| 305 | 305 |
This is a single-node call. |
| 306 | 306 |
|
| 307 | 307 |
""" |
| 308 |
c = Client("instance_shutdown", [instance.Dumps()])
|
|
| 308 |
c = Client("instance_shutdown", [instance.ToDict()])
|
|
| 309 | 309 |
c.connect(node) |
| 310 | 310 |
c.run() |
| 311 | 311 |
return c.getresult().get(node, False) |
| ... | ... | |
| 317 | 317 |
This is a single-node call. |
| 318 | 318 |
|
| 319 | 319 |
""" |
| 320 |
params = [inst.Dumps(), osdev, swapdev]
|
|
| 320 |
params = [inst.ToDict(), osdev, swapdev]
|
|
| 321 | 321 |
c = Client("instance_os_add", params)
|
| 322 | 322 |
c.connect(node) |
| 323 | 323 |
c.run() |
| ... | ... | |
| 330 | 330 |
This is a single-node call. |
| 331 | 331 |
|
| 332 | 332 |
""" |
| 333 |
params = [inst.Dumps(), old_name, osdev, swapdev]
|
|
| 333 |
params = [inst.ToDict(), old_name, osdev, swapdev]
|
|
| 334 | 334 |
c = Client("instance_run_rename", params)
|
| 335 | 335 |
c.connect(node) |
| 336 | 336 |
c.run() |
| ... | ... | |
| 471 | 471 |
This is a single-node call. |
| 472 | 472 |
|
| 473 | 473 |
""" |
| 474 |
params = [bdev.Dumps(), size, on_primary, info]
|
|
| 474 |
params = [bdev.ToDict(), size, on_primary, info]
|
|
| 475 | 475 |
c = Client("blockdev_create", params)
|
| 476 | 476 |
c.connect(node) |
| 477 | 477 |
c.run() |
| ... | ... | |
| 484 | 484 |
This is a single-node call. |
| 485 | 485 |
|
| 486 | 486 |
""" |
| 487 |
c = Client("blockdev_remove", [bdev.Dumps()])
|
|
| 487 |
c = Client("blockdev_remove", [bdev.ToDict()])
|
|
| 488 | 488 |
c.connect(node) |
| 489 | 489 |
c.run() |
| 490 | 490 |
return c.getresult().get(node, False) |
| ... | ... | |
| 496 | 496 |
This is a single-node call. |
| 497 | 497 |
|
| 498 | 498 |
""" |
| 499 |
params = [disk.Dumps(), on_primary]
|
|
| 499 |
params = [disk.ToDict(), on_primary]
|
|
| 500 | 500 |
c = Client("blockdev_assemble", params)
|
| 501 | 501 |
c.connect(node) |
| 502 | 502 |
c.run() |
| ... | ... | |
| 509 | 509 |
This is a single-node call. |
| 510 | 510 |
|
| 511 | 511 |
""" |
| 512 |
c = Client("blockdev_shutdown", [disk.Dumps()])
|
|
| 512 |
c = Client("blockdev_shutdown", [disk.ToDict()])
|
|
| 513 | 513 |
c.connect(node) |
| 514 | 514 |
c.run() |
| 515 | 515 |
return c.getresult().get(node, False) |
| ... | ... | |
| 521 | 521 |
This is a single-node call. |
| 522 | 522 |
|
| 523 | 523 |
""" |
| 524 |
params = [bdev.Dumps(), ndev.Dumps()]
|
|
| 524 |
params = [bdev.ToDict(), ndev.ToDict()]
|
|
| 525 | 525 |
c = Client("blockdev_addchild", params)
|
| 526 | 526 |
c.connect(node) |
| 527 | 527 |
c.run() |
| ... | ... | |
| 534 | 534 |
This is a single-node call. |
| 535 | 535 |
|
| 536 | 536 |
""" |
| 537 |
params = [bdev.Dumps(), ndev.Dumps()]
|
|
| 537 |
params = [bdev.ToDict(), ndev.ToDict()]
|
|
| 538 | 538 |
c = Client("blockdev_removechild", params)
|
| 539 | 539 |
c.connect(node) |
| 540 | 540 |
c.run() |
| ... | ... | |
| 547 | 547 |
This is a single-node call. |
| 548 | 548 |
|
| 549 | 549 |
""" |
| 550 |
params = [dsk.Dumps() for dsk in disks]
|
|
| 550 |
params = [dsk.ToDict() for dsk in disks]
|
|
| 551 | 551 |
c = Client("blockdev_getmirrorstatus", params)
|
| 552 | 552 |
c.connect(node) |
| 553 | 553 |
c.run() |
| ... | ... | |
| 560 | 560 |
This is a single-node call. |
| 561 | 561 |
|
| 562 | 562 |
""" |
| 563 |
c = Client("blockdev_find", [disk.Dumps()])
|
|
| 563 |
c = Client("blockdev_find", [disk.ToDict()])
|
|
| 564 | 564 |
c.connect(node) |
| 565 | 565 |
c.run() |
| 566 | 566 |
return c.getresult().get(node, False) |
| ... | ... | |
| 605 | 605 |
if result[node_name]: |
| 606 | 606 |
for data in result[node_name]: |
| 607 | 607 |
if data: |
| 608 |
if isinstance(data, basestring):
|
|
| 609 |
nr.append(objects.ConfigObject.Loads(data))
|
|
| 608 |
if isinstance(data, dict):
|
|
| 609 |
nr.append(objects.OS.FromDict(data))
|
|
| 610 | 610 |
elif isinstance(data, tuple) and len(data) == 2: |
| 611 | 611 |
nr.append(errors.InvalidOS(data[0], data[1])) |
| 612 | 612 |
else: |
| ... | ... | |
| 629 | 629 |
new_result = {}
|
| 630 | 630 |
for node_name in result: |
| 631 | 631 |
data = result[node_name] |
| 632 |
if isinstance(data, basestring):
|
|
| 633 |
new_result[node_name] = objects.ConfigObject.Loads(data)
|
|
| 632 |
if isinstance(data, dict):
|
|
| 633 |
new_result[node_name] = objects.OS.FromDict(data)
|
|
| 634 | 634 |
elif isinstance(data, tuple) and len(data) == 2: |
| 635 | 635 |
new_result[node_name] = errors.InvalidOS(data[0], data[1]) |
| 636 | 636 |
else: |
| ... | ... | |
| 662 | 662 |
This is a single-node call. |
| 663 | 663 |
|
| 664 | 664 |
""" |
| 665 |
c = Client("blockdev_snapshot", [cf_bdev.Dumps()])
|
|
| 665 |
c = Client("blockdev_snapshot", [cf_bdev.ToDict()])
|
|
| 666 | 666 |
c.connect(node) |
| 667 | 667 |
c.run() |
| 668 | 668 |
return c.getresult().get(node, False) |
| ... | ... | |
| 674 | 674 |
This is a single-node call. |
| 675 | 675 |
|
| 676 | 676 |
""" |
| 677 |
params = [snap_bdev.Dumps(), dest_node, instance.Dumps()]
|
|
| 677 |
params = [snap_bdev.ToDict(), dest_node, instance.ToDict()]
|
|
| 678 | 678 |
c = Client("snapshot_export", params)
|
| 679 | 679 |
c.connect(node) |
| 680 | 680 |
c.run() |
| ... | ... | |
| 691 | 691 |
""" |
| 692 | 692 |
flat_disks = [] |
| 693 | 693 |
for disk in snap_disks: |
| 694 |
flat_disks.append(disk.Dumps())
|
|
| 695 |
params = [instance.Dumps(), flat_disks]
|
|
| 694 |
flat_disks.append(disk.ToDict())
|
|
| 695 |
params = [instance.ToDict(), flat_disks]
|
|
| 696 | 696 |
c = Client("finalize_export", params)
|
| 697 | 697 |
c.connect(node) |
| 698 | 698 |
c.run() |
| ... | ... | |
| 720 | 720 |
This is a single-node call. |
| 721 | 721 |
|
| 722 | 722 |
""" |
| 723 |
params = [inst.Dumps(), osdev, swapdev, src_node, src_image]
|
|
| 723 |
params = [inst.ToDict(), osdev, swapdev, src_node, src_image]
|
|
| 724 | 724 |
c = Client("instance_os_import", params)
|
| 725 | 725 |
c.connect(node) |
| 726 | 726 |
c.run() |
Also available in: Unified diff