From 45f8aefcd33b7848d33ae2e8d9801925cf8365e7 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Sat, 7 Jul 2012 02:21:52 +0000 Subject: Remove VDI chain limit for snapshots. Snapshots and migrations were coded with a simplifying assumption that the maximum length of a VDI chain would be 3. Now that fast-cloning has been added, this assumption no longer holds. The goal of this patch is to remove the restriction for snapshots. A follow-on patch will remove the restriction for migrations. This patch changes the image-format for XenAPI images. Instead of naming the VHDs, 'base', 'image', and 'snap', they are now numbered staring with 0 as the leaf and going to N as the base-copy (root). Old-style images are still supported. Change-Id: Ieb073b42dc25db7cee4dfca7ff6525f7e7f46e8e --- nova/tests/xenapi/stubs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 83a17af84..ec944d84d 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -320,7 +320,7 @@ class FakeSessionForVolumeFailedTests(FakeSessionForVolumeTests): def stub_out_migration_methods(stubs): @contextlib.contextmanager def fake_snapshot_attached_here(session, instance, vm_ref, label): - yield dict(image='foo', snap='bar') + yield ['bar', 'foo'] def fake_move_disks(self, instance, disk_info): vdi_ref = fake.create_vdi(instance['name'], 'fake') -- cgit