openstack/designate
Code Issues Proposed changes

Merge "Adding v2 namespaced event to zone manager"

Browse Source
This commit is contained in:
Jenkins 2016-03-31 21:11:30 +00:00 committed by Gerrit Code Review
commit 40ec27f98a
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
designate/tests/unit/test_zone_manager/test_tasks.py
View File

@ -165,9 +165,14 @@ class PeriodicExistsTest(TaskTest):
data = dict(zone) data = dict(zone)
data.update(self.period_data) data.update(self.period_data)
self.mock_notifier.info.assert_called_with( # Ensure both the old (domain) and new (zone) events are fired
# until the old is fully deprecated.
self.mock_notifier.info.assert_any_call(
self.ctxt, "dns.domain.exists", data) self.ctxt, "dns.domain.exists", data)
self.mock_notifier.info.assert_any_call(
self.ctxt, "dns.zone.exists", data)
def test_emit_exists_no_zones(self): def test_emit_exists_no_zones(self):
with mock.patch.object(self.task, '_iter_zones') as iter_: with mock.patch.object(self.task, '_iter_zones') as iter_:
iter_.return_value = [] iter_.return_value = []
@ -184,9 +189,15 @@ class PeriodicExistsTest(TaskTest):
for z in zones: for z in zones:
data = dict(z) data = dict(z)
data.update(self.period_data) data.update(self.period_data)
self.mock_notifier.info.assert_called_with(
# Ensure both the old (domain) and new (zone) events are fired
# until the old is fully deprecated.
self.mock_notifier.info.assert_any_call(
self.ctxt, "dns.domain.exists", data) self.ctxt, "dns.domain.exists", data)
self.mock_notifier.info.assert_any_call(
self.ctxt, "dns.zone.exists", data)
class PeriodicSecondaryRefreshTest(TaskTest): class PeriodicSecondaryRefreshTest(TaskTest):
def setUp(self): def setUp(self):

1
designate/zone_manager/tasks.py
View File

@ -192,6 +192,7 @@ class PeriodicExistsTask(PeriodicTask):
zone_data.update(extra_data) zone_data.update(extra_data)
self.notifier.info(ctxt, 'dns.domain.exists', zone_data) self.notifier.info(ctxt, 'dns.domain.exists', zone_data)
self.notifier.info(ctxt, 'dns.zone.exists', zone_data)
LOG.info(_LI("Finished emitting %(counter)d events for shards " LOG.info(_LI("Finished emitting %(counter)d events for shards "
"%(start)s to %(end)s"), "%(start)s to %(end)s"),