From 7bc4ecf2290cbf808704d126e132b3c2d5043a02 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Fri, 26 Sep 2025 21:09:07 +0000 Subject: [PATCH] [OVN] Remove check for external ports support The field "ha_chassis_group" was added to the "Logical_Switch_Port" table in [1], that was released in OVN v20.03.0. Neutron enforces newer versions of OVN to work properly. [1]https://github.com/ovn-org/ovn/commit/b31c76000bef314b68e776d318d1ce4cf152450b Related-Bug: #2125553 Signed-off-by: Rodolfo Alonso Hernandez Change-Id: Iff2ebe33d5ca454e06b914313ca124c105c4dedb --- .../ml2/drivers/ovn/mech_driver/test_mech_driver.py | 9 ++++----- .../ovn-external-ports-supported-5895ea9c22d0aa0c.yaml | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/ovn-external-ports-supported-5895ea9c22d0aa0c.yaml diff --git a/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py b/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py index a06706ecd77..ac8970113cc 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py +++ b/neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py @@ -1152,6 +1152,7 @@ class TestOVNMechanismDriver(TestOVNMechanismDriverBase): is_extport_present=False): port_device_owner = 'compute:nova' if is_compute_port else '' self.mech_driver._plugin.nova_notifier = mock.Mock() + mock_sync.return_value = mock.Mock(), mock.Mock() mock_is_ext.return_value = is_extport_present self.sb_ovn.get_extport_chassis_from_cms_options.return_value = [ mock.Mock()] @@ -1190,12 +1191,10 @@ class TestOVNMechanismDriver(TestOVNMechanismDriverBase): ulsp.assert_called_once_with(mock.ANY, mock.ANY) if is_extport_present: - # Method "sync_ha_chassis_group_network" called twice: when the - # port is created and when the port is set to UP. - calls = [mock.call( + sync_call = mock.call( mock.ANY, self.nb_ovn, self.sb_ovn, port1['port']['id'], - port1['port']['network_id'], mock.ANY)] * 2 - mock_sync.assert_has_calls(calls) + port1['port']['network_id'], mock.ANY) + mock_sync.assert_has_calls([sync_call, sync_call]) else: mock_sync.assert_not_called() diff --git a/releasenotes/notes/ovn-external-ports-supported-5895ea9c22d0aa0c.yaml b/releasenotes/notes/ovn-external-ports-supported-5895ea9c22d0aa0c.yaml new file mode 100644 index 00000000000..a38ed389d2a --- /dev/null +++ b/releasenotes/notes/ovn-external-ports-supported-5895ea9c22d0aa0c.yaml @@ -0,0 +1,5 @@ +--- +other: + - | + It is assumed now that OVN supports external ports. This functionality + was added in OVN v20.03.0.