x/vmware-nsx
Code Issues Proposed changes

Merge "l2-pop : removing a TODO for the delete port use case"

Browse Source
This commit is contained in:
Jenkins
2014-07-16 07:04:31 +00:00
committed by Gerrit Code Review
parent eb394a9168 f716da8f4a
commit 3c1d08ece6
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/plugins/ml2/drivers/l2pop/mech_driver.py
View File

@@ -42,23 +42,13 @@ class L2populationMechanismDriver(api.MechanismDriver,
LOG.debug(_("Experimental L2 population driver")) LOG.debug(_("Experimental L2 population driver"))
self.rpc_ctx = n_context.get_admin_context_without_session() self.rpc_ctx = n_context.get_admin_context_without_session()
self.migrated_ports = {} self.migrated_ports = {}
self.deleted_ports = {}
def _get_port_fdb_entries(self, port): def _get_port_fdb_entries(self, port):
return [[port['mac_address'], return [[port['mac_address'],
ip['ip_address']] for ip in port['fixed_ips']] ip['ip_address']] for ip in port['fixed_ips']]
def delete_port_precommit(self, context):
# TODO(matrohon): revisit once the original bound segment will be
# available in delete_port_postcommit. in delete_port_postcommit
# agent_active_ports will be equal to 0, and the _update_port_down
# won't need agent_active_ports_count_for_flooding anymore
port_context = context.current
fdb_entries = self._update_port_down(context, port_context, 1)
self.deleted_ports[context.current['id']] = fdb_entries
def delete_port_postcommit(self, context): def delete_port_postcommit(self, context):
fanout_msg = self.deleted_ports.pop(context.current['id'], None) fanout_msg = self._update_port_down(context, context.current)
if fanout_msg: if fanout_msg:
self.L2populationAgentNotify.remove_fdb_entries( self.L2populationAgentNotify.remove_fdb_entries(
self.rpc_ctx, fanout_msg) self.rpc_ctx, fanout_msg)
@@ -219,8 +209,7 @@ class L2populationMechanismDriver(api.MechanismDriver,
self.L2populationAgentNotify.add_fdb_entries(self.rpc_ctx, self.L2populationAgentNotify.add_fdb_entries(self.rpc_ctx,
other_fdb_entries) other_fdb_entries)
def _update_port_down(self, context, port_context, def _update_port_down(self, context, port_context):
agent_active_ports_count_for_flooding=0):
port_infos = self._get_port_infos(context, port_context) port_infos = self._get_port_infos(context, port_context)
if not port_infos: if not port_infos:
return return
@@ -237,7 +226,7 @@ class L2populationMechanismDriver(api.MechanismDriver,
{'segment_id': segment['segmentation_id'], {'segment_id': segment['segmentation_id'],
'network_type': segment['network_type'], 'network_type': segment['network_type'],
'ports': {agent_ip: []}}} 'ports': {agent_ip: []}}}
if agent_active_ports == agent_active_ports_count_for_flooding: if not agent_active_ports:
# Agent is removing its last activated port in this network, # Agent is removing its last activated port in this network,
# other agents needs to be notified to delete their flooding entry. # other agents needs to be notified to delete their flooding entry.
other_fdb_entries[network_id]['ports'][agent_ip].append( other_fdb_entries[network_id]['ports'][agent_ip].append(