From 3fc7fee3a44acb0f2c8668003a2f568de57dedf9 Mon Sep 17 00:00:00 2001 From: Saju Madhavan Date: Fri, 24 Jun 2016 16:31:23 +0530 Subject: [PATCH] contrail raises wrong quota exception This patch reraise OverQuota exception which come from contrail. In kilo and Liberty, OverQuota exception is defined in neutron/common/exceptions.py.In Mitaka, it moved to neutron_lib project neutron_lib/exceptions.py#L212 Change-Id: I1528ceab8607cad1bd88ea0e3230d5751f32e9b5 Closes-Bug: #1590930 --- .../plugins/opencontrail/contrail_plugin_base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py index 63b689e..bbf190e 100644 --- a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py +++ b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py @@ -39,6 +39,10 @@ except ImportError: from oslo_log import log as logging +try: + from neutron_lib import exceptions as libexc +except ImportError: + libexc = None # Constant for max length of network interface names # eg 'bridge' in the Network class or 'devname' in @@ -92,6 +96,8 @@ def _raise_contrail_error(info, obj_name): raise getattr(securitygroup, exc_name)(**info) if hasattr(allowedaddresspairs, exc_name): raise getattr(allowedaddresspairs, exc_name)(**info) + if libexc and hasattr(libexc, exc_name): + raise getattr(libexc, exc_name)(**info) raise exc.NeutronException(**info)