diff options
| author | Renuka Apte <renuka.apte@citrix.com> | 2012-10-09 11:38:08 -0700 |
|---|---|---|
| committer | Renuka Apte <renuka.apte@citrix.com> | 2012-10-12 14:37:46 -0700 |
| commit | a0640a73df0d88d5c3c09c08cfb389fccff96b33 (patch) | |
| tree | 4de9dc1463d70ce704a6c38a2898b19c834c2c70 /nova/tests | |
| parent | 36b85251ab15d97441422c0b85dc0eb025d2f0cf (diff) | |
xenapi: Tag volumes in boot from volume case
Fixes bug 1064134
Since https://review.openstack.org/#/c/10574, we require that all
openstack volumes are tagged, so as to distinguish them from other
disks that could be deleted on instance termination.
Change-Id: I965f88bf41d39be88f2331ad081f5cec71a65a0f
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 4720412d7..da4d8b6ad 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -358,7 +358,8 @@ class XenAPIVMTestCase(stubs.XenAPITestBase): def test_instance_snapshot_fails_with_no_primary_vdi(self): def create_bad_vbd(session, vm_ref, vdi_ref, userdevice, - vbd_type='disk', read_only=False, bootable=False): + vbd_type='disk', read_only=False, bootable=False, + osvol=False): vbd_rec = {'VM': vm_ref, 'VDI': vdi_ref, 'userdevice': 'fake', @@ -1331,7 +1332,8 @@ class XenAPIAutoDiskConfigTestCase(stubs.XenAPITestBase): self.context = context.RequestContext(self.user_id, self.project_id) def fake_create_vbd(session, vm_ref, vdi_ref, userdevice, - vbd_type='disk', read_only=False, bootable=True): + vbd_type='disk', read_only=False, bootable=True, + osvol=False): pass self.stubs.Set(vm_utils, 'create_vbd', fake_create_vbd) @@ -1423,7 +1425,8 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase): self.context = context.RequestContext(self.user_id, self.project_id) def fake_create_vbd(session, vm_ref, vdi_ref, userdevice, - vbd_type='disk', read_only=False, bootable=True): + vbd_type='disk', read_only=False, bootable=True, + osvol=False): pass self.stubs.Set(vm_utils, 'create_vbd', fake_create_vbd) |