Merge "Check if port exists in update_port_virtual_type method" into stable/yoga

Author: Zuul

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py

@@ -868,7 +868,11 @@ def update_port_virtual_type(self):
             if lsp.type != '':
                 continue
 
-            port = self._ovn_client._plugin.get_port(context, lsp.name)
+            try:
+                port = self._ovn_client._plugin.get_port(context, lsp.name)
+            except n_exc.PortNotFound:
+                continue
+
             for ip in port.get('fixed_ips', []):
                 if utils.get_virtual_port_parents(
                         self._nb_idl, ip['ip_address'], port['network_id'],

neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py

@@ -676,10 +676,13 @@ def test_update_port_virtual_type(self, *args):
             attrs={'name': 'lsp0', 'type': ''})
         lsp1 = fakes.FakeOvsdbRow.create_one_ovsdb_row(
             attrs={'name': 'lsp1', 'type': constants.LSP_TYPE_VIRTUAL})
+        lsp2 = fakes.FakeOvsdbRow.create_one_ovsdb_row(
+            attrs={'name': 'lsp2_not_present_in_neutron_db', 'type': ''})
         port0 = {'fixed_ips': [{'ip_address': mock.ANY}],
                  'network_id': mock.ANY, 'id': mock.ANY}
-        nb_idl.lsp_list.return_value.execute.return_value = (lsp0, lsp1)
-        self.fake_ovn_client._plugin.get_port.return_value = port0
+        nb_idl.lsp_list.return_value.execute.return_value = (lsp0, lsp1, lsp2)
+        self.fake_ovn_client._plugin.get_port.side_effect = [
+            port0, n_exc.PortNotFound(port_id=mock.ANY)]
 
         self.assertRaises(
             periodics.NeverAgain, self.periodic.update_port_virtual_type)