openstack
/
horizon
Code Issues Proposed changes

Merge "Security group quota error handling" into stable/pike

This commit is contained in:
Zuul 2018-02-01 04:55:50 +00:00 committed by Gerrit Code Review
parent aa16c87849 97475c085a
commit 08c86a6413
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/api/neutron.py
View File

@ -377,8 +377,12 @@ class SecurityGroupManager(object):
'remote_group_id': group_id}}
try:
rule = self.client.create_security_group_rule(body)
except neutron_exc.OverQuotaClient:
raise exceptions.Conflict(
_('Security group rule quotas exceed.'))
except neutron_exc.Conflict:
raise exceptions.Conflict(_('Security group rule already exists.'))
raise exceptions.Conflict(
_('Security group rule already exists.'))
rule = rule.get('security_group_rule')
sg_dict = self._sg_name_dict(parent_group_id, [rule])
return SecurityGroupRule(rule, sg_dict)