summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-02-16 23:39:12 +0000
committerRick Harris <rick.harris@rackspace.com>2011-02-16 23:39:12 +0000
commitc56b1814cfae7a9c814b2d37388aff5e772771b6 (patch)
tree6490ad8f26e7724b30c2558e258ffda86c19a706 /plugins
parent28a38e0dc00a7a7695bfec6f33a365ac2ab2106d (diff)
Pep8 fixes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index f737c6c41..c3f793ddd 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -300,7 +300,7 @@ def _assert_process_success(proc, cmd):
return out, err
-def download_image(session, args):
+def download_vhd(session, args):
"""Download an image from Glance, unbundle it, and then deposit the VHDs
into the storage repository
"""
@@ -321,7 +321,7 @@ def download_image(session, args):
_cleanup_staging_area(staging_path)
-def upload_image(session, args):
+def upload_vhd(session, args):
"""Bundle the VHDs comprising an image and then stream them into Glance.
"""
params = pickle.loads(exists(args, 'params'))
@@ -365,7 +365,7 @@ def remove_kernel_ramdisk(session, args):
if __name__ == '__main__':
- XenAPIPlugin.dispatch({'upload_image': upload_image,
- 'download_image': download_image,
+ XenAPIPlugin.dispatch({'upload_vhd': upload_vhd,
+ 'download_vhd': download_vhd,
'copy_kernel_vdi': copy_kernel_vdi,
'remove_kernel_ramdisk': remove_kernel_ramdisk})