x/vmware-nsx
Code Issues Proposed changes

Merge "Port binding registration with NeutronDbPlugin causes Neutron crash"

Browse Source
This commit is contained in:
Jenkins
2013-09-18 13:14:17 +00:00
committed by Gerrit Code Review
parent 45e26f1046 9b18a8035f
commit 65f0fbd8a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/ml2/plugin.py
View File

@@ -235,13 +235,13 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
self.mechanism_manager.unbind_port(mech_context) self.mechanism_manager.unbind_port(mech_context)
self._update_port_dict_binding(port, binding) self._update_port_dict_binding(port, binding)
def _extend_port_dict_binding(self, port_res, port_db): def _ml2_extend_port_dict_binding(self, port_res, port_db):
# None when called during unit tests for other plugins. # None when called during unit tests for other plugins.
if port_db.port_binding: if port_db.port_binding:
self._update_port_dict_binding(port_res, port_db.port_binding) self._update_port_dict_binding(port_res, port_db.port_binding)
db_base_plugin_v2.NeutronDbPluginV2.register_dict_extend_funcs( db_base_plugin_v2.NeutronDbPluginV2.register_dict_extend_funcs(
attributes.PORTS, [_extend_port_dict_binding]) attributes.PORTS, ['_ml2_extend_port_dict_binding'])
# Note - The following hook methods have "ml2" in their names so # Note - The following hook methods have "ml2" in their names so
# that they are not called twice during unit tests due to global # that they are not called twice during unit tests due to global