From 47718064b70bf2f09b23e294fd5ec04851aa7b67 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 17 Jan 2025 10:38:01 -0500 Subject: [PATCH] tests: Don't assume update outside ovs txn notifies separately from create Closes-Bug: #2095180 Change-Id: I776269a5c283ce9da69613a377f80e1a0d54bb3d --- .../agent/ovn/metadata/test_metadata_agent.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py b/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py index 3aad064e2c6..b0ed3c836d9 100644 --- a/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py +++ b/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py @@ -366,10 +366,8 @@ class TestMetadataAgent(base.TestOVNFunctionalBase): # disable DHCP on the subnet where the metadata's port is located. lswitch_name = 'ovn-' + uuidutils.generate_uuid() mdt_port_name = 'ovn-mdt-' + uuidutils.generate_uuid() - mac_ip = 'AA:AA:AA:AA:AA:AA 192.168.122.123' - mdt_pb_event = events.WaitForUpdatePortBindingEvent( - mdt_port_name, mac=[mac_ip]) + mdt_pb_event = events.WaitForCreatePortBindingEvent(mdt_port_name) self.handler.watch_event(mdt_pb_event) with self.nb_api.transaction( @@ -378,9 +376,10 @@ class TestMetadataAgent(base.TestOVNFunctionalBase): self.nb_api.ls_add(lswitch_name)) self._create_metadata_port(txn, lswitch_name, mdt_port_name) - external_ids = {ovn_const.OVN_CIDRS_EXT_ID_KEY: ""} - self.nb_api.set_lswitch_port(lport_name=mdt_port_name, - external_ids=external_ids).execute() + external_ids = {ovn_const.OVN_CIDRS_EXT_ID_KEY: ""} + txn.add( + self.nb_api.set_lswitch_port(lport_name=mdt_port_name, + external_ids=external_ids)) self.assertTrue(mdt_pb_event.wait())