diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-13 21:58:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-13 21:58:30 +0000 |
| commit | fd9e0e92af785d1e48ce42ce7eb4501595aabe3c (patch) | |
| tree | 9504a0a1598e657d6dcaee136b6932bf821ab624 /nova/tests | |
| parent | 9737f407e338ce7154a2acd493405426a7e33076 (diff) | |
| parent | 88b1d7739b5d0fabc613f85f64741321f67bf719 (diff) | |
Merge "Renaming instance_actions.instance_id column to instance_uuid. blueprint: internal-uuids"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/vmwareapi/db_fakes.py | 1 | ||||
| -rw-r--r-- | nova/tests/xenapi/stubs.py | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py index 575109f90..c745944c7 100644 --- a/nova/tests/vmwareapi/db_fakes.py +++ b/nova/tests/vmwareapi/db_fakes.py @@ -62,6 +62,7 @@ def stub_out_db_instance_api(stubs): base_options = {
'name': values['name'],
'id': values['id'],
+ 'uuid': utils.gen_uuid(),
'reservation_id': utils.generate_uid('r'),
'image_ref': values['image_ref'],
'kernel_id': values['kernel_id'],
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 84d0cb878..64e7bc3fc 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -35,12 +35,11 @@ def stubout_instance_snapshot(stubs): stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image) - def fake_wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref, - original_parent_uuid): + def fake_wait_for_vhd_coalesce(*args): #TODO(sirp): Should we actually fake out the data here return "fakeparent" - stubs.Set(vm_utils, 'wait_for_vhd_coalesce', fake_wait_for_vhd_coalesce) + stubs.Set(vm_utils, '_wait_for_vhd_coalesce', fake_wait_for_vhd_coalesce) def stubout_session(stubs, cls, product_version=None): |