From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 16 Jul 2014 07:04:31 +0000 (+0000)
Subject: Merge "l2-pop : removing a TODO for the delete port use case"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=afcd4a570479e8be9ce09c5d94d3e5e842899478;p=openstack-build%2Fneutron-build.git

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

afcd4a570479e8be9ce09c5d94d3e5e842899478
diff --cc neutron/plugins/ml2/drivers/l2pop/mech_driver.py
index af4a427fc,faa75256a..531dd5ee3
--- a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py
+++ b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py
@@@ -48,19 -43,10 +47,10 @@@ class L2populationMechanismDriver(api.M
          return [[port['mac_address'],
                   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):
-         fanout_msg = self.deleted_ports.pop(context.current['id'], None)
+         fanout_msg = self._update_port_down(context, context.current)
          if fanout_msg:
 -            l2pop_rpc.L2populationAgentNotify.remove_fdb_entries(
 +            self.L2populationAgentNotify.remove_fdb_entries(
                  self.rpc_ctx, fanout_msg)
  
      def _get_diff_ips(self, orig, port):
@@@ -216,11 -202,10 +206,10 @@@
          # Notify other agents to add fdb rule for current port
          other_fdb_entries[network_id]['ports'][agent_ip] += port_fdb_entries
  
 -        l2pop_rpc.L2populationAgentNotify.add_fdb_entries(self.rpc_ctx,
 -                                                          other_fdb_entries)
 +        self.L2populationAgentNotify.add_fdb_entries(self.rpc_ctx,
 +                                                     other_fdb_entries)
  
-     def _update_port_down(self, context, port_context,
-                           agent_active_ports_count_for_flooding=0):
+     def _update_port_down(self, context, port_context):
          port_infos = self._get_port_infos(context, port_context)
          if not port_infos:
              return