diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 16:39:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 16:39:29 +0000 |
| commit | dfeebca5a8d2f03d918928522f2ce8b66ec056c9 (patch) | |
| tree | 60cd291f7a9bb1c6cc06224418cdb91957ad83eb | |
| parent | 02ec8d997a756824691e650d1dad01a10d2de365 (diff) | |
| parent | 40a84de65ae870c363587b3cacb1c1308eee069e (diff) | |
Merge "Xen: VHD sequence validation should handle swap."
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py index bd9286658..37de1ecff 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py @@ -219,6 +219,9 @@ def _validate_sequenced_vhds(staging_path): if not filename.endswith('.vhd'): continue + if filename == "swap.vhd": + continue + vhd_path = os.path.join(staging_path, "%d.vhd" % seq_num) if not os.path.exists(vhd_path): raise Exception("Corrupt image. Expected seq number: %d. Files: %s" |