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

1 files changed, 5 insertions, 1 deletions

diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py
index 3266eb396..5e395ba11 100644
--- a/openstack_dashboard/api/neutron.py
+++ b/openstack_dashboard/api/neutron.py
@@ -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)