diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-02 04:36:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-02 04:36:48 +0000 |
| commit | 1c5bb9d48dd33a166f65f5ea44cc5b822980ec4f (patch) | |
| tree | 8ea4570191fc0c91bbd5fc48e8766edc97827ed0 /nova/db | |
| parent | f55182e21496dfcfc599d8075cedc428eecd33d1 (diff) | |
| parent | b860fc0254cbd6dcc9906ea516271ccd5e82215f (diff) | |
Merge "Remove unused nova.db.api:instance_get_all_by_reservation"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 5 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index d14999b45..cac96af03 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -627,11 +627,6 @@ def instance_get_all_by_host_and_not_type(context, host, type_id=None): return IMPL.instance_get_all_by_host_and_not_type(context, host, type_id) -def instance_get_all_by_reservation(context, reservation_id): - """Get all instances belonging to a reservation.""" - return IMPL.instance_get_all_by_reservation(context, reservation_id) - - def instance_get_floating_address(context, instance_id): """Get the first floating ip address of an instance.""" return IMPL.instance_get_floating_address(context, instance_id) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index fe3279b2a..6f9de94e4 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1698,13 +1698,6 @@ def instance_get_all_by_host_and_not_type(context, host, type_id=None): filter(models.Instance.instance_type_id != type_id).all() -@require_context -def instance_get_all_by_reservation(context, reservation_id): - return _instance_get_all_query(context, project_only=True).\ - filter_by(reservation_id=reservation_id).\ - all() - - # NOTE(jkoelker) This is only being left here for compat with floating # ips. Currently the network_api doesn't return floaters # in network_info. Once it starts return the model. This |