1
=== modified file 'src/maasserver/models/staticipaddress.py'
2
--- src/maasserver/models/staticipaddress.py	2016-05-11 19:01:48 +0000
3
+++ src/maasserver/models/staticipaddress.py	2016-05-26 12:46:12 +0000
4
@@ -304,7 +304,7 @@
5
304
304
6
305
        # DISTINCT ON returns the first matching row for any given
305
        # DISTINCT ON returns the first matching row for any given
7
306
        # hostname, using the query's ordering.  Here, we're trying to
306
        # hostname, using the query's ordering.  Here, we're trying to
9
307
        # return the IP for the oldest Interface address.
307
        # return the IPs for the oldest Interface address.
10
308
        #
308
        #
11
309
        # For nodes that have disable_ipv4 set, leave out any IPv4 address.
309
        # For nodes that have disable_ipv4 set, leave out any IPv4 address.
12
310
        if isinstance(domain_or_subnet, Subnet):
310
        if isinstance(domain_or_subnet, Subnet):
13
@@ -331,12 +331,16 @@
14
331
                    domain.ttl,
331
                    domain.ttl,
15
332
                    %s)""" % default_ttl
332
                    %s)""" % default_ttl
16
333
        sql_query = """
333
        sql_query = """
18
334
            SELECT DISTINCT ON (node.hostname, family(staticip.ip))
334
            SELECT DISTINCT ON (node.hostname, is_boot, family(staticip.ip))
19
335
                node.hostname,
335
                node.hostname,
20
336
                node.system_id,
336
                node.system_id,
21
337
                node.node_type,
337
                node.node_type,
22
338
                """ + ttl_clause + """ AS ttl,
338
                """ + ttl_clause + """ AS ttl,
24
339
                domain.name, staticip.ip
339
                domain.name, staticip.ip,
25
340
                (
26
341
                    node.boot_interface_id IS NOT NULL AND
27
342
                    node.boot_interface_id = interface.id
28
343
                ) as is_boot
29
340
            FROM
344
            FROM
30
341
                maasserver_interface AS interface
345
                maasserver_interface AS interface
31
342
            LEFT OUTER JOIN maasserver_interfacerelationship AS rel ON
346
            LEFT OUTER JOIN maasserver_interfacerelationship AS rel ON
32
@@ -366,6 +370,7 @@
33
366
                )
370
                )
34
367
            ORDER BY
371
            ORDER BY
35
368
                node.hostname,
372
                node.hostname,
36
373
                is_boot,
37
369
                family(staticip.ip),
374
                family(staticip.ip),
38
370
                CASE
375
                CASE
39
371
                    WHEN interface.type = 'bond' AND
376
                    WHEN interface.type = 'bond' AND
40
@@ -401,14 +406,30 @@
41
401
        # We get user reserved et al mappings first, so that we can overwrite
406
        # We get user reserved et al mappings first, so that we can overwrite
42
402
        # TTL as we process the return from the SQL horror above.
407
        # TTL as we process the return from the SQL horror above.
43
403
        mapping = self._get_user_reserved_mappings(domain_or_subnet)
408
        mapping = self._get_user_reserved_mappings(domain_or_subnet)
44
409
        iface_is_boot = defaultdict(bool, {
45
410
            hostname: True for hostname in mapping.keys()
46
411
        })
47
404
        cursor.execute(sql_query, (domain_or_subnet.id,))
412
        cursor.execute(sql_query, (domain_or_subnet.id,))
48
413
        # The records from the query provide, for each hostname (after
49
414
        # stripping domain), the boot and non-boot interface ip address in ipv4
50
415
        # and ipv6.  Our task: if there are boot interace IPs, they win.  If
51
416
        # there are none, then whatever we got wins.  The ORDER BY means that
52
417
        # we will see all of the non-boot interfaces before we see any boot
53
418
        # interface IPs.  See Bug#1584850
54
405
        for (node_name, system_id, node_type,
419
        for (node_name, system_id, node_type,
56
406
                ttl, domain_name, ip) in cursor.fetchall():
420
                ttl, domain_name, ip, is_boot) in cursor.fetchall():
57
407
            hostname = "%s.%s" % (strip_domain(node_name), domain_name)
421
            hostname = "%s.%s" % (strip_domain(node_name), domain_name)
58
408
            mapping[hostname].node_type = node_type
422
            mapping[hostname].node_type = node_type
