Skip to content

Commit 02c4820

Browse files
committed
Fix functional test failure due to OVN commit
A recent commit to OVN branch-26.03 broke the gate. northd: Clear stale LSP tags on tag_request removal. That patch presumes that tags are set via 'tag_request' which it looks like we should have been doing all along, but create_provnet_port() only set the tag directly. In this case, the tag now gets removed and test_network_segments_localnet_ports fails. For now, this patch just adds the tag_request and sets the tag both because I'm not sure whether there should be any changes to the OVN patch and because it still works. Obviously it would also be possible to set a more static OVN target requiremnt--there are tradeoffs there. Closes-Bug: #2155789 Change-Id: I0e8b3391ba385bb98af52e153e12cf7372e4bfb5 Signed-off-by: Terry Wilson <twilson@redhat.com>
1 parent 8effa8b commit 02c4820

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,6 +2186,7 @@ def create_provnet_port(self, context, network_id, segment, txn=None,
21862186
external_ids={ovn_const.OVN_PHYSNET_EXT_ID_KEY: physnet},
21872187
type=ovn_const.LSP_TYPE_LOCALNET,
21882188
tag=tag,
2189+
tag_request=tag,
21892190
options=options)
21902191
self._transaction([cmd], txn=txn)
21912192

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,7 @@ def test_create_network_create_localnet_port_physical_network_type(self):
10341034
ovs_conf.get_igmp_flood(),
10351035
ovn_const.LSP_OPTIONS_LOCALNET_LEARN_FDB: 'false'},
10361036
tag=2,
1037+
tag_request=2,
10371038
type='localnet')
10381039

10391040
def test_create_port_without_security_groups(self):
@@ -4027,6 +4028,7 @@ def test_create_segment_create_localnet_port(self):
40274028
ovs_conf.get_igmp_flood(),
40284029
ovn_const.LSP_OPTIONS_LOCALNET_LEARN_FDB: 'false'},
40294030
tag=200,
4031+
tag_request=200,
40304032
type='localnet')
40314033
ovn_nb_api.create_lswitch_port.reset_mock()
40324034
physnet2_name = 'physnet2'
@@ -4047,6 +4049,7 @@ def test_create_segment_create_localnet_port(self):
40474049
ovs_conf.get_igmp_flood(),
40484050
ovn_const.LSP_OPTIONS_LOCALNET_LEARN_FDB: 'false'},
40494051
tag=300,
4052+
tag_request=300,
40504053
type='localnet')
40514054
segments = segments_db.get_network_segments(
40524055
self.context, net['id'])

0 commit comments

Comments
 (0)