openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] Wait for WaitForDataPathBindingCreateEvent event in functional tests"

This commit is contained in:
Zuul 2020-06-30 18:12:47 +00:00 committed by Gerrit Code Review
parent 4b31e0eeda 598e0376c6
commit 83031a300d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py
View File

@ -39,6 +39,17 @@ class WaitForMACBindingDeleteEvent(event.WaitEvent):
events, table, conditions, timeout=15) events, table, conditions, timeout=15)
class WaitForDataPathBindingCreateEvent(event.WaitEvent):
event_name = 'WaitForDataPathBindingCreateEvent'
def __init__(self, net_name):
table = 'Datapath_Binding'
events = (self.ROW_CREATE,)
conditions = (('external_ids', '=', {'name2': net_name}),)
super(WaitForDataPathBindingCreateEvent, self).__init__(
events, table, conditions, timeout=15)
class DistributedLockTestEvent(event.WaitEvent): class DistributedLockTestEvent(event.WaitEvent):
ONETIME = False ONETIME = False
COUNTER = 0 COUNTER = 0
@ -125,10 +136,12 @@ class TestNBDbMonitor(base.TestOVNFunctionalBase):
* Delete the FIP. * Delete the FIP.
* Check that the MAC_Binding entry gets deleted. * Check that the MAC_Binding entry gets deleted.
""" """
self._make_network(self.fmt, 'network1', True) net_name = 'network1'
self._make_network(self.fmt, net_name, True)
row_event = WaitForDataPathBindingCreateEvent(net_name)
dp = self.sb_api.db_find( dp = self.sb_api.db_find(
'Datapath_Binding', 'Datapath_Binding',
('external_ids', '=', {'name2': 'network1'})).execute() ('external_ids', '=', {'name2': net_name})).execute()
macb_id = self.sb_api.db_create('MAC_Binding', datapath=dp[0]['_uuid'], macb_id = self.sb_api.db_create('MAC_Binding', datapath=dp[0]['_uuid'],
ip='100.0.0.21').execute() ip='100.0.0.21').execute()
port = self.create_port() port = self.create_port()