From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Sun, 10 Aug 2014 18:54:37 +0000 (+0400)
Subject: Return port context from _bind_port_if_needed
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=03920290d00148437fe14696621bc7446bfc7e46;p=openstack-build%2Fneutron-build.git

Return port context from _bind_port_if_needed

Previously port was returned causing exception being thrown
in rpc handling code.

Change-Id: Iba498d0600d625f0469392b99ac0bc8c1f1ecff7
Closes-Bug: #1354912
---

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index 4d789ba89..f92b60fa5 100644
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -323,7 +323,9 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
                 # The port has been deleted concurrently, so just
                 # return the unbound result from the initial
                 # transaction that completed before the deletion.
-                return context._port
+                LOG.debug("Port %s has been deleted concurrently",
+                          port_id)
+                return context
             # Need to notify if we succeed and our results were
             # committed.
             if did_commit and (new_context._binding.vif_type !=