Merge "Port provisioning should retry only for VM ports" into stable/yoga

Author: Zuul

neutron/plugins/ml2/plugin.py

@@ -355,7 +355,9 @@ def _port_provisioned(self, rtype, event, trigger, payload=None):
                 # a host ID and the dhcp agent notifies that its wiring is done
                 LOG.debug('Port %s cannot update to ACTIVE because it '
                           'is not bound.', port_id)
-                if count == MAX_PROVISIONING_TRIES:
+                owner = port.device_owner
+                if (count == MAX_PROVISIONING_TRIES or not
+                        owner.startswith(const.DEVICE_OWNER_COMPUTE_PREFIX)):
                     return
 
                 # Wait 0.5 seconds before checking again if the port is bound.

neutron/tests/unit/plugins/ml2/test_plugin.py

@@ -1126,7 +1126,9 @@ def test__port_provisioned_port_retry_port_binding_unbound(
         ml2_plugin.MAX_PROVISIONING_TRIES = 2
         plugin = directory.get_plugin()
         port_id = 'fake_port_id'
-        port = mock.Mock(id=port_id, admin_state_up=True)
+        device_owner = constants.DEVICE_OWNER_COMPUTE_PREFIX + 'nova'
+        port = mock.Mock(id=port_id, admin_state_up=True,
+                         device_owner=device_owner)
         mock_get_port.return_value = port
         with mock.patch.object(plugin, 'update_port_status') as mock_pstatus:
             pb1 = mock.MagicMock(vif_type=portbindings.VIF_TYPE_UNBOUND)
@@ -1139,6 +1141,23 @@ def test__port_provisioned_port_retry_port_binding_unbound(
             mock_pstatus.assert_called_once_with(self.context, port_id,
                                                  constants.PORT_STATUS_ACTIVE)
 
+    @mock.patch('neutron.plugins.ml2.plugin.db.get_port')
+    @mock.patch.object(p_utils, 'get_port_binding_by_status_and_host')
+    def test__port_provisioned_port_retry_port_binding_unbound_no_vm_port(
+            self, mock_get_pb, mock_get_port):
+        plugin = directory.get_plugin()
+        port_id = 'fake_port_id'
+        port = mock.Mock(id=port_id, admin_state_up=True,
+                         device_owner='other_value')
+        mock_get_port.return_value = port
+        with mock.patch.object(plugin, 'update_port_status') as mock_pstatus:
+            pb1 = mock.MagicMock(vif_type=portbindings.VIF_TYPE_UNBOUND)
+            mock_get_pb.return_value = pb1
+            plugin._port_provisioned('port', 'evt', 'trigger',
+                                     payload=events.DBEventPayload(
+                                         self.context, resource_id=port_id))
+            mock_pstatus.assert_not_called()
+
     def test_port_after_create_outside_transaction(self):
         self.tx_open = True