Merge lp:~mpontillo/maas/mdns-observer-traceback--bug-1673916--2.1 into lp:maas/2.1

[Mike Pontillo]

Merge revision 5839 from trunk. Fixes regression on rack-based mDNS monitoring service.

Also: update changelog.

[Mike Pontillo (mpontillo)]

Self-review backport.

review: Approve

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2017-03-17 23:24:25 +0000
+++ docs/changelog.rst	2017-03-22 18:55:24 +0000
@@ -2,6 +2,19 @@
 Changelog
 =========
 
+2.1.5
+=====
+
+Bugs fixed in this release
+--------------------------
+
+LP: #1671891    Fix deployment with AUTO IPs set as the gateway link.
+
+LP: #1671048    Fix crash when getting the default gateways for a machine.
+
+LP: #1673916    Fix regression that causes traceback in rack-based mDNS monitoring service.
+
+
 2.1.4
 =====
 
@@ -36,8 +49,6 @@
 
 LP: #1665143    Select the shortest by-id path when discovering block devices to address issues when discovering nvme devices.
 
-LP: #1671891    Fix deployment with AUTO IPs set as the gateway link.
-
 
 Other notable changes
 ---------------------

=== modified file 'src/provisioningserver/rackdservices/networks_monitoring_service.py'
--- src/provisioningserver/rackdservices/networks_monitoring_service.py	2017-02-14 18:24:19 +0000
+++ src/provisioningserver/rackdservices/networks_monitoring_service.py	2017-03-22 18:55:24 +0000
@@ -70,6 +70,6 @@
     def reportMDNSEntries(self, mdns):
         """Report mDNS entries to the region."""
         d = self.clientService.getClientNow()
-        d.addCleanup(lambda client: client(
+        d.addCallback(lambda client: client(
             ReportMDNSEntries, system_id=client.localIdent, mdns=mdns))
         return d

=== modified file 'src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py'
--- src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py	2016-10-04 00:35:24 +0000
+++ src/provisioningserver/rackdservices/tests/test_networks_monitoring_service.py	2017-03-22 18:55:24 +0000
@@ -96,6 +96,28 @@
                 neighbours=neighbours))
 
     @inlineCallbacks
+    def test_reports_mdns_to_region(self):
+        fixture = self.useFixture(MockLiveClusterToRegionRPCFixture())
+        protocol, connecting = fixture.makeEventLoop(
+            region.UpdateInterfaces, region.ReportMDNSEntries)
+        self.addCleanup((yield connecting))
+        rpc_service = services.getServiceNamed('rpc')
+        service = RackNetworksMonitoringService(
+            rpc_service, Clock(), enable_monitoring=False)
+        mdns = [
+            {
+                'interface': 'eth0',
+                'hostname': 'boggle.example.com',
+                'address': factory.make_ip_address(),
+            }
+        ]
+        yield service.reportMDNSEntries(mdns)
+        self.assertThat(
+            protocol.ReportMDNSEntries, MockCalledOnceWith(
+                protocol, system_id=rpc_service.getClient().localIdent,
+                mdns=mdns))
+
+    @inlineCallbacks
     def test_asks_region_for_monitoring_state(self):
         fixture = self.useFixture(MockLiveClusterToRegionRPCFixture())
         protocol, connecting = fixture.makeEventLoop(