summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-02-14 17:31:20 -0600
committerCerberus <matt.dietz@rackspace.com>2011-02-14 17:31:20 -0600
commite44a91ced3d19a3bca10457239592307bf6f829b (patch)
tree94a51e1cde97a087a99cc5e90c074caf43afe537 /plugins
parent0bd48e3d53c6fce04b0c5e483537b3fd31c7364a (diff)
downloadnova-e44a91ced3d19a3bca10457239592307bf6f829b.tar.gz
nova-e44a91ced3d19a3bca10457239592307bf6f829b.tar.xz
nova-e44a91ced3d19a3bca10457239592307bf6f829b.zip
bad plugin
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/migration6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index c68fc93c5..c1f5b7528 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -65,7 +65,7 @@ def find_sr(session):
def move_vhds_into_sr(session, args):
"""Moves the VHDs from their copied location to the SR"""
- params = pickle.dumps(args)
+ params = pickle.loads(exists(args, 'params'))
instance_id = params['instance_id']
new_base_copy_uuid = params['new_base_copy_uuid']
@@ -102,7 +102,7 @@ def move_vhds_into_sr(session, args):
def transfer_vhd(session, args):
"""Rsyncs a VHD to an adjacent host"""
- params = pickle.dumps(args)
+ params = pickle.loads(exists(args, 'params'))
instance_id = params['instance_id']
host = params['host']
vdi_uuid = params['vdi_uuid']
@@ -121,4 +121,4 @@ def transfer_vhd(session, args):
if __name__ == '__main__':
XenAPIPlugin.dispatch({'transfer_vhd': transfer_vhd,
- 'move_vhd_into_sr':move_vhd_into_sr, })
+ 'move_vhds_into_sr':move_vhds_into_sr, })