From: Jenkins Date: Thu, 16 Oct 2014 05:56:55 +0000 (+0000) Subject: Merge "Minor: remove unnecessary intermediate variable" X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=695cabc44c13a7e85d58b56d35068a05163a4b92;p=openstack-build%2Fneutron-build.git Merge "Minor: remove unnecessary intermediate variable" --- 695cabc44c13a7e85d58b56d35068a05163a4b92 diff --cc neutron/plugins/ml2/plugin.py index 302f845e9,73eae1832..5b9a7eb05 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@@ -1003,10 -1002,9 +1003,10 @@@ class Ml2Plugin(db_base_plugin_v2.Neutr mech_context = driver_context.PortContext(self, context, port, network, binding) if is_dvr_enabled and utils.is_dvr_serviced(device_owner): - router_info = l3plugin.dvr_deletens_if_no_port(context, id) - removed_routers += router_info + removed_routers = l3plugin.dvr_deletens_if_no_port( + context, id) self.mechanism_manager.delete_port_precommit(mech_context) + bound_mech_contexts.append(mech_context) self._delete_port_security_group_bindings(context, id) if l3plugin: router_ids = l3plugin.disassociate_floatingips(