Revert "Add the rebinding chance in _bind_port_if_needed"

This reverts commit 67e45d324af39a66fbd4ad175e410407b2720e68.

This commit caused a regression in tripleo-ci where some dhcp
options ended up missing(tftp options).

Closes-Bug: #1421835
Change-Id: Ibe68eceb2f5a36cf40cc1c378c1a59a35bfcbf7f

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index 85b87c76af2af059c9c091167f9c9a19ed50965f..9de4fdf08a2cf548fa9531fc73c3876c8785fdb8 100644 (file)
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -263,8 +263,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
             # First, determine whether it is necessary and possible to
             # bind the port.
             binding = context._binding
-            if (binding.vif_type not in [portbindings.VIF_TYPE_UNBOUND,
-                                         portbindings.VIF_TYPE_BINDING_FAILED]
+            if (binding.vif_type != portbindings.VIF_TYPE_UNBOUND
                 or not binding.host):
                 # We either don't need to bind the port, or can't, so
                 # notify if needed and return.
@@ -302,15 +301,12 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
                 LOG.debug("Port %s has been deleted concurrently",
                           port_id)
                 return context
-
-            context = new_context
-
-            if (context._binding.vif_type ==
-                    portbindings.VIF_TYPE_BINDING_FAILED):
-                return context
             # Need to notify if we succeed and our results were
             # committed.
-            need_notify |= did_commit
+            if did_commit and (new_context._binding.vif_type !=
+                               portbindings.VIF_TYPE_BINDING_FAILED):
+                need_notify = True
+            context = new_context
 
     def _bind_port(self, orig_context):
         # Construct a new PortContext from the one from the previous

diff --git a/neutron/tests/unit/ml2/test_ml2_plugin.py b/neutron/tests/unit/ml2/test_ml2_plugin.py
index 33d7b0d4906103d9862ccc4792bb0c426c80c731..9eea351654a039a3078d0ffbd902229cd7d68e56 100644 (file)
--- a/neutron/tests/unit/ml2/test_ml2_plugin.py
+++ b/neutron/tests/unit/ml2/test_ml2_plugin.py
@@ -457,54 +457,6 @@ class TestMl2PortBinding(Ml2PluginV2TestCase,
             # should have returned before calling _make_port_dict
             self.assertFalse(mpd_mock.mock_calls)
 
-    def test_bind_port_if_needed(self):
-        # create a port and set its vif_type to binding_failed
-        with self.port() as port:
-            plugin = manager.NeutronManager.get_plugin()
-            binding = ml2_db.get_locked_port_and_binding(self.context.session,
-                                                         port['port']['id'])[1]
-            binding['host'] = 'test'
-
-            binding['vif_type'] = portbindings.VIF_TYPE_BINDING_FAILED
-            mech_context = driver_context.PortContext(
-                plugin, self.context, port['port'],
-                plugin.get_network(self.context, port['port']['network_id']),
-                binding, None)
-
-        # test when _commit_port_binding return binding_failed
-        self._test_bind_port_if_needed(plugin, mech_context, False)
-        # test when _commit_port_binding NOT return binding_failed
-        self._test_bind_port_if_needed(plugin, mech_context, True)
-
-    def _test_bind_port_if_needed(self, plugin, mech_context, commit_fail):
-        # mock _commit_port_binding
-        commit_context = mock.MagicMock()
-        if commit_fail:
-            commit_context._binding.vif_type = (
-                    portbindings.VIF_TYPE_BINDING_FAILED)
-        else:
-            commit_context._binding.vif_type = portbindings.VIF_TYPE_OVS
-
-        with contextlib.nested(
-            mock.patch('neutron.plugins.ml2.plugin.'
-                       'db.get_locked_port_and_binding',
-                       return_value=(None, None)),
-            mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin._bind_port'),
-            mock.patch('neutron.plugins.ml2.plugin.'
-                       'Ml2Plugin._commit_port_binding',
-                       return_value=(commit_context, False))
-        ) as (glpab_mock, bd_mock, commit_mock):
-            bound_context = plugin._bind_port_if_needed(mech_context)
-            # check _bind_port be called
-            self.assertTrue(bd_mock.called)
-
-            if commit_fail:
-                self.assertEqual(portbindings.VIF_TYPE_BINDING_FAILED,
-                        bound_context._binding.vif_type)
-            else:
-                self.assertEqual(portbindings.VIF_TYPE_OVS,
-                        bound_context._binding.vif_type)
-
     def test_port_binding_profile_not_changed(self):
         profile = {'e': 5}
         profile_arg = {portbindings.PROFILE: profile}