openstack/neutron
Code Issues Proposed changes

tests: Don't assume update outside ovs txn notifies separately from create

Browse Source 
Closes-Bug: #2095180
Change-Id: I776269a5c283ce9da69613a377f80e1a0d54bb3d
This commit is contained in:
Ihar Hrachyshka
2025-01-17 10:38:01 -05:00
parent 466a4f62d2
commit 47718064b7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py
View File

@@ -366,10 +366,8 @@ class TestMetadataAgent(base.TestOVNFunctionalBase):
# disable DHCP on the subnet where the metadata's port is located. # disable DHCP on the subnet where the metadata's port is located.
lswitch_name = 'ovn-' + uuidutils.generate_uuid() lswitch_name = 'ovn-' + uuidutils.generate_uuid()
mdt_port_name = 'ovn-mdt-' + 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_pb_event = events.WaitForCreatePortBindingEvent(mdt_port_name)
mdt_port_name, mac=[mac_ip])
self.handler.watch_event(mdt_pb_event) self.handler.watch_event(mdt_pb_event)
with self.nb_api.transaction( with self.nb_api.transaction(
@@ -378,9 +376,10 @@ class TestMetadataAgent(base.TestOVNFunctionalBase):
self.nb_api.ls_add(lswitch_name)) self.nb_api.ls_add(lswitch_name))
self._create_metadata_port(txn, lswitch_name, mdt_port_name) self._create_metadata_port(txn, lswitch_name, mdt_port_name)
external_ids = {ovn_const.OVN_CIDRS_EXT_ID_KEY: ""} external_ids = {ovn_const.OVN_CIDRS_EXT_ID_KEY: ""}
self.nb_api.set_lswitch_port(lport_name=mdt_port_name, txn.add(
external_ids=external_ids).execute() self.nb_api.set_lswitch_port(lport_name=mdt_port_name,
external_ids=external_ids))
self.assertTrue(mdt_pb_event.wait()) self.assertTrue(mdt_pb_event.wait())