openstack/neutron
Code Issues Proposed changes

Provide a "priority" value to the OVN events

Browse Source 
Since [1], the OVN events are sorted by a "priority" value. In
"TestOvnDbNotifyHandler" tests, because several events are added to
the watch list, this "priority" value should be given.

The workaround [2] is removed as is unnecessary now.

NOTE: this patch will work with newer ovsdbapp versions (still not
released) and current one. CI testing master branch of ovsdbapp could
be found in "openstack-tox-py36-with-ovsdbapp-master".

[1]https://review.opendev.org/c/openstack/ovsdbapp/+/819116
[2]https://review.opendev.org/c/openstack/neutron/+/755335

Closes-Bug: #1953481
Change-Id: If76cf263a2c13eb278a5e22743b5962919c2ad98
This commit is contained in:
Rodolfo Alonso Hernandez
2021-12-07 16:52:53 +00:00
parent 9f0bff72ba
commit ef162fcf8e
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
neutron/tests/unit/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py
View File

@@ -100,33 +100,29 @@ class TestOvnDbNotifyHandler(base.BaseTestCase):
def setUp(self):
super(TestOvnDbNotifyHandler, self).setUp()
self.handler = ovsdb_monitor.OvnDbNotifyHandler(mock.ANY)
# NOTE(ralonsoh): once the ovsdbapp library version is bumped beyond
# 1.5.0, the first assignation (using name mangling) can be deleted.
try:
self.watched_events = self.handler._RowEventHandler__watched_events
except AttributeError:
self.watched_events = self.handler._watched_events
def test_watch_and_unwatch_events(self):
expected_events = set()
networking_event = mock.Mock()
ovn_event = mock.Mock()
unknown_event = mock.Mock()
networking_event = mock.Mock(priority=1)
ovn_event = mock.Mock(priority=2)
unknown_event = mock.Mock(priority=3)
self.assertCountEqual(set(), self.watched_events)
self.assertCountEqual(set(), set(self.handler._watched_events))
expected_events.add(networking_event)
self.handler.watch_event(networking_event)
self.assertCountEqual(expected_events, self.watched_events)
self.assertCountEqual(expected_events,
set(self.handler._watched_events))
expected_events.add(ovn_event)
self.handler.watch_events([ovn_event])
self.assertCountEqual(expected_events, self.watched_events)
self.assertCountEqual(expected_events,
set(self.handler._watched_events))
self.handler.unwatch_events([networking_event, ovn_event])
self.handler.unwatch_event(unknown_event)
self.handler.unwatch_events([unknown_event])
self.assertCountEqual(set(), self.watched_events)
self.assertCountEqual(set(), set(self.handler._watched_events))
def test_shutdown(self):
self.handler.shutdown()