openstack
/
neutron
Code Issues Proposed changes

Merge "Don't catch DBDuplicate in default SG creation"

This commit is contained in:
Jenkins 2016-07-09 00:48:16 +00:00 committed by Gerrit Code Review
parent 0bf1517b10 9be996bfe7
commit 01e687bcdf
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
neutron/db/securitygroups_db.py
View File

@ -15,7 +15,6 @@
import netaddr
from neutron_lib.api import validators
from neutron_lib import constants
from oslo_db import exception as db_exc
from oslo_log import log as logging
from oslo_utils import uuidutils
import sqlalchemy as sa
@ -720,27 +719,14 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
default_group = query.filter_by(tenant_id=tenant_id).one()
return default_group['security_group_id']
except exc.NoResultFound:
return self._create_default_security_group(context, tenant_id)
def _create_default_security_group(self, context, tenant_id):
security_group = {
'security_group':
{'name': 'default',
'tenant_id': tenant_id,
'description': _('Default security group')}
}
try:
security_group = self.create_security_group(
context, security_group, default_sg=True)
return security_group['id']
except db_exc.DBDuplicateEntry as ex:
# default security group was created concurrently
LOG.debug("Duplicate default security group %s was "
"not created", ex.value)
# raise a retry request to restart the whole process since
# we could be in a REPEATABLE READ isolation level and won't
# be able to see the SG group in this transaction.
raise db_exc.RetryRequest(ex)
security_group = {
'security_group':
{'name': 'default',
'tenant_id': tenant_id,
'description': _('Default security group')}
}
return self.create_security_group(
context, security_group, default_sg=True)['id']
def _get_security_groups_on_port(self, context, port):
"""Check that all security groups on port belong to tenant.