diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-05-26 20:01:09 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-05-26 20:01:09 +0000 |
| commit | 9e22f51c80cc5f7f5ea60b5b8bb779779a19667c (patch) | |
| tree | aead621aff00fce53716240d28f31d8373ca1c33 /plugins | |
| parent | 04785db717492c8ba7c2d184924b3773ec944f4c (diff) | |
| download | nova-9e22f51c80cc5f7f5ea60b5b8bb779779a19667c.tar.gz nova-9e22f51c80cc5f7f5ea60b5b8bb779779a19667c.tar.xz nova-9e22f51c80cc5f7f5ea60b5b8bb779779a19667c.zip | |
put back the hidden assert check i accidentally removed from glance plugin
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index fef31a9ff..0c00d168b 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -210,11 +210,13 @@ def _import_vhds(sr_path, staging_path, uuid_stack): # We return this snap as the VDI instead of image.vhd vdi_return_list.append(dict(vdi_type="os", vdi_uuid=snap_info[1])) else: + assert_vhd_not_hidden(image_info[0]) # If there's no snap, we return the image.vhd UUID vdi_return_list.append(dict(vdi_type="os", vdi_uuid=image_info[1])) swap_info = prepare_if_exists(staging_path, 'swap.vhd') if swap_info: + assert_vhd_not_hidden(swap_info[0]) paths_to_move.append(swap_info[0]) vdi_return_list.append(dict(vdi_type="swap", vdi_uuid=swap_info[1])) |