diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-05 18:26:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-05 18:26:24 +0000 |
| commit | e883e9756c779793ca071ee3f052f5d13610a9ac (patch) | |
| tree | ee7ac5a922aa7499d417db98f0947cb24c78767b | |
| parent | 6a4c4079c04feb7f12efd137d5bf9631345fba06 (diff) | |
| parent | 2c144fccad21f60fd1e34436527c44abdba345dd (diff) | |
Merge "Pass vdi_ref to fake.create_vbd() not a string"
| -rw-r--r-- | nova/tests/test_xenapi.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 76cb9b399..e88788c70 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -758,8 +758,11 @@ class XenAPIVMTestCase(test.TestCase): session = xenapi_conn.XenAPISession('test_url', 'root', 'test_pass') vm_ref = vm_utils.lookup(session, instance.name) - xenapi_fake.create_vbd(vm_ref, "swap", userdevice=1) - xenapi_fake.create_vbd(vm_ref, "rootfs", userdevice=0) + swap_vdi_ref = xenapi_fake.create_vdi('swap', None) + root_vdi_ref = xenapi_fake.create_vdi('root', None) + + xenapi_fake.create_vbd(vm_ref, swap_vdi_ref, userdevice=1) + xenapi_fake.create_vbd(vm_ref, root_vdi_ref, userdevice=0) conn = xenapi_conn.XenAPIDriver(False) image_meta = {'id': IMAGE_VHD, |