From 47fe319f6ef54e7089341021e4cf077b3a489fb4 Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Fri, 16 Nov 2012 10:50:20 +1100 Subject: Make ec2_instance_create db method consistant across db apis Fixes bug 1079463 Also changes call to ec2_instance_create in sqlalchemy instance_create method to go through db api as opposed to direct to sqlalchemy api. Change-Id: I60136a2c7019bda25225d8e02e82a9ccfbb61e2f --- nova/db/api.py | 4 ++-- nova/db/sqlalchemy/api.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/db/api.py b/nova/db/api.py index 51d6dc6ab..0ad70d1e9 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1537,9 +1537,9 @@ def get_instance_uuid_by_ec2_id(context, ec2_id): return IMPL.get_instance_uuid_by_ec2_id(context, ec2_id) -def ec2_instance_create(context, instance_ec2_id): +def ec2_instance_create(context, instance_uuid, id=None): """Create the ec2 id to instance uuid mapping on demand""" - return IMPL.ec2_instance_create(context, instance_ec2_id) + return IMPL.ec2_instance_create(context, instance_uuid, id) #################### diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index eb1247e7d..61a705b9c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1398,7 +1398,7 @@ def instance_create(context, values): instance_ref.instance_type # create the instance uuid to ec2_id mapping entry for instance - ec2_instance_create(context, instance_ref['uuid']) + db.ec2_instance_create(context, instance_ref['uuid']) return instance_ref -- cgit