openstack
/
neutron
Code Issues Proposed changes

Merge "Revert "Do not retry default security group creation""

This commit is contained in:
Jenkins 2016-09-21 07:49:33 +00:00 committed by Gerrit Code Review
parent 51b34f0729 2a5826c8b3
commit a0d1487cda
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/db/securitygroups_db.py
View File

@ -61,15 +61,11 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
raise exc_cls(reason=reason, id=id)
@db_api.retry_if_session_inactive()
def create_security_group(self, context, security_group):
return self._create_security_group(context, security_group)
def _create_security_group(self, context, security_group,
default_sg=False):
def create_security_group(self, context, security_group, default_sg=False):
"""Create security group.
If default_sg is true that means we are creating a default security
group for a given tenant if it does not exist.
If default_sg is true that means we are a default security group for
a given tenant if it does not exist.
"""
s = security_group['security_group']
kwargs = {
@ -675,7 +671,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
'tenant_id': tenant_id,
'description': _('Default security group')}
}
return self._create_security_group(
return self.create_security_group(
context, security_group, default_sg=True)['id']
def _get_security_groups_on_port(self, context, port):