From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 10 Jan 2016 11:19:24 +0000 (+0000)
Subject: Merge "Simplify extension processing"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0399f8383f0365a637d0ea7275688acea5f2d342;p=openstack-build%2Fneutron-build.git

Merge "Simplify extension processing"
---

0399f8383f0365a637d0ea7275688acea5f2d342
diff --cc neutron/api/extensions.py
index 37f497951,c78b5a07d..e18c75f5c
--- a/neutron/api/extensions.py
+++ b/neutron/api/extensions.py
@@@ -478,10 -456,11 +456,10 @@@ class ExtensionManager(object)
              LOG.debug('Ext alias: %s', extension.get_alias())
              LOG.debug('Ext description: %s', extension.get_description())
              LOG.debug('Ext updated: %s', extension.get_updated())
 -        except AttributeError as ex:
 -            LOG.exception(_LE("Exception loading extension: %s"),
 -                          six.text_type(ex))
 +        except AttributeError:
 +            LOG.exception(_LE("Exception loading extension"))
              return False
-         return True
+         return isinstance(extension, ExtensionDescriptor)
  
      def _load_all_extensions(self):
          """Load extensions from the configured path.