diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 10:12:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 10:12:09 +0000 |
| commit | 399bfa66b77c7a423a123066aad48e691653a3dc (patch) | |
| tree | 4c118742ddce4d9799d930604bd12afe39adbb1a | |
| parent | 9a0d70f854de928d2a394c5203b0ee4991ae0b83 (diff) | |
| parent | 0d417fa7359799ec11bb64de2be4d31b8f3ce2e0 (diff) | |
| download | nova-399bfa66b77c7a423a123066aad48e691653a3dc.tar.gz nova-399bfa66b77c7a423a123066aad48e691653a3dc.tar.xz nova-399bfa66b77c7a423a123066aad48e691653a3dc.zip | |
Merge "Remove unused db calls from nova.db.sqlalchemy.api"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 582d10593..43c2d960f 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3769,20 +3769,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() @@ -3839,20 +3825,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): @@ -4046,20 +4018,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 @@ -4408,23 +4366,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 |