summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2013-02-18 23:49:47 +0000
committerJoe Gordon <jogo@cloudscaling.com>2013-02-18 23:50:29 +0000
commit0d417fa7359799ec11bb64de2be4d31b8f3ce2e0 (patch)
tree17ab46153a2a12ba36532aa2e3e02741004f250c
parentb23c557cc8d03028caba95777f98adfe9b1031d9 (diff)
downloadnova-0d417fa7359799ec11bb64de2be4d31b8f3ce2e0.tar.gz
nova-0d417fa7359799ec11bb64de2be4d31b8f3ce2e0.tar.xz
nova-0d417fa7359799ec11bb64de2be4d31b8f3ce2e0.zip
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
-rw-r--r--nova/db/sqlalchemy/api.py59
1 files changed, 0 insertions, 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
@@ -3788,20 +3788,6 @@ def instance_metadata_delete(context, instance_uuid, key):
@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):
all_keys = metadata.keys()
@@ -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):
@@ -4065,20 +4037,6 @@ def instance_type_extra_specs_delete(context, flavor_id, key):
@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
# UniqueConstraint on (instance_type_id, key, deleted) to
@@ -4427,23 +4385,6 @@ def aggregate_metadata_delete(context, aggregate_id, 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):
# NOTE(boris-42): There is a race condition in this method. We should add
# UniqueConstraint on (start_period, uuid, mac, deleted) to