Merge "[OVN] Expose chassis hosting information in LSP" into stable/zed

Author: Zuul

neutron/common/ovn/constants.py

@@ -53,6 +53,7 @@
 OVN_LIVENESS_CHECK_EXT_ID_KEY = 'neutron:liveness_check_at'
 METADATA_LIVENESS_CHECK_EXT_ID_KEY = 'neutron:metadata_liveness_check_at'
 OVN_PORT_BINDING_PROFILE = portbindings.PROFILE
+OVN_HOST_ID_EXT_ID_KEY = 'neutron:host_id'
 
 MIGRATING_ATTR = 'migrating_to'
 OVN_ROUTER_PORT_OPTION_KEYS = ['router-port', 'nat-addresses',

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

@@ -1126,6 +1126,8 @@ def set_port_status_up(self, port_id):
                                                 const.PORT_STATUS_ACTIVE)
             elif self._should_notify_nova(db_port):
                 self._plugin.nova_notifier.notify_port_active_direct(db_port)
+
+            self._ovn_client.update_lsp_host_info(admin_context, db_port)
         except (os_db_exc.DBReferenceError, n_exc.PortNotFound):
             LOG.debug('Port not found during OVN status up report: %s',
                       port_id)
@@ -1154,6 +1156,9 @@ def set_port_status_down(self, port_id):
                     None)
                 self._plugin.nova_notifier.send_port_status(
                     None, None, db_port)
+
+            self._ovn_client.update_lsp_host_info(
+                admin_context, db_port, up=False)
         except (os_db_exc.DBReferenceError, n_exc.PortNotFound):
             LOG.debug("Port not found during OVN status down report: %s",
                       port_id)

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

@@ -271,6 +271,36 @@ def determine_bind_host(self, port, port_context=None):
                     ovn_const.VIF_DETAILS_CARD_SERIAL_NUMBER]).hostname
         return ''
 
+    def update_lsp_host_info(self, context, db_port, up=True):
+        """Update the binding hosting information for the LSP.
+
+        Update the binding hosting information in the Logical_Switch_Port
+        external_ids column. See LP #2020058 for more information.
+
+        :param context: Neutron API context.
+        :param db_port: The Neutron port.
+        :param up: If True add the host information, if False remove it.
+                   Defaults to True.
+        """
+        cmd = []
+        if up:
+            if not db_port.port_bindings:
+                return
+            host = db_port.port_bindings[0].host
+
+            ext_ids = ('external_ids',
+                       {ovn_const.OVN_HOST_ID_EXT_ID_KEY: host})
+            cmd.append(
+                self._nb_idl.db_set(
+                    'Logical_Switch_Port', db_port.id, ext_ids))
+        else:
+            cmd.append(
+                self._nb_idl.db_remove(
+                    'Logical_Switch_Port', db_port.id, 'external_ids',
+                    ovn_const.OVN_HOST_ID_EXT_ID_KEY, if_exists=True))
+
+        self._transaction(cmd)
+
     def _get_port_options(self, port):
         context = n_context.get_admin_context()
         binding_prof = utils.validate_and_get_data_from_binding_profile(port)
@@ -426,7 +456,12 @@ def _get_port_options(self, port):
                         # a RARP packet from it to inform network about the new
                         # location of the port
                         options['activation-strategy'] = 'rarp'
-            options[ovn_const.LSP_OPTIONS_REQUESTED_CHASSIS_KEY] = chassis
+
+            # Virtual ports can not be bound by using the
+            # requested-chassis mechanism, ovn-controller will create the
+            # Port_Binding entry when it sees an ARP coming from the VIP
+            if port_type != ovn_const.LSP_TYPE_VIRTUAL:
+                options[ovn_const.LSP_OPTIONS_REQUESTED_CHASSIS_KEY] = chassis
 
         # TODO(lucasagomes): Enable the mcast_flood_reports by default,
         # according to core OVN developers it shouldn't cause any harm

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

@@ -126,6 +126,30 @@ def test_vnic_remote_managed_port_context(self):
             self.fake_smartnic_hostname,
             self.ovn_client.determine_bind_host({}, port_context=context))
 
+    def test_update_lsp_host_info_up(self):
+        context = mock.MagicMock()
+        host_id = 'fake-binding-host-id'
+        port_id = 'fake-port-id'
+        db_port = mock.Mock(
+            id=port_id, port_bindings=[mock.Mock(host=host_id)])
+
+        self.ovn_client.update_lsp_host_info(context, db_port)
+
+        self.nb_idl.db_set.assert_called_once_with(
+            'Logical_Switch_Port', port_id,
+            ('external_ids', {constants.OVN_HOST_ID_EXT_ID_KEY: host_id}))
+
+    def test_update_lsp_host_info_down(self):
+        context = mock.MagicMock()
+        port_id = 'fake-port-id'
+        db_port = mock.Mock(id=port_id)
+
+        self.ovn_client.update_lsp_host_info(context, db_port, up=False)
+
+        self.nb_idl.db_remove.assert_called_once_with(
+            'Logical_Switch_Port', port_id, 'external_ids',
+            constants.OVN_HOST_ID_EXT_ID_KEY, if_exists=True)
+
 
 class TestOVNClientFairMeter(TestOVNClientBase,
                              test_log_driver.TestOVNDriverBase):

neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py

@@ -1077,7 +1077,9 @@ def _test_set_port_status_up(self, is_compute_port=False):
                 mock.patch.object(self.mech_driver,
                                   '_update_dnat_entry_if_needed') as ude, \
                 mock.patch.object(self.mech_driver, '_should_notify_nova',
-                                  return_value=is_compute_port):
+                                  return_value=is_compute_port), \
+                mock.patch.object(self.mech_driver._ovn_client,
+                                  'update_lsp_host_info') as ulsp:
             self.mech_driver.set_port_status_up(port1['port']['id'])
             pc.assert_called_once_with(
                 mock.ANY,
@@ -1097,6 +1099,8 @@ def _test_set_port_status_up(self, is_compute_port=False):
                     notify_port_active_direct.assert_called_once_with(
                         mock.ANY)
 
+            ulsp.assert_called_once_with(mock.ANY, mock.ANY)
+
     def test_set_port_status_up(self):
         self._test_set_port_status_up(is_compute_port=False)
 
@@ -1116,7 +1120,9 @@ def _test_set_port_status_down(self, is_compute_port=False):
                 mock.patch.object(self.mech_driver,
                                   '_update_dnat_entry_if_needed') as ude, \
                 mock.patch.object(self.mech_driver, '_should_notify_nova',
-                                  return_value=is_compute_port):
+                                  return_value=is_compute_port), \
+                mock.patch.object(self.mech_driver._ovn_client,
+                                  'update_lsp_host_info') as ulsp:
             self.mech_driver.set_port_status_down(port1['port']['id'])
             apc.assert_called_once_with(
                 mock.ANY,
@@ -1142,6 +1148,8 @@ def _test_set_port_status_down(self, is_compute_port=False):
                     send_port_status.assert_called_once_with(
                         None, None, mock.ANY)
 
+            ulsp.assert_called_once_with(mock.ANY, mock.ANY, up=False)
+
     def test_set_port_status_down(self):
         self._test_set_port_status_down(is_compute_port=False)