From 0d417fa7359799ec11bb64de2be4d31b8f3ce2e0 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Mon, 18 Feb 2013 23:49:47 +0000
Subject: Remove unused db calls from nova.db.sqlalchemy.api

*  instance_metadata_get_item
*  _instance_system_metadata_get_item
*  instance_type_extra_specs_get_item
*  aggregate_metadata_get_item

Change-Id: If25db80f2fc2da1d26fd5588a5c24131fe05d24e
---
 nova/db/sqlalchemy/api.py | 59 -----------------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 375a3884b..2e980016b 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3787,20 +3787,6 @@ def instance_metadata_delete(context, instance_uuid, key):
         soft_delete()
 
 
-@require_context
-def instance_metadata_get_item(context, instance_uuid, key, session=None):
-    result = _instance_metadata_get_query(
-                            context, instance_uuid, session=session).\
-                    filter_by(key=key).\
-                    first()
-
-    if not result:
-        raise exception.InstanceMetadataNotFound(metadata_key=key,
-                                                 instance_uuid=instance_uuid)
-
-    return result
-
-
 @require_context
 def instance_metadata_update(context, instance_uuid, metadata, delete,
                              session=None):
@@ -3858,20 +3844,6 @@ def instance_system_metadata_get(context, instance_uuid, session=None):
     return result
 
 
-def _instance_system_metadata_get_item(context, instance_uuid, key,
-                                       session=None):
-    result = _instance_system_metadata_get_query(
-                            context, instance_uuid, session=session).\
-                    filter_by(key=key).\
-                    first()
-
-    if not result:
-        raise exception.InstanceSystemMetadataNotFound(
-                metadata_key=key, instance_uuid=instance_uuid)
-
-    return result
-
-
 @require_context
 def instance_system_metadata_update(context, instance_uuid, metadata, delete,
                                     session=None):
@@ -4064,20 +4036,6 @@ def instance_type_extra_specs_delete(context, flavor_id, key):
         soft_delete(synchronize_session=False)
 
 
-@require_context
-def instance_type_extra_specs_get_item(context, flavor_id, key,
-                                       session=None):
-    result = _instance_type_extra_specs_get_query(
-                            context, flavor_id, session=session).\
-                    filter(models.InstanceTypeExtraSpecs.key == key).\
-                    first()
-    if not result:
-        raise exception.InstanceTypeExtraSpecsNotFound(
-                extra_specs_key=key, instance_type_id=flavor_id)
-
-    return result
-
-
 @require_context
 def instance_type_extra_specs_update_or_create(context, flavor_id, specs):
     # NOTE(boris-42): There is a race condition in this method. We should add
@@ -4425,23 +4383,6 @@ def aggregate_metadata_delete(context, aggregate_id, key):
                                                   metadata_key=key)
 
 
-@require_admin_context
-@require_aggregate_exists
-def aggregate_metadata_get_item(context, aggregate_id, key, session=None):
-    result = _aggregate_get_query(context,
-                                  models.AggregateMetadata,
-                                  models.AggregateMetadata.aggregate_id,
-                                  aggregate_id, session=session,
-                                  read_deleted='yes').\
-                                  filter_by(key=key).first()
-
-    if not result:
-        raise exception.AggregateMetadataNotFound(metadata_key=key,
-                                                 aggregate_id=aggregate_id)
-
-    return result
-
-
 @require_admin_context
 @require_aggregate_exists
 def aggregate_metadata_add(context, aggregate_id, metadata, set_delete=False):
-- 
cgit