openstack
/
neutron
Code Issues Proposed changes

Merge "[ovn] Metadata agent: fix checking datapath type"

This commit is contained in:
Zuul 2021-01-28 16:08:04 +00:00 committed by Gerrit Code Review
parent 0fc3a698b3 ffafc5f31e
commit 0fb63f7297
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/ovn/metadata/agent.py
View File

@ -385,7 +385,8 @@ class MetadataAgent(object):
"netdev"), the checksum between the metadata namespace and OVS is not
correctly populated.
"""
if (self.ovs_idl.db_get('Bridge', self.ovn_bridge, 'datapath_type') !=
if (self.ovs_idl.db_get(
'Bridge', self.ovn_bridge, 'datapath_type').execute() !=
ovn_const.CHASSIS_DATAPATH_NETDEV):
return

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

@ -313,7 +313,7 @@ class TestMetadataAgent(base.TestOVNFunctionalBase):
self.assertFalse(event.wait())
def test__ensure_datapath_checksum_if_dpdk(self):
self.mock_ovsdb_idl.db_get.return_value = (
self.mock_ovsdb_idl.db_get.return_value.execute.return_value = (
ovn_const.CHASSIS_DATAPATH_NETDEV)
regex = re.compile(r'-A POSTROUTING -p tcp -m tcp '
r'-j CHECKSUM --checksum-fill')