Merge "Simplify extension processing"

diff --cc neutron/api/extensions.py
index 37f49795122f0bb04df153f1533a7371d4fce605,c78b5a07d18fa4a52c4e380eb12271bfc6897e9b..e18c75f5ce725545b2f9b0b412014fff20fcdd24
--- 1/neutron/api/extensions.py
--- 2/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.

diff --cc neutron/tests/unit/extension_stubs.py
Simple merge