59
409
            mapping[hostname].system_id = system_id
423
            mapping[hostname].system_id = system_id
60
410
            mapping[hostname].ttl = ttl
424
            mapping[hostname].ttl = ttl
62
411
            mapping[hostname].ips.add(ip)
425
            # If this is a boot interface, and we have previously only found
63
426
            # non-boot interface IPs, discard them. See also Bug#1584850.
64
427
            if is_boot and not iface_is_boot[hostname]:
65
428
                mapping[hostname].ips = set()
66
429
                iface_is_boot[hostname] = True
67
430
            # At this point, if the interface type is correct, keep the IP.
68
431
            if is_boot == iface_is_boot[hostname]:
69
432
                mapping[hostname].ips.add(ip)
70
412
        return mapping
433
        return mapping
71
413
434
72
414
    def filter_by_ip_family(self, family):
435
    def filter_by_ip_family(self, family):
73
415
436
74
=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
75
--- src/maasserver/models/tests/test_staticipaddress.py	2016-05-12 19:07:37 +0000
76
+++ src/maasserver/models/tests/test_staticipaddress.py	2016-05-26 12:46:12 +0000
77
@@ -5,7 +5,10 @@
78
5
5
79
6
__all__ = []
6
__all__ = []
80
7
7
82
8
from random import randint
8
from random import (
83
9
    randint,
84
10
    shuffle,
85
11
)
86
9
from unittest import skip
12
from unittest import skip
87
10
from unittest.mock import sentinel
13
from unittest.mock import sentinel
88
11
14
89
@@ -756,6 +759,42 @@
90
756
        self.assertEqual({node.fqdn: HostnameIPMapping(
759
        self.assertEqual({node.fqdn: HostnameIPMapping(
91
757
            node.system_id, 30, {sip1.ip}, node.node_type)}, mapping)
760
            node.system_id, 30, {sip1.ip}, node.node_type)}, mapping)
92
758
761
93
762
    def test_get_hostname_ip_mapping_does_not_return_discovered_and_auto(self):
94
763
        # Create a situation where we have an AUTO ip on the pxeboot interface,
95
764
        # and a discovered IP of the other address class (v4/v6) on another
96
765
        # interface.
97
766
        domain = Domain.objects.get_default_domain()
98
767
        cidrs = [factory.make_ipv6_network(), factory.make_ipv4_network()]
99
768
        shuffle(cidrs)
100
769
        subnets = [factory.make_Subnet(cidr=cidr) for cidr in cidrs]
101
770
        # First, make a node with an interface on subnets[0].  Assign the boot
102
771
        # interface an AUTO IP on subnets[0].
103
772
        node = factory.make_Node_with_Interface_on_Subnet(
104
773
            hostname=factory.make_name('host'), subnet=subnets[0],
105
774
            vlan=subnets[0].vlan, disable_ipv4=False)
106
775
        sip0 = node.boot_interface.ip_addresses.first()
107
776
        ip0 = factory.pick_ip_in_network(cidrs[0])
108
777
        sip0.ip = ip0
109
778
        sip0.alloc_type = IPADDRESS_TYPE.AUTO
110
779
        sip0.save()
111
780
        # Now create another interface, and give it a DISCOVERED IP of the
112
781
        # other family from subnets[1].
113
782
        iface1 = factory.make_Interface(node=node, vlan=subnets[1].vlan)
114
783
        ip1 = factory.pick_ip_in_network(cidrs[1])
115
784
        sip1 = factory.make_StaticIPAddress(
116
785
            subnet=subnets[1], ip=ip1,
117
786
            alloc_type=IPADDRESS_TYPE.DISCOVERED
118
787
            )
119
788
        iface1.ip_addresses.add(sip1)
120
789
        iface1.save()
121
790
        # The only mapping we should get is for the boot interface.
122
791
        mapping = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
123
792
        expected_mapping = {
124
793
            node.fqdn: HostnameIPMapping(
125
794
                node.system_id, 30, {sip0.ip}, node.node_type
126
795
            )}
127
796
        self.assertEqual(expected_mapping, mapping)
128
797
129
759
798
130
760
class TestStaticIPAddress(MAASServerTestCase):
799
class TestStaticIPAddress(MAASServerTestCase):
131
761
800
Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2016-05-24	Approve on 2016-05-26
Review via email: mp+295630@code.launchpad.net