Merge lp:~allenap/maas/dns-serials--bug-1571645 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Drive DNS publication from the DNSPublication model.

Previously a sequence was being used directly for the zone serial. However, sequences are explicitly not transactional: in an HA environment, a zone published on one region host would not necessarily have the same serial as the same zone published on another host. Using a regular table ensures that all region processes use the same serial.

[Mike Pontillo (mpontillo)]

I like this branch; well done. Looks like an elegant solution to the problem. I've commented below with some suggestions. Nothing blocking, though.

Can you add more detail in the commit message about why it's doing what it's doing?

You may need to reorder migrations; I think Blake has a migration, too.

Finally, it would be nice if LaMont reviews this, too.

review: Approve

[Gavin Panella (allenap)]

> I like this branch; well done. Looks like an elegant solution to the
> problem. I've commented below with some suggestions. Nothing blocking,
> though.

Thanks!

> Can you add more detail in the commit message about why it's doing what
> it's doing?

Sure; done.

> You may need to reorder migrations; I think Blake has a migration,
> too.

Ah, yes. Merged.

> Finally, it would be nice if LaMont reviews this, too.

I will prod him about it.

[Gavin Panella (allenap)]

LaMont, do you mind sanity checking this?

[LaMont Jones (lamont)]

A minor test question or two, but looks reasonable to me. No objections here.

review: Approve

[Gavin Panella (allenap)]

Thanks LaMont!

=== modified file 'src/maasserver/api/tests/test_domains.py'
--- src/maasserver/api/tests/test_domains.py	2016-04-29 11:37:21 +0000
+++ src/maasserver/api/tests/test_domains.py	2016-04-29 11:37:21 +0000
@@ -99,19 +99,39 @@
             'serial': str(serial)})
         self.assertEqual(
             http.client.OK, response.status_code, response.content)
-        self.assertEqual(serial, next(zone_serial))
-
-    def test_set_serial_detects_bad_values(self):
-        zone_serial.create_if_not_exists()
-        self.become_admin()
-        uri = get_domains_uri()
-        serial = random.randint(1, INT_MAX)
-        response = self.client.post(uri, {
-            'op': 'set_serial',
-            'serial': str(serial)})
-        self.assertEqual(
-            http.client.OK, response.status_code, response.content)
-        self.assertEqual(serial, next(zone_serial))
+        # The handler forces a DNS reload by creating a new DNS publication,
+        # so the serial has already been incremented.
+        self.assertEqual(serial + 1, next(zone_serial))
+
+    def test_set_serial_rejects_serials_less_than_1(self):
+        zone_serial.create_if_not_exists()
+        self.become_admin()
+        uri = get_domains_uri()
+        # A serial of 1 is fine.
+        response = self.client.post(
+            uri, {'op': 'set_serial', 'serial': '1'})
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        # A serial of 0 is rejected.
+        response = self.client.post(
+            uri, {'op': 'set_serial', 'serial': '0'})
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
+
+    def test_set_serial_rejects_serials_greater_than_4294967295(self):
+        zone_serial.create_if_not_exists()
+        self.become_admin()
+        uri = get_domains_uri()
+        # A serial of 4294967295 is fine.
+        response = self.client.post(
+            uri, {'op': 'set_serial', 'serial': '4294967295'})
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        # A serial of 4294967296 is rejected.
+        response = self.client.post(
+            uri, {'op': 'set_serial', 'serial': '4294967296'})
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
 
 
 class TestDomainAPI(APITestCase):

=== modified file 'src/maasserver/dns/config.py'
--- src/maasserver/dns/config.py	2016-04-29 11:37:21 +0000
+++ src/maasserver/dns/config.py	2016-04-29 11:37:21 +0000
@@ -9,11 +9,10 @@
     ]
 
 from django.conf import settings
-from django.db import connection
 from maasserver.dns.zonegenerator import ZoneGenerator
 from maasserver.enum import RDNS_MODE
 from maasserver.models.config import Config
-from maasserver.models.dnspublication import zone_serial
+from maasserver.models.dnspublication import DNSPublication
 from maasserver.models.domain import Domain
 from maasserver.models.subnet import Subnet
 from provisioningserver.dns.actions import (
@@ -30,7 +29,7 @@
 
 
 def current_zone_serial():
-    return '%0.10d' % zone_serial.current()
+    return '%0.10d' % DNSPublication.objects.get_most_recent().serial
 
 
 def is_dns_enabled():
@@ -40,8 +39,7 @@
 
 def dns_force_reload():
     """Force the DNS to be regenerated."""
-    cursor = connection.cursor()
-    cursor.execute("SELECT pg_notify('sys_dns', '')")
+    DNSPublication(source="Force reload").save()
 
 
 def dns_update_all_zones(reload_retry=False):

=== modified file 'src/maasserver/dns/tests/test_config.py'
--- src/maasserver/dns/tests/test_config.py	2016-03-31 23:34:55 +0000
+++ src/maasserver/dns/tests/test_config.py	2016-04-29 11:37:21 +0000
@@ -8,7 +8,6 @@
 import random
 import time
 
-from crochet import wait_for
 from django.conf import settings
 from django.core.management import call_command
 import dns.resolver
@@ -20,7 +19,6 @@
     dns_update_all_zones,
     get_trusted_networks,
     get_upstream_dns,
-    zone_serial,
 )
 from maasserver.enum import (
     IPADDRESS_TYPE,
@@ -31,11 +29,10 @@
     Config,
     Domain,
 )
