From bd9fb0aed8b0c1a0090772b79f1dba1811db56f9 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 25 Jun 2012 22:59:31 -0700
Subject: [PATCH] Fix db calls for snaphsot and volume mapping

 * Fix misuse of project_only
 * Includes failing tests
 * Adds missing call to db/api.py
 * Fixes bug 1017816

Change-Id: I993089ba031a05e7ab0ea91c279a2ac47593eda3
---
 nova/db/api.py            |  5 +++++
 nova/db/sqlalchemy/api.py | 26 ++++++++------------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/nova/db/api.py b/nova/db/api.py
index e0d150506..c978f3da8 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1154,6 +1154,11 @@ def get_snapshot_uuid_by_ec2_id(context, ec2_id):
 def get_ec2_snapshot_id_by_uuid(context, snapshot_id):
     return IMPL.get_ec2_snapshot_id_by_uuid(context, snapshot_id)
 
+
+def ec2_snapshot_create(context, snapshot_id, forced_id=None):
+    return IMPL.ec2_snapshot_create(context, snapshot_id, forced_id)
+
+
 ####################
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index eabd03a22..6e82668c6 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2928,15 +2928,13 @@ def _volume_get_query(context, session=None, project_only=False):
 
 
 @require_context
-def _ec2_volume_get_query(context, session=None, project_only=False):
-    return model_query(context, models.VolumeIdMapping, session=session,
-                       project_only=project_only)
+def _ec2_volume_get_query(context, session=None):
+    return model_query(context, models.VolumeIdMapping, session=session)
 
 
 @require_context
-def _ec2_snapshot_get_query(context, session=None, project_only=False):
-    return model_query(context, models.SnapshotIdMapping, session=session,
-                       project_only=project_only)
+def _ec2_snapshot_get_query(context, session=None):
+    return model_query(context, models.SnapshotIdMapping, session=session)
 
 
 @require_context
@@ -3025,9 +3023,7 @@ def ec2_volume_create(context, volume_uuid, id=None):
 
 @require_context
 def get_ec2_volume_id_by_uuid(context, volume_id, session=None):
-    result = _ec2_volume_get_query(context,
-                                   session=session,
-                                   project_only=True).\
+    result = _ec2_volume_get_query(context, session=session).\
                     filter_by(uuid=volume_id).\
                     first()
 
@@ -3039,9 +3035,7 @@ def get_ec2_volume_id_by_uuid(context, volume_id, session=None):
 
 @require_context
 def get_volume_uuid_by_ec2_id(context, ec2_id, session=None):
-    result = _ec2_volume_get_query(context,
-                                   session=session,
-                                   project_only=True).\
+    result = _ec2_volume_get_query(context, session=session).\
                     filter_by(id=ec2_id).\
                     first()
 
@@ -3066,9 +3060,7 @@ def ec2_snapshot_create(context, snapshot_uuid, id=None):
 
 @require_context
 def get_ec2_snapshot_id_by_uuid(context, snapshot_id, session=None):
-    result = _ec2_snapshot_get_query(context,
-                                   session=session,
-                                   project_only=True).\
+    result = _ec2_snapshot_get_query(context, session=session).\
                     filter_by(uuid=snapshot_id).\
                     first()
 
@@ -3080,9 +3072,7 @@ def get_ec2_snapshot_id_by_uuid(context, snapshot_id, session=None):
 
 @require_context
 def get_snapshot_uuid_by_ec2_id(context, ec2_id, session=None):
-    result = _ec2_snapshot_get_query(context,
-                                   session=session,
-                                   project_only=True).\
+    result = _ec2_snapshot_get_query(context, session=session).\
                     filter_by(id=ec2_id).\
                     first()