diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-15 13:32:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-15 13:32:49 +0000 |
| commit | fa0498bd246b5e97b8a9b18f33a8d16ce08e2f8a (patch) | |
| tree | ff4cab48e57b1224d133ce4e11f6b1aaccf21440 /plugins | |
| parent | 6cab9c3d1c5b31284c3da5f531ab879bd27e3496 (diff) | |
| parent | 0a93b563e975e1815922852c2eacb32caa8faaf2 (diff) | |
Merge "Harmonize PEP8 checking between tox and run_tests.sh"
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel | 2 | ||||
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/migration | 4 | ||||
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel b/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel index 9ce6902d7..32e253cde 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel @@ -116,7 +116,7 @@ def _remove_file(filepath): def remove_kernel_ramdisk(session, args): - """Removes kernel and/or ramdisk from dom0's file system""" + """Removes kernel and/or ramdisk from dom0's file system.""" kernel_file = optional(args, 'kernel-file') ramdisk_file = optional(args, 'ramdisk-file') if kernel_file: diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration index b9e9da2e2..4b6bf8811 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration @@ -25,7 +25,7 @@ configure_logging('migration') def move_vhds_into_sr(session, instance_uuid, sr_path, uuid_stack): - """Moves the VHDs from their copied location to the SR""" + """Moves the VHDs from their copied location to the SR.""" staging_path = "/images/instance%s" % instance_uuid imported_vhds = utils.import_vhds(sr_path, staging_path, uuid_stack) utils.cleanup_staging_area(staging_path) @@ -47,7 +47,7 @@ def _rsync_vhds(instance_uuid, host, staging_path, user="root"): def transfer_vhd(session, instance_uuid, host, vdi_uuid, sr_path, seq_num): - """Rsyncs a VHD to an adjacent host""" + """Rsyncs a VHD to an adjacent host.""" staging_path = utils.make_staging_area(sr_path) try: utils.prepare_staging_area( diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost index 4d2193908..0319af4d2 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost @@ -33,9 +33,9 @@ import subprocess import tempfile import time +import pluginlib_nova as pluginlib import XenAPI import XenAPIPlugin -import pluginlib_nova as pluginlib pluginlib.configure_logging("xenhost") |