+from maasserver.models.dnspublication import DNSPublication
 from maasserver.testing.config import RegionConfigurationFixture
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
-from maasserver.utils.orm import transactional
-from maasserver.utils.threads import deferToDatabase
 from maastesting.matchers import MockCalledOnceWith
 from netaddr import IPAddress
 from provisioningserver.dns.config import (
@@ -51,16 +48,13 @@
     BINDServer,
 )
 from provisioningserver.testing.tests.test_bindfixture import dig_call
-from provisioningserver.utils.twisted import (
-    DeferredValue,
-    retries,
-)
+from provisioningserver.utils.twisted import retries
 from testtools.matchers import (
     Contains,
+    Equals,
     FileContains,
     MatchesStructure,
 )
-from twisted.internet.defer import inlineCallbacks
 
 
 class TestDNSUtilities(MAASServerTestCase):
@@ -70,34 +64,24 @@
         self.patch(listener, "HANDLE_NOTIFY_DELAY", 0)
         return listener
 
-    def test_zone_serial_parameters(self):
-        self.assertThat(
-            zone_serial,
-            MatchesStructure.byEquality(
-                maxvalue=2 ** 32 - 1,
-                minvalue=1,
-                increment=1,
-                )
-            )
-
-    def test_current_zone_serial_returns_same_serial(self):
-        zone_serial.create_if_not_exists()
-        initial = current_zone_serial()
-        self.assertEquals(initial, current_zone_serial())
-
-    @wait_for(30)
-    @inlineCallbacks
-    def test_dns_force_reload_sends_notification(self):
-        dv = DeferredValue()
-        listener = self.make_listener_without_delay()
-        listener.register(
-            "sys_dns", lambda *args: dv.set(args))
-        yield listener.startService()
-        try:
-            yield deferToDatabase(transactional(dns_force_reload))
-            yield dv.get(timeout=2)
-        finally:
-            yield listener.stopService()
+    def test_current_zone_serial_returns_serial_of_latest_publication(self):
+        publication = DNSPublication(source=factory.make_name("source"))
+        publication.save()
+        self.assertThat(
+            int(current_zone_serial()),
+            Equals(publication.serial))
+
+    def test_dns_force_reload_saves_new_publication(self):
+        # A 'sys_dns' signal is also sent, but that is a side-effect of
+        # inserting into the DNS publications table, and is tested as part of
+        # the system triggers code.
+        self.assertRaises(
+            DNSPublication.DoesNotExist,
+            DNSPublication.objects.get_most_recent)
+        dns_force_reload()
+        self.assertThat(
+            DNSPublication.objects.get_most_recent(),
+            MatchesStructure.byEquality(source="Force reload"))
 
 
 class TestDNSServer(MAASServerTestCase):
@@ -112,8 +96,9 @@
 
     def setUp(self):
         super(TestDNSServer, self).setUp()
-        # Make sure the zone_serial is created.
-        zone_serial.create_if_not_exists()
+        # Ensure there's an initial DNS publication. Outside of tests this is
+        # guaranteed by a migration.
+        DNSPublication(source="Initial").save()
         # Allow test-local changes to configuration.
         self.useFixture(RegionConfigurationFixture())
         # Immediately make DNS changes as they're needed.
@@ -202,7 +187,7 @@
                     else:
                         serial = ans.rrset.items[0].serial
 
-            if serial == zone_serial.current():
+            if serial == DNSPublication.objects.get_most_recent().serial:
                 # The zone is up-to-date; we're done.
                 return
             else:

=== added file 'src/maasserver/migrations/builtin/maasserver/0057_initial_dns_publication.py'
--- src/maasserver/migrations/builtin/maasserver/0057_initial_dns_publication.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0057_initial_dns_publication.py	2016-04-29 11:37:21 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+from django.db import migrations
+
+
+source = "Initial publication"
+
+
+def create_initial_publication(apps, schema_editor):
+    # We can't import the DNSPublication model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    DNSPublication = apps.get_model("maasserver", "DNSPublication")
+    if not DNSPublication.objects.all().exists():
+        publication = DNSPublication(source=source)
+        publication.save()
+
+
+def remove_initial_publication(apps, schema_editor):
+    # We can't import the DNSPublication model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    DNSPublication = apps.get_model("maasserver", "DNSPublication")
+    for publication in DNSPublication.objects.order_by("id")[:1]:
+        if publication.source == source:
+            publication.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0056_zone_serial_ownership'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            create_initial_publication,
+            remove_initial_publication,
+        ),
+    ]

=== added file 'src/maasserver/migrations/builtin/maasserver/0058_bigger_integer_for_dns_publication_serial.py'
--- src/maasserver/migrations/builtin/maasserver/0058_bigger_integer_for_dns_publication_serial.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0058_bigger_integer_for_dns_publication_serial.py	2016-04-29 11:37:21 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+import django.core.validators
+from django.db import (
+    migrations,
+    models,
+)
+import maasserver.models.dnspublication
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0057_initial_dns_publication'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dnspublication',
+            name='serial',
+            field=models.BigIntegerField(editable=False, validators=(django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4294967295)), default=maasserver.models.dnspublication.next_serial),
+        ),
+    ]

