Revert "[OVN] Always exclude the local chassis creating HA_Chassis_Group"

This reverts commit 4238ccb.

Reason for revert: this patch is breaking the Ironic CI. The
external can be bound to a gateway chassis and yet this chassis
can be used to build the ``HA_Chassis_Group`` register. This
limitation imposed by the reverted patch doesn't work if the
environment has one single gateway chassis, usually happening
that in CI jobs.

Change-Id: I201d7681c1a1b0c6e3f54c46ba5d4be586c709ff
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>

Author: ralonsoh

neutron/common/ovn/utils.py

@@ -1237,19 +1237,20 @@ def sync_ha_chassis_group_network(context, nb_idl, sb_idl, port_id,
     chassis_list = sb_idl.get_extport_chassis_from_cms_options()
     if chassis_list:
         group_name = ovn_extport_chassis_group_name(port_id)
+        # Check if the port is bound to a chassis and if so, ignore that
+        # chassis when building the HA Chassis Group to ensure the
+        # external port is bound to a different chassis than the VM
+        ignore_chassis = sb_idl.get_chassis_host_for_port(port_id)
         LOG.debug('HA Chassis Group %s is based on external port %s '
                   '(network %s)', group_name, port_id, network_id)
     else:
         chassis_list = sb_idl.get_gateway_chassis_from_cms_options(
             name_only=False)
         group_name = ovn_name(network_id)
+        ignore_chassis = set()
         LOG.debug('HA Chassis Group %s is based on network %s',
                   group_name, network_id)
 
-    # Check if the port is bound to a chassis and if so, ignore that
-    # chassis when building the HA Chassis Group to ensure the
-    # external port is bound to a different chassis than the VM
-    ignore_chassis = sb_idl.get_chassis_host_for_port(port_id)
     plugin = directory.get_plugin()
     resource = plugin.get_network(context, network_id)
     az_hints = common_utils.get_az_hints(resource)

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

@@ -2880,9 +2880,7 @@ def test_sync_ha_chassis_group_network_as_gw(self, mock_sync_hcg):
         self.sb_ovn.get_extport_chassis_from_cms_options.return_value = []
         self.sb_ovn.get_gateway_chassis_from_cms_options.return_value = [
             ch0, ch1, ch2, ch3, ch4, ch5]
-        expected_ignore_chassis = [ch4.name, ch5.name]
-        self.sb_ovn.get_chassis_host_for_port.return_value = set(
-            expected_ignore_chassis)
+
         ovn_utils.sync_ha_chassis_group_network(
             self.context, self.nb_ovn, self.sb_ovn, fake_port['id'],
             fake_net['id'], None)
@@ -2896,8 +2894,7 @@ def test_sync_ha_chassis_group_network_as_gw(self, mock_sync_hcg):
         self.assertEqual(expected_ch_list,
                          hcg_info.chassis_list)
         self.assertEqual(expected_az_hints, hcg_info.az_hints)
-        self.assertEqual(sorted(expected_ignore_chassis),
-                         sorted(hcg_info.ignore_chassis))
+        self.assertEqual(set(), hcg_info.ignore_chassis)
 
     @mock.patch.object(ovn_utils, '_sync_ha_chassis_group')
     def test_sync_ha_chassis_group_router(self, mock_sync_hcg):