x/vmware-nsx
Code Issues Proposed changes

Merge "BigSwitch: correct net to backend on floating IP disassociation"

Browse Source
This commit is contained in:
Jenkins 2013-10-10 00:40:14 +00:00 committed by Gerrit Code Review
commit a4beeac9b1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neutron/plugins/bigswitch/plugin.py
View File

@ -1075,11 +1075,19 @@ class NeutronRestProxyV2(db_base_plugin_v2.NeutronDbPluginV2,
LOG.debug(_("NeutronRestProxyV2: diassociate_floatingips() called")) LOG.debug(_("NeutronRestProxyV2: diassociate_floatingips() called"))
super(NeutronRestProxyV2, self).disassociate_floatingips(context, super(NeutronRestProxyV2, self).disassociate_floatingips(context,
port_id) port_id)
port = super(NeutronRestProxyV2, self).get_port(context, port_id) try:
net_id = port['network_id'] ext_net_id = self.get_external_network_id(context)
orig_net = super(NeutronRestProxyV2, self).get_network(context, if ext_net_id:
net_id) # Use the elevated state of the context for the ext_net query
self._send_update_network(orig_net, context) admin_context = context.elevated()
ext_net = super(NeutronRestProxyV2,
self).get_network(admin_context, ext_net_id)
# update external network on network controller
self._send_update_network(ext_net, admin_context)
except exceptions.TooManyExternalNetworks:
# get_external_network can raise errors when multiple external
# networks are detected, which isn't supported by the Plugin
LOG.error(_("NeutronRestProxyV2: too many external networks"))
def _send_all_data(self): def _send_all_data(self):
"""Pushes all data to network ctrl (networks/ports, ports/attachments). """Pushes all data to network ctrl (networks/ports, ports/attachments).