From 01786719557131d81b540e843cfbba2fac415d8b Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Sun, 20 Aug 2023 01:59:35 +0000 Subject: [PATCH] [OVN][FT] Make explicit the "publish" call check in "test_port_forwarding" The functional test "TestMaintenance.test_port_forwarding" is checking the "registry.publish" call after calling "create_floatingip_port_forwarding" and "update_floatingip_port_forwarding". This patch makes this check explicit for the expected call. This patch is similar to [1]. [1]https://review.opendev.org/c/openstack/neutron/+/893028 Related-Bug: #2033387 Change-Id: I595dbd9b3abf413408fddf60735c0e8bd54e1d5c (cherry picked from commit 2f637b2cb92dc37ef080eaf433fe580279136f32) --- .../ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py index 529295f07e9..bd8af1f4979 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py @@ -1005,7 +1005,9 @@ class TestMaintenance(_TestMaintenanceHelper): pf_def.INTERNAL_IP_ADDRESS: p1_ip} pf_obj = self.pf_plugin.create_floatingip_port_forwarding( self.context, fip_id, **fip_attrs(fip_pf_args)) - m_publish.assert_called_once() + call = mock.call('port_forwarding', 'after_create', self.pf_plugin, + payload=mock.ANY) + m_publish.assert_has_calls([call]) # Assert load balancer for port forwarding was not created self.assertFalse(self._find_pf_lb(router_id, fip_id)) @@ -1023,7 +1025,9 @@ class TestMaintenance(_TestMaintenanceHelper): m_publish.reset_mock() self.pf_plugin.update_floatingip_port_forwarding( self.context, pf_obj['id'], fip_id, **fip_attrs(fip_pf_args)) - m_publish.assert_called_once() + call = mock.call('port_forwarding', 'after_update', self.pf_plugin, + payload=mock.ANY) + m_publish.assert_has_calls([call]) # Assert load balancer for port forwarding is stale _verify_lb(self, 'tcp', 2222, 22)