=== added file 'src/maasserver/migrations/builtin/maasserver/0059_merge.py'
--- src/maasserver/migrations/builtin/maasserver/0059_merge.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0059_merge.py	2016-04-29 11:37:21 +0000
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0058_bigger_integer_for_dns_publication_serial'),
+        ('maasserver', '0057_merge'),
+    ]
+
+    operations = [
+    ]

=== modified file 'src/maasserver/models/dnspublication.py'
--- src/maasserver/models/dnspublication.py	2016-04-29 11:37:21 +0000
+++ src/maasserver/models/dnspublication.py	2016-04-29 11:37:21 +0000
@@ -16,9 +16,9 @@
     Model,
 )
 from django.db.models.fields import (
+    BigIntegerField,
     CharField,
     DateTimeField,
-    IntegerField,
 )
 from maasserver import DefaultMeta
 from maasserver.sequence import (
@@ -42,12 +42,26 @@
     """Manager for DNS publishing records."""
 
     def get_most_recent(self):
-        """Return the most recently inserted `DNSPublication`."""
-        return self.order_by("-id")[0]
+        """Return the most recently inserted `DNSPublication`.
+
+        :raise DoesNotExist: If DNS has never been published.
+        """
+        for publication in self.order_by("-id")[:1]:
+            return publication
+        else:
+            # This is unlikely to be a problem in a running MAAS installation,
+            # but it can crop up a lot in tests because we can't, for example,
+            # use migrations to provide an initial publication.
+            raise self.model.DoesNotExist() from None
 
     def collect_garbage(self):
         """Delete all but the most recently inserted `DNSPublication`."""
-        self.filter(id__lt=self.get_most_recent().id).delete()
+        try:
+            publication = self.get_most_recent()
+        except self.model.DoesNotExist:
+            pass  # Nothing to do.
+        else:
+            self.filter(id__lt=publication.id).delete()
 
 
 class DNSPublication(Model):
@@ -67,7 +81,7 @@
 
     # The serial number with which to publish the zone. We don't use the
     # primary key for this because zone serials are allowed to cycle.
-    serial = IntegerField(
+    serial = BigIntegerField(
         editable=False, null=False, default=next_serial, unique=False,
         validators=(
             MinValueValidator(zone_serial.minvalue),

=== modified file 'src/maasserver/models/tests/test_dnspublication.py'
--- src/maasserver/models/tests/test_dnspublication.py	2016-04-21 16:32:47 +0000
+++ src/maasserver/models/tests/test_dnspublication.py	2016-04-29 11:37:21 +0000
@@ -11,7 +11,11 @@
 )
 from random import randint
 
-from maasserver.models.dnspublication import DNSPublication
+from django.db import connection
+from maasserver.models.dnspublication import (
+    DNSPublication,
+    zone_serial,
+)
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from testtools.matchers import (
@@ -24,6 +28,29 @@
 )
 
 
+class TestZoneSerial(MAASServerTestCase):
+    """Tests for the `maasserver_zone_serial_seq` sequence."""
+
+    def test_parameters(self):
+        self.assertThat(
+            zone_serial, MatchesStructure.byEquality(
+                maxvalue=2 ** 32 - 1, minvalue=1, increment=1, cycle=True,
+                owner="maasserver_dnspublication.serial",
+            ))
+
+    def test_parameters_in_database(self):
+        zone_serial.create_if_not_exists()
+        query = (
+            "SELECT start_value, increment_by, max_value, "
+            "min_value, is_cycled FROM %s" % zone_serial.name
+        )
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+            self.assertThat(
+                cursor.fetchone(), Equals(
+                    (1, 1, 2 ** 32 - 1, 1, True)))
+
+
 class TestDNSPublication(MAASServerTestCase):
     """Test the `DNSPublication` model."""
 
@@ -68,10 +95,14 @@
             MatchesStructure(serial=Equals(10)))
 
     def test_get_most_recent_crashes_when_no_publications(self):
-        # This is okay because we're going to ensure (using a migration) that
-        # there is never less than one publication in the table. If this crash
-        # happens we have bigger problems.
-        self.assertRaises(IndexError, DNSPublication.objects.get_most_recent)
+        # This is okay because we ensure (using a migration) that there is
+        # never less than one publication in the table. If this crash happens
+        # we have bigger problems. However, we do not currently use migrations
+        # in tests, so it is important to have a deterministic outcome when
+        # there are no publications.
+        self.assertRaises(
+            DNSPublication.DoesNotExist,
+            DNSPublication.objects.get_most_recent)
 
     def test_collect_garbage_removes_all_but_most_recent_record(self):
         for serial in range(10):
@@ -82,3 +113,8 @@
         self.assertThat(
             DNSPublication.objects.get_most_recent(),
             MatchesStructure(serial=Equals(serial)))
+
+    def test_collect_garbage_does_nothing_when_no_publications(self):
+        self.assertThat(DNSPublication.objects.all(), HasLength(0))
+        DNSPublication.objects.collect_garbage()
+        self.assertThat(DNSPublication.objects.all(), HasLength(0))

=== modified file 'src/maasserver/triggers/system.py'
--- src/maasserver/triggers/system.py	2016-04-29 11:37:21 +0000
+++ src/maasserver/triggers/system.py	2016-04-29 11:37:21 +0000
@@ -787,11 +787,26 @@
 DNS_SUBNET_UPDATE = dedent("""\
     CREATE OR REPLACE FUNCTION sys_dns_subnet_update()
     RETURNS trigger as $$
+    DECLARE
+      changes text[];
     BEGIN
-      IF OLD.cidr != NEW.cidr OR OLD.rdns_mode != NEW.rdns_mode THEN
-        -- Increment the zone serial.
-        PERFORM nextval('maasserver_zone_serial_seq');
-        PERFORM pg_notify('sys_dns', '');
+      IF OLD.cidr != NEW.cidr THEN
+        changes := changes || (
+          'CIDR changed from ' || OLD.cidr || ' to ' || NEW.cidr);
+      END IF;
+      IF OLD.rdns_mode != NEW.rdns_mode THEN
+        changes := changes || (
+          'RDNS mode changed from ' || OLD.rdns_mode || ' to ' ||
+          NEW.rdns_mode);
+      END IF;
+      IF array_length(changes, 1) != 0 THEN
+        INSERT INTO maasserver_dnspublication
+          (serial, created, source)
+        VALUES
+          (nextval('maasserver_zone_serial_seq'), now(),
+           substring(
+             ('Subnet ' || NEW.name || ': ' || array_to_string(changes, ', '))
+             FOR 255));
       END IF;
       RETURN NEW;
     END;
@@ -804,11 +819,25 @@
 DNS_NODE_UPDATE = dedent("""\
     CREATE OR REPLACE FUNCTION sys_dns_node_update()
     RETURNS trigger as $$
+    DECLARE
+      changes text[];
     BEGIN
-      IF OLD.hostname != NEW.hostname OR OLD.domain_id != NEW.domain_id THEN
-        -- Increment the zone serial.
-        PERFORM nextval('maasserver_zone_serial_seq');
-        PERFORM pg_notify('sys_dns', '');
+      IF OLD.hostname != NEW.hostname THEN
+        changes := changes || (
+          'hostname changed from ' || OLD.hostname || ' to ' || NEW.hostname);
+      END IF;
+      IF OLD.domain_id != NEW.domain_id THEN
+        changes := changes || 'domain changed'::text;
+      END IF;
+      IF array_length(changes, 1) != 0 THEN
+        INSERT INTO maasserver_dnspublication
+          (serial, created, source)
+        VALUES
+          (nextval('maasserver_zone_serial_seq'), now(),
+           substring(
+             ('Node ' || NEW.system_id || ': ' ||
+              array_to_string(changes, ', '))
+             FOR 255));
       END IF;
       RETURN NEW;
     END;
@@ -822,14 +851,29 @@
 DNS_INTERFACE_UPDATE = dedent("""\
     CREATE OR REPLACE FUNCTION sys_dns_interface_update()
     RETURNS trigger as $$
+    DECLARE
+      changes text[];
     BEGIN
-      IF (OLD.name != NEW.name OR
-        (OLD.node_id IS NULL AND NEW.node_id IS NOT NULL) OR
-        (OLD.node_id IS NOT NULL AND NEW.node_id IS NULL) OR
-        (OLD.node_id != NEW.node_id)) THEN
-        -- Increment the zone serial.
-        PERFORM nextval('maasserver_zone_serial_seq');
-        PERFORM pg_notify('sys_dns', '');
+      IF OLD.name != NEW.name THEN
+        changes := changes || (
+          'renamed from ' || OLD.name || ' to ' || NEW.name);
+      END IF;
+      IF OLD.node_id IS NULL AND NEW.node_id IS NOT NULL THEN
+        changes := changes || 'node set'::text;
+      ELSIF OLD.node_id IS NOT NULL AND NEW.node_id IS NULL THEN
+        changes := changes || 'node unset'::text;
+      ELSIF OLD.node_id != NEW.node_id THEN
+        changes := changes || 'node changed'::text;
+      END IF;
+      IF array_length(changes, 1) != 0 THEN
+        INSERT INTO maasserver_dnspublication
+          (serial, created, source)
+        VALUES
+          (nextval('maasserver_zone_serial_seq'), now(),
+           substring(
+             ('Interface ' || NEW.name || ': ' ||
+              array_to_string(changes, ', '))
+             FOR 255));
       END IF;
       RETURN NEW;
     END;
@@ -847,10 +891,14 @@
       -- Only care about the
       IF (NEW.name = 'upstream_dns' OR
           NEW.name = 'default_dns_ttl' OR
-          NEW.name = 'windows_kms_host') THEN
-        -- Increment the zone serial.
-        PERFORM nextval('maasserver_zone_serial_seq');
-        PERFORM pg_notify('sys_dns', '');
+          NEW.name = 'windows_kms_host')
+      THEN
+        INSERT INTO maasserver_dnspublication
+          (serial, created, source)
+        VALUES
+          (nextval('maasserver_zone_serial_seq'), now(), substring(
+            ('Configuration ' || NEW.name || ' set to ' || NEW.value)
+            FOR 255));
       END IF;
       RETURN NEW;
     END;
@@ -869,16 +917,33 @@
       IF (OLD.value != NEW.value AND (
           NEW.name = 'upstream_dns' OR
           NEW.name = 'default_dns_ttl' OR
-          NEW.name = 'windows_kms_host')) THEN
-        -- Increment the zone serial.
-        PERFORM nextval('maasserver_zone_serial_seq');
-        PERFORM pg_notify('sys_dns', '');
+          NEW.name = 'windows_kms_host'))
+      THEN
+        INSERT INTO maasserver_dnspublication
+          (serial, created, source)
+        VALUES
+          (nextval('maasserver_zone_serial_seq'), now(), substring(
+            ('Configuration ' || NEW.name || ' changed from ' ||
+             OLD.value || ' to ' || NEW.value)
+            FOR 255));
       END IF;
       RETURN NEW;
     END;
     $$ LANGUAGE plpgsql;
     """)
 
+# Triggered when DNS needs to be published. In essense this means on insert
+# into maasserver_dnspublication.
+DNS_PUBLISH = dedent("""\
+    CREATE OR REPLACE FUNCTION sys_dns_publish()
+    RETURNS trigger AS $$
+    BEGIN
+      PERFORM pg_notify('sys_dns', '');
+      RETURN NEW;
+    END;
+    $$ LANGUAGE plpgsql;
+    """)
+
 
 # Triggered when a subnet is updated. Increments notifies that proxy needs to
 # be updated. Only watches changes on the cidr and allow_proxy.
@@ -896,22 +961,23 @@
 
 
 def render_sys_dns_procedure(proc_name, on_delete=False):
-    """Render a database procedure with name `proc_name` that increments
-    the zone serial and notifies that a DNS update is needed.
+    """Render a database procedure that creates a new DNS publication.
 
     :param proc_name: Name of the procedure.
     :param on_delete: True when procedure will be used as a delete trigger.
     """
     return dedent("""\
-        CREATE OR REPLACE FUNCTION %s() RETURNS trigger AS $$
+        CREATE OR REPLACE FUNCTION {proc}() RETURNS trigger AS $$
         BEGIN
-          -- Increment the zone serial.
-          PERFORM nextval('maasserver_zone_serial_seq');
-          PERFORM pg_notify('sys_dns', '');
-          RETURN %s;
+          INSERT INTO maasserver_dnspublication
+            (serial, created, source)
+          VALUES
+            (nextval('maasserver_zone_serial_seq'), now(),
+             substring('Call to {proc}' FOR 255));
+          RETURN {rval};
         END;
         $$ LANGUAGE plpgsql;
-        """ % (proc_name, 'NEW' if not on_delete else 'OLD'))
+        """).format(proc=proc_name, rval='OLD' if on_delete else 'NEW')
 
 
 def render_sys_proxy_procedure(proc_name, on_delete=False):
@@ -1107,6 +1173,12 @@
         "maasserver_dnsdata",
         "sys_dns_dnsdata_delete", "delete")
 
+    # - DNSPublication
+    register_procedure(DNS_PUBLISH)
+    register_trigger(
+        "maasserver_dnspublication",
+        "sys_dns_publish", "insert")
+
     # - Subnet
     register_procedure(
         render_sys_dns_procedure("sys_dns_subnet_insert"))

=== renamed file 'src/maasserver/triggers/tests/helper.py' => 'src/maasserver/triggers/testing.py'
--- src/maasserver/triggers/tests/helper.py	2016-04-29 11:37:21 +0000
+++ src/maasserver/triggers/testing.py	2016-04-29 11:37:21 +0000
@@ -17,7 +17,7 @@
 from maasserver.models.cacheset import CacheSet
 from maasserver.models.dhcpsnippet import DHCPSnippet
 from maasserver.models.dnsdata import DNSData
-from maasserver.models.dnspublication import zone_serial
+from maasserver.models.dnspublication import DNSPublication
 from maasserver.models.dnsresource import DNSResource
 from maasserver.models.domain import Domain
 from maasserver.models.event import Event
@@ -55,7 +55,15 @@
 )
 from maasserver.utils.threads import deferToDatabase
 from metadataserver.models import NodeResult
