openstack
/
neutron
Code Issues Proposed changes

Merge "Remove _delete_port_security_group_bindings from delete_port"

This commit is contained in:
Jenkins 2015-01-15 08:55:48 +00:00 committed by Gerrit Code Review
parent 0a8b9f4af0 87a3d9fc3a
commit 499525b119
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -819,7 +819,6 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
if self.l3_plugin:
router_ids = self.l3_plugin.disassociate_floatingips(
context, port_id, do_notify=False)
self._delete_port_security_group_bindings(context, port_id)
port = super(NeutronRestProxyV2, self).get_port(context, port_id)
# Tenant ID must come from network in case the network is shared
tenid = self._get_port_net_tenantid(context, port)

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

@ -1034,7 +1034,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
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(
context, id, do_notify=False)

1
neutron/plugins/nec/nec_plugin.py
View File

@ -664,7 +664,6 @@ class NECPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
with context.session.begin(subtransactions=True):
router_ids = self.disassociate_floatingips(
context, id, do_notify=False)
self._delete_port_security_group_bindings(context, id)
super(NECPluginV2, self).delete_port(context, id)
# now that we've left db transaction, we are safe to notify

2
neutron/plugins/nuage/plugin.py
View File

@ -358,7 +358,7 @@ class NuagePlugin(db_base_plugin_v2.NeutronDbPluginV2,
# Need to call this explicitly to delete vport to vporttag binding
if ext_sg.SECURITYGROUPS in port:
self._delete_port_security_group_bindings(context, id)
self.nuageclient.delete_port_security_group_bindings(id)
netpart_id = subnet_mapping['net_partition_id']
net_partition = nuagedb.get_net_partition_by_id(context.session,

2
neutron/plugins/oneconvergence/plugin.py
View File

@ -346,8 +346,6 @@ class OneConvergencePluginV2(db_base_plugin_v2.NeutronDbPluginV2,
neutron_port = super(OneConvergencePluginV2,
self).get_port(context, port_id)
self._delete_port_security_group_bindings(context, port_id)
router_ids = self.disassociate_floatingips(
context, port_id, do_notify=False)