x/gantt
Code Issues Proposed changes

Merge "xenapi: Tag volumes in boot from volume case"

Browse Source
This commit is contained in:
Jenkins
2012-10-24 23:21:12 +00:00
committed by Gerrit Code Review
parent 5d1ee55a65 86e222cffe
commit bbc06a5d95
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_xenapi.py
View File

@@ -362,7 +362,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',
@@ -1335,7 +1336,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)
@@ -1427,7 +1429,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)