From 92febe8e6e11d47965d7acde2931b5471edbc895 Mon Sep 17 00:00:00 2001 From: Naveed Massjouni Date: Tue, 6 Dec 2011 16:56:12 -0500 Subject: [PATCH] Renaming instance_actions.instance_id column to instance_uuid. blueprint: internal-uuids Change-Id: I204c3fd49278c509a9bc32353445ede086cfadb2 --- nova/tests/vmwareapi/db_fakes.py | 1 + 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 575109f9..c745944c 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 84d0cb87..64e7bc3f 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):