-from twisted.internet.defer import inlineCallbacks
+from testtools.matchers import (
+    GreaterThan,
+    Is,
+    Not,
+)
+from twisted.internet.defer import (
+    inlineCallbacks,
+    returnValue,
+)
 
 
 wait_for_reactor = wait_for(30)  # 30 seconds.
@@ -638,12 +646,42 @@
 class DNSHelpersMixin:
     """Helper to get the zone serial and to assert it was incremented."""
 
-    def get_zone_serial_current(self):
-        return deferToDatabase(transactional(zone_serial.current))
-
-    @inlineCallbacks
-    def assertZoneSerialIncrement(self, previous):
-        current = yield deferToDatabase(transactional(zone_serial.current))
-        self.assertTrue(
-            current > previous,
-            "Zone serial was not incremented.")
+    @transactional
+    def getPublication(self):
+        try:
+            return DNSPublication.objects.get_most_recent()
+        except DNSPublication.DoesNotExist:
+            return None
+
+    @inlineCallbacks
+    def capturePublication(self):
+        """Capture the most recent `DNSPublication` record."""
+        self.__publication = yield deferToDatabase(self.getPublication)
+        returnValue(self.__publication)
+
+    def getCapturedPublication(self):
+        """Return the captured publication."""
+        try:
+            return self.__publication
+        except AttributeError:
+            self.fail(
+                "No reference publication has been captured; "
+                "use `capturePublication` before calling "
+                "`getCapturedPublication`.")
+
+    @inlineCallbacks
+    def assertPublicationUpdated(self):
+        """Assert there's a newer `DNSPublication` record.
+
+        Call `capturePublication` first to obtain a reference record.
+        """
+        old = self.getCapturedPublication()
+        new = yield self.capturePublication()
+        if old is None:
+            self.assertThat(
+                new, Not(Is(None)),
+                "DNS has not been published at all.")
+        else:
+            self.assertThat(
+                new.serial, GreaterThan(old.serial),
+                "DNS has not been published again.")

