openstack/nova
Code Issues Proposed changes

Merge "Add _security_group_ensure_default() DBAPI method" into stable/icehouse

Browse Source
This commit is contained in:
Jenkins
2015-02-10 14:09:20 +00:00
committed by Gerrit Code Review
parent 0a6d029deb f78165661e
commit 38ae3ac7c2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/db/sqlalchemy/api.py
View File

@@ -1610,7 +1610,7 @@ def instance_create(context, values):
def _get_sec_group_models(session, security_groups): def _get_sec_group_models(session, security_groups):
models = [] models = []
default_group = security_group_ensure_default(context) default_group = _security_group_ensure_default(context, session)
if 'default' in security_groups: if 'default' in security_groups:
models.append(default_group) models.append(default_group)
# Generate a new list, so we don't modify the original # Generate a new list, so we don't modify the original
@@ -3750,8 +3750,15 @@ def security_group_update(context, security_group_id, values,
def security_group_ensure_default(context): def security_group_ensure_default(context):
"""Ensure default security group exists for a project_id.""" """Ensure default security group exists for a project_id."""
session = get_session()
with session.begin(): return _security_group_ensure_default(context)
def _security_group_ensure_default(context, session=None):
if session is None:
session = get_session()
with session.begin(subtransactions=True):
try: try:
default_group = _security_group_get_by_names(context, default_group = _security_group_get_by_names(context,
session, session,