Merge lp:~mpontillo/maas/discovery-view-rdns--bug-1633822--part3 into lp:maas/trunk

[Mike Pontillo]

Update discovery view so that reverse-DNS entries are displayed in the dashboard.

Resubmitting due to weird artifacts from previous branches showing up in the diff.

[lp:~mpontillo/maas/discovery-view-rdns--bug-1633822--part3]

5509. By Mike Pontillo on 2016-10-21

Merge rdns-service--bug-1633822--part2.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/dbviews.py'
--- src/maasserver/dbviews.py	2016-10-04 18:30:11 +0000
+++ src/maasserver/dbviews.py	2016-10-21 01:24:17 +0000
@@ -55,7 +55,8 @@
         neigh.created AS first_seen,
         GREATEST(neigh.updated, mdns.updated) AS last_seen,
         mdns.id AS mdns_id,
-        mdns.hostname AS hostname,
+        -- Trust reverse-DNS more than multicast DNS.
+        COALESCE(rdns.hostname, mdns.hostname) AS hostname,
         node.id AS observer_id,
         node.system_id AS observer_system_id,
         node.hostname AS observer_hostname, -- This will be the rack hostname.
@@ -81,6 +82,7 @@
     JOIN maasserver_vlan vlan ON iface.vlan_id = vlan.id
     JOIN maasserver_fabric fabric ON vlan.fabric_id = fabric.id
     LEFT OUTER JOIN maasserver_mdns mdns ON mdns.ip = neigh.ip
+    LEFT OUTER JOIN maasserver_rdns rdns ON rdns.ip = neigh.ip
     LEFT OUTER JOIN maasserver_subnet subnet ON (
         vlan.id = subnet.vlan_id
         -- This checks if the IP address is within a known subnet.
@@ -90,7 +92,8 @@
         neigh.mac_address,
         neigh.ip,
         neigh.updated DESC, -- We want the most recently seen neighbour.
-        mdns.updated DESC, -- We want the most recently seen hostname.
+        rdns.updated DESC, -- We want the most recently seen reverse DNS entry.
+        mdns.updated DESC, -- We want the most recently seen mDNS hostname.
         subnet_prefixlen DESC -- We want the best-match CIDR.
     """)
 

=== modified file 'src/maasserver/models/tests/test_discovery.py'
--- src/maasserver/models/tests/test_discovery.py	2016-09-29 01:39:17 +0000
+++ src/maasserver/models/tests/test_discovery.py	2016-10-21 01:24:17 +0000
@@ -126,6 +126,28 @@
         discovery = Discovery.objects.first()
         self.assertThat(discovery.is_external_dhcp, Equals(True))
 
+    def test__exposes_mdns_when_nothing_better_available(self):
+        rack = factory.make_RackController()
+        iface = factory.make_Interface(node=rack)
+        ip = factory.make_ip_address(ipv6=False)
+        mdns_hostname = factory.make_hostname()
+        factory.make_Discovery(interface=iface, ip=ip)
+        factory.make_MDNS(hostname=mdns_hostname, ip=ip, interface=iface)
+        discovery = Discovery.objects.first()
+        self.assertThat(discovery.hostname, Equals(mdns_hostname))
+
+    def test__prefers_rdns_to_mdns(self):
+        rack = factory.make_RackController()
+        iface = factory.make_Interface(node=rack)
+        ip = factory.make_ip_address(ipv6=False)
+        mdns_hostname = factory.make_hostname()
+        rdns_hostname = factory.make_hostname()
+        factory.make_Discovery(interface=iface, ip=ip)
+        factory.make_MDNS(hostname=mdns_hostname, ip=ip, interface=iface)
+        factory.make_RDNS(hostname=rdns_hostname, ip=ip, observer=rack)
+        discovery = Discovery.objects.first()
+        self.assertThat(discovery.hostname, Equals(rdns_hostname))
+
 
 class TestDiscoveryManagerClear(MAASServerTestCase):
     """Tests for `DiscoveryManager.clear` """