=== modified file 'src/maasserver/triggers/tests/test_system_listener.py'
--- src/maasserver/triggers/tests/test_system_listener.py	2016-03-31 23:34:55 +0000
+++ src/maasserver/triggers/tests/test_system_listener.py	2016-04-29 11:37:21 +0000
@@ -10,6 +10,7 @@
     datetime,
     timedelta,
 )
+import json
 import random
 
 from crochet import wait_for
@@ -29,7 +30,7 @@
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
 from maasserver.triggers.system import register_system_triggers
-from maasserver.triggers.tests.helper import (
+from maasserver.triggers.testing import (
     DNSHelpersMixin,
     TransactionalHelpersMixin,
 )
@@ -37,6 +38,7 @@
 from maasserver.utils.threads import deferToDatabase
 from netaddr import IPAddress
 from provisioningserver.utils.twisted import DeferredValue
+from testtools.matchers import Equals
 from twisted.internet.defer import (
     CancelledError,
     inlineCallbacks,
@@ -2293,7 +2295,7 @@
     @inlineCallbacks
     def test_sends_message_for_domain_insert(self):
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2302,16 +2304,19 @@
         try:
             yield deferToDatabase(self.create_domain)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_domain_insert"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_domain_update(self):
         yield deferToDatabase(register_system_triggers)
         domain = yield deferToDatabase(self.create_domain)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2322,16 +2327,19 @@
                 "name": factory.make_name("domain"),
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_domain_update"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_domain_delete(self):
         yield deferToDatabase(register_system_triggers)
         domain = yield deferToDatabase(self.create_domain)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2340,9 +2348,12 @@
         try:
             yield deferToDatabase(self.delete_domain, domain.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_domain_delete"))
 
 
 class TestDNSStaticIPAddressListener(
@@ -2355,7 +2366,7 @@
     def test_sends_message_for_staticipaddress_update(self):
         yield deferToDatabase(register_system_triggers)
         sip = yield deferToDatabase(self.create_staticipaddress)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2366,9 +2377,12 @@
                 "alloc_type": IPADDRESS_TYPE.STICKY,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_staticipaddress_update"))
 
 
 class TestDNSInterfaceStaticIPAddressListener(
@@ -2381,7 +2395,7 @@
     def test_sends_message_for_interface_staticipaddress_link(self):
         yield deferToDatabase(register_system_triggers)
         interface = yield deferToDatabase(self.create_interface)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2392,9 +2406,12 @@
                 "interface": interface,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_nic_ip_link"))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2404,7 +2421,7 @@
         sip = yield deferToDatabase(self.create_staticipaddress, {
             "interface": interface,
         })
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2413,9 +2430,12 @@
         try:
             yield deferToDatabase(self.delete_staticipaddress, sip.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_nic_ip_unlink"))
 
 
 class TestDNSDNSResourceListener(
@@ -2427,25 +2447,31 @@
     @inlineCallbacks
     def test_sends_message_for_dnsresource_insert(self):
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
             "sys_dns", lambda *args: dv.set(args))
         yield listener.startService()
         try:
-            yield deferToDatabase(self.create_dnsresource)
+            # Pass ip_addresses=[] to avoid an extra .save() -- and thus an
+            # UPDATE -- in the factory method.
+            yield deferToDatabase(
+                self.create_dnsresource, {"ip_addresses": []})
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsresource_insert"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_dnsresource_update(self):
         yield deferToDatabase(register_system_triggers)
         resource = yield deferToDatabase(self.create_dnsresource)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2456,16 +2482,19 @@
                 "name": factory.make_name("resource"),
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsresource_update"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_dnsresource_delete(self):
         yield deferToDatabase(register_system_triggers)
         resource = yield deferToDatabase(self.create_dnsresource)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2474,9 +2503,12 @@
         try:
             yield deferToDatabase(self.delete_dnsresource, resource.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsresource_delete"))
 
 
 class TestDNSDNSResourceStaticIPAddressListener(
@@ -2490,7 +2522,7 @@
         yield deferToDatabase(register_system_triggers)
         resource = yield deferToDatabase(self.create_dnsresource)
         sip = yield deferToDatabase(self.create_staticipaddress)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2499,9 +2531,12 @@
         try:
             yield deferToDatabase(resource.ip_addresses.add, sip)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsresource_ip_link"))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2510,7 +2545,7 @@
         resource = yield deferToDatabase(self.create_dnsresource)
         sip = yield deferToDatabase(self.create_staticipaddress)
         yield deferToDatabase(resource.ip_addresses.add, sip)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2519,9 +2554,12 @@
         try:
             yield deferToDatabase(resource.ip_addresses.remove, sip)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsresource_ip_unlink"))
 
 
 class TestDNSDNSDataListener(
@@ -2533,7 +2571,7 @@
     @inlineCallbacks
     def test_sends_message_for_dnsdata_insert(self):
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2542,9 +2580,12 @@
         try:
             yield deferToDatabase(self.create_dnsdata)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsdata_insert"))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2554,7 +2595,7 @@
             "rrtype": "TXT",
             "rrdata": factory.make_name("txt"),
         })
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2565,16 +2606,19 @@
                 "rrdata": factory.make_name("txt"),
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsdata_update"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_dnsdata_delete(self):
         yield deferToDatabase(register_system_triggers)
         data = yield deferToDatabase(self.create_dnsdata)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2583,9 +2627,12 @@
         try:
             yield deferToDatabase(self.delete_dnsdata, data.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_dnsdata_delete"))
 
 
 class TestDNSSubnetListener(
@@ -2597,7 +2644,7 @@
     @inlineCallbacks
     def test_sends_message_for_subnet_insert(self):
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2606,16 +2653,19 @@
         try:
             yield deferToDatabase(self.create_subnet)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_subnet_insert"))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_subnet_cidr_update(self):
         yield deferToDatabase(register_system_triggers)
         subnet = yield deferToDatabase(self.create_subnet)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2623,43 +2673,53 @@
         yield listener.startService()
         try:
             network = factory.make_ip4_or_6_network()
+            cidr_old, cidr_new = subnet.cidr, str(network.cidr)
             yield deferToDatabase(self.update_subnet, subnet.id, {
-                "cidr": str(network.cidr),
+                "cidr": cidr_new,
                 "gateway_ip": factory.pick_ip_in_network(network),
                 "dns_servers": [],
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Subnet %s: CIDR changed from %s to %s"
+                % (subnet.name, cidr_old, cidr_new)))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_subnet_rdns_mode_update(self):
         yield deferToDatabase(register_system_triggers)
         subnet = yield deferToDatabase(self.create_subnet)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
             "sys_dns", lambda *args: dv.set(args))
         yield listener.startService()
         try:
+            rdns_old = subnet.rdns_mode
+            rdns_new = factory.pick_enum(RDNS_MODE, but_not=[rdns_old])
             yield deferToDatabase(self.update_subnet, subnet.id, {
-                "rdns_mode": factory.pick_enum(
-                    RDNS_MODE, but_not=[subnet.rdns_mode]),
+                "rdns_mode": rdns_new,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Subnet %s: RDNS mode changed from %s to %s"
+                % (subnet.name, rdns_old, rdns_new)))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_subnet_delete(self):
         yield deferToDatabase(register_system_triggers)
         subnet = yield deferToDatabase(self.create_subnet)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2668,9 +2728,12 @@
         try:
             yield deferToDatabase(self.delete_subnet, subnet.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_subnet_delete"))
 
 
 class TestDNSNodeListener(
@@ -2683,20 +2746,26 @@
     def test_sends_message_for_node_update_hostname(self):
         yield deferToDatabase(register_system_triggers)
         node = yield deferToDatabase(self.create_node)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
             "sys_dns", lambda *args: dv.set(args))
         yield listener.startService()
         try:
+            hostname_old = node.hostname
+            hostname_new = factory.make_name("hostname")
             yield deferToDatabase(self.update_node, node.system_id, {
-                "hostname": factory.make_name("hostname"),
+                "hostname": hostname_new,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Node %s: hostname changed from %s to %s"
+                % (node.system_id, hostname_old, hostname_new)))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2704,7 +2773,7 @@
         yield deferToDatabase(register_system_triggers)
         node = yield deferToDatabase(self.create_node)
         domain = yield deferToDatabase(self.create_domain)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2715,16 +2784,19 @@
                 "domain": domain,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Node %s: domain changed" % node.system_id))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_node_delete(self):
         yield deferToDatabase(register_system_triggers)
         node = yield deferToDatabase(self.create_node)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2733,9 +2805,12 @@
         try:
             yield deferToDatabase(self.delete_node, node.system_id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source,
+            Equals("Call to sys_dns_node_delete"))
 
 
 class TestDNSInterfaceListener(
@@ -2764,20 +2839,26 @@
     def test_sends_message_for_interface_update_name(self):
         yield deferToDatabase(register_system_triggers)
         interface = yield deferToDatabase(self.create_interface)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
             "sys_dns", lambda *args: dv.set(args))
         yield listener.startService()
         try:
+            name_old = interface.name
+            name_new = factory.make_name("name")
             yield deferToDatabase(self.update_interface, interface.id, {
-                "name": factory.make_name("name"),
+                "name": name_new,
             })
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Interface %s: renamed from %s to %s"
+                % (name_new, name_old, name_new)))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2785,7 +2866,7 @@
         yield deferToDatabase(register_system_triggers)
         interface = yield deferToDatabase(self.create_unknown_interface)
         node = yield deferToDatabase(self.create_node)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2795,16 +2876,19 @@
             yield deferToDatabase(
                 self.migrate_unknown_to_physical, interface.id, node)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Interface %s: node set" % interface.name))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_physical_to_unknown(self):
         yield deferToDatabase(register_system_triggers)
         interface = yield deferToDatabase(self.create_interface)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2814,9 +2898,12 @@
             yield deferToDatabase(
                 self.migrate_physical_to_unknown, interface.id)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Interface %s: node unset" % interface.name))
 
     @wait_for_reactor
     @inlineCallbacks
@@ -2824,7 +2911,7 @@
         yield deferToDatabase(register_system_triggers)
         interface = yield deferToDatabase(self.create_interface)
         node = yield deferToDatabase(self.create_node)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2834,9 +2921,12 @@
             yield deferToDatabase(
                 self.update_interface, interface.id, {"node": node})
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Interface %s: node changed" % interface.name))
 
 
 class TestDNSConfigListener(
@@ -2847,8 +2937,9 @@
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_upstream_dns_insert(self):
+        upstream_dns_new = factory.make_ip_address()
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2857,17 +2948,22 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "upstream_dns", factory.make_ip_address())
+                "upstream_dns", upstream_dns_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration upstream_dns set to %s"
+                % json.dumps(upstream_dns_new)))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_default_dns_ttl_insert(self):
+        default_dns_ttl_new = random.randint(10, 1000)
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2876,17 +2972,22 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "default_dns_ttl", random.randint(10, 1000))
+                "default_dns_ttl", default_dns_ttl_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration default_dns_ttl set to %s"
+                % json.dumps(default_dns_ttl_new)))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_windows_kms_host_insert(self):
+        kms_host_new = factory.make_name("kms-host-new")
         yield deferToDatabase(register_system_triggers)
-        zone_serial = yield self.get_zone_serial_current()
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2895,20 +2996,26 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "windows_kms_host", factory.make_name("kms"))
+                "windows_kms_host", kms_host_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration windows_kms_host set to %s"
+                % json.dumps(kms_host_new)))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_upstream_dns_update(self):
+        upstream_dns_old = factory.make_ip_address()
+        upstream_dns_new = factory.make_ip_address()
         yield deferToDatabase(register_system_triggers)
         yield deferToDatabase(
             Config.objects.set_config,
-            "upstream_dns", factory.make_ip_address())
-        zone_serial = yield self.get_zone_serial_current()
+            "upstream_dns", upstream_dns_old)
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2917,20 +3024,27 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "upstream_dns", factory.make_ip_address())
+                "upstream_dns", upstream_dns_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration upstream_dns changed from %s to %s"
+                % (json.dumps(upstream_dns_old),
+                   json.dumps(upstream_dns_new))))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_default_dns_ttl_update(self):
+        default_dns_ttl_old = random.randint(10, 1000)
+        default_dns_ttl_new = random.randint(10, 1000)
         yield deferToDatabase(register_system_triggers)
         yield deferToDatabase(
             Config.objects.set_config,
-            "default_dns_ttl", random.randint(10, 1000))
-        zone_serial = yield self.get_zone_serial_current()
+            "default_dns_ttl", default_dns_ttl_old)
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2939,20 +3053,27 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "default_dns_ttl", random.randint(10, 1000))
+                "default_dns_ttl", default_dns_ttl_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration default_dns_ttl changed from %s to %s"
+                % (json.dumps(default_dns_ttl_old),
+                   json.dumps(default_dns_ttl_new))))
 
     @wait_for_reactor
     @inlineCallbacks
     def test_sends_message_for_config_windows_kms_host_update(self):
