Merge "Cisco Nexus: maximum recursion error in ConnectionContext.__del__"

diff --cc neutron/plugins/cisco/network_plugin.py
index d3a43691481aeed35ce53ac1a599e5754f11bbdf,6d9cdb1ce3cab73bf5fdd4499329c031029dee93..ee35fec811e92bf4f539f2868ff6efadddacc6e5
--- 1/neutron/plugins/cisco/network_plugin.py
--- 2/neutron/plugins/cisco/network_plugin.py
+++ b/neutron/plugins/cisco/network_plugin.py
@@@ -65,18 -65,10 +65,19 @@@ class PluginV2(db_base_plugin_v2.Neutro
          cexc.VlanIDNotFound: wexc.HTTPNotFound,
      }
  
 +    @property
 +    def supported_extension_aliases(self):
 +        if not hasattr(self, '_aliases'):
 +            aliases = self._supported_extension_aliases[:]
 +            if hasattr(self._model, "supported_extension_aliases"):
 +                aliases.extend(self._model.supported_extension_aliases)
 +            self._aliases = aliases
 +        return self._aliases
 +
      def __init__(self):
          """Load the model class."""
-         self._model = importutils.import_object(config.CISCO.model_class)
+         self._model_name = config.CISCO.model_class
+         self._model = importutils.import_object(self._model_name)
          native_bulk_attr_name = ("_%s__native_bulk_support"
                                   % self._model.__class__.__name__)
          self.__native_bulk_support = getattr(self._model,

diff --cc neutron/tests/unit/cisco/test_network_plugin.py
Simple merge