diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-11 22:46:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-11 22:46:20 +0000 |
| commit | 0dc8632659bf707e70fdf822e046d9c1482d833e (patch) | |
| tree | 91a9a9c07d59f2ae8f2c4a710a7e1b28bb51ac33 /nova/db | |
| parent | 2dd6adac8304547fbb2d80b1c4ef659e53048cf9 (diff) | |
| parent | a381df91b46582528685d4695019a5e18f5f702a (diff) | |
Merge "Refactors get_instance_security_groups to only use instance_uuid"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 7ecf6dfc0..a0451dcc7 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -1167,9 +1167,9 @@ def security_group_get_by_project(context, project_id): return IMPL.security_group_get_by_project(context, project_id) -def security_group_get_by_instance(context, instance_id): +def security_group_get_by_instance(context, instance_uuid): """Get security groups to which the instance is assigned.""" - return IMPL.security_group_get_by_instance(context, instance_id) + return IMPL.security_group_get_by_instance(context, instance_uuid) def security_group_exists(context, project_id, group_name): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index d27f4e695..e0807b64a 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3304,10 +3304,10 @@ def security_group_get_by_project(context, project_id): @require_context -def security_group_get_by_instance(context, instance_id): +def security_group_get_by_instance(context, instance_uuid): return _security_group_get_query(context, read_deleted="no").\ join(models.SecurityGroup.instances).\ - filter_by(id=instance_id).\ + filter_by(uuid=instance_uuid).\ all() |