+        kms_host_old = factory.make_name("kms-host-old")
+        kms_host_new = factory.make_name("kms-host-new")
         yield deferToDatabase(register_system_triggers)
         yield deferToDatabase(
             Config.objects.set_config,
-            "windows_kms_host", factory.make_name("kms"))
-        zone_serial = yield self.get_zone_serial_current()
+            "windows_kms_host", kms_host_old)
+        yield self.capturePublication()
         dv = DeferredValue()
         listener = self.make_listener_without_delay()
         listener.register(
@@ -2961,11 +3082,15 @@
         try:
             yield deferToDatabase(
                 Config.objects.set_config,
-                "windows_kms_host", factory.make_name("kms"))
+                "windows_kms_host", kms_host_new)
             yield dv.get(timeout=2)
-            yield self.assertZoneSerialIncrement(zone_serial)
+            yield self.assertPublicationUpdated()
         finally:
             yield listener.stopService()
+        self.assertThat(
+            self.getCapturedPublication().source, Equals(
+                "Configuration windows_kms_host changed from %s to %s"
+                % (json.dumps(kms_host_old), json.dumps(kms_host_new))))
 
 
 class TestProxySubnetListener(

=== modified file 'src/maasserver/triggers/tests/test_websocket_listener.py'
--- src/maasserver/triggers/tests/test_websocket_listener.py	2016-04-11 16:23:26 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2016-04-29 11:37:21 +0000
@@ -20,7 +20,7 @@
 from maasserver.models.partition import MIN_PARTITION_SIZE
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
-from maasserver.triggers.tests.helper import TransactionalHelpersMixin
+from maasserver.triggers.testing import TransactionalHelpersMixin
 from maasserver.triggers.websocket import register_websocket_triggers
 from maasserver.utils.threads import deferToDatabase
 from provisioningserver.utils.twisted import (