Merge "Skip PortNotFound when unbinding port" into stable/ocata

ironic/common/neutron.py

@@ -88,6 +88,9 @@ def unbind_neutron_port(port_id, client=None):
 
     try:
         client.update_port(port_id, body)
+    # NOTE(vsaienko): Ignore if port was deleted before calling vif detach.
+    except neutron_exceptions.PortNotFoundClient:
+        LOG.info('Port %s was not found while unbinding.', port_id)
     except neutron_exceptions.NeutronClientException as e:
         msg = (_('Unable to clear binding profile for '
                  'neutron port %(port_id)s. Error: '

ironic/tests/unit/common/test_neutron.py

@@ -686,3 +686,21 @@ class TestUnbindPort(base.TestCase):
         mock_client.assert_called_once_with()
         mock_client.return_value.update_port.assert_called_once_with(port_id,
                                                                      body)
+
+    @mock.patch.object(neutron, 'LOG')
+    def test_unbind_neutron_port_not_found(self, mock_log, mock_client):
+        port_id = 'fake-port-id'
+        mock_client.return_value.update_port.side_effect = (
+            neutron_client_exc.PortNotFoundClient())
+        body = {
+            'port': {
+                'binding:host_id': '',
+                'binding:profile': {}
+            }
+        }
+        neutron.unbind_neutron_port(port_id)
+        mock_client.assert_called_once_with()
+        mock_client.return_value.update_port.assert_called_once_with(port_id,
+                                                                     body)
+        mock_log.info.assert_called_once_with('Port %s was not found while '
+                                              'unbinding.', port_id)

releasenotes/notes/ignore-port-not-found-when-unbinding-94fb63988e98cb21.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - Fixes a failure when deploying a node. This happened when a port or port
+    group's internal_info['tenant_vif_port_id'] still existed after the
+    corresponding neutron port was removed and prior to deletion of the
+    instance, causing future deployments of the bare metal node to fail. The
+    situation is now logged and does not block future deployments. See
+    https://bugs.launchpad.net/ironic/+bug/1685592 for details.