Renaming instance_actions.instance_id column to instance_uuid.

blueprint: internal-uuids

Change-Id: I204c3fd49278c509a9bc32353445ede086cfadb2
This commit is contained in:
Naveed Massjouni
2011-12-06 16:56:12 -05:00
parent 0fb2ca8072
commit 92febe8e6e
2 changed files with 3 additions and 3 deletions

View File

@@ -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'],

View File

@@ -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):