diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-18 13:43:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-18 13:43:43 +0000 |
| commit | 086ec7a5b857fa1b88877c10991801761d819c98 (patch) | |
| tree | 1d9a0acc79e2aa536fae9eb03b4d6ea58994d46a | |
| parent | fcb9341d5f30727623fa7c77540c3aa7f4f26abf (diff) | |
| parent | f458f68bb6d39583cf7aa7b6e10054cacfcb6717 (diff) | |
| download | nova-086ec7a5b857fa1b88877c10991801761d819c98.tar.gz nova-086ec7a5b857fa1b88877c10991801761d819c98.tar.xz nova-086ec7a5b857fa1b88877c10991801761d819c98.zip | |
Merge "Session cleanup for db.security_group_rule_* methods"
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 55ef03006..25108b062 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3424,10 +3424,10 @@ def _security_group_rule_get_query(context, session=None): @require_context -def security_group_rule_get(context, security_group_rule_id, session=None): - result = _security_group_rule_get_query(context, session=session).\ - filter_by(id=security_group_rule_id).\ - first() +def security_group_rule_get(context, security_group_rule_id): + result = (_security_group_rule_get_query(context). + filter_by(id=security_group_rule_id). + first()) if not result: raise exception.SecurityGroupNotFoundForRule( @@ -3437,23 +3437,21 @@ def security_group_rule_get(context, security_group_rule_id, session=None): @require_context -def security_group_rule_get_by_security_group(context, security_group_id, - session=None): - return _security_group_rule_get_query(context, session=session).\ - filter_by(parent_group_id=security_group_id).\ +def security_group_rule_get_by_security_group(context, security_group_id): + return (_security_group_rule_get_query(context). + filter_by(parent_group_id=security_group_id). options(joinedload_all('grantee_group.instances.' - 'system_metadata')).\ - all() + 'system_metadata')). + all()) @require_context def security_group_rule_get_by_security_group_grantee(context, - security_group_id, - session=None): + security_group_id): - return _security_group_rule_get_query(context, session=session).\ - filter_by(group_id=security_group_id).\ - all() + return (_security_group_rule_get_query(context). + filter_by(group_id=security_group_id). + all()) @require_context @@ -3466,22 +3464,20 @@ def security_group_rule_create(context, values): @require_context def security_group_rule_destroy(context, security_group_rule_id): - session = get_session() - with session.begin(): - count = _security_group_rule_get_query(context, session=session).\ - filter_by(id=security_group_rule_id).\ - soft_delete() - if count == 0: - raise exception.SecurityGroupNotFoundForRule( - rule_id=security_group_rule_id) + count = (_security_group_rule_get_query(context). + filter_by(id=security_group_rule_id). + soft_delete()) + if count == 0: + raise exception.SecurityGroupNotFoundForRule( + rule_id=security_group_rule_id) @require_context def security_group_rule_count_by_group(context, security_group_id): - return model_query(context, models.SecurityGroupIngressRule, - read_deleted="no").\ - filter_by(parent_group_id=security_group_id).\ - count() + return (model_query(context, models.SecurityGroupIngressRule, + read_deleted="no"). + filter_by(parent_group_id=security_group_id). + count()) # ################### |