1
=== modified file 'docs/changelog.rst'
2
--- docs/changelog.rst	2017-03-23 12:20:26 +0000
3
+++ docs/changelog.rst	2017-03-30 17:25:45 +0000
4
@@ -2,6 +2,15 @@
5
2
Changelog
2
Changelog
6
3
=========
3
=========
7
4
4
8
5
2.1.6
9
6
=====
10
7
11
8
Bugs fixed in this release
12
9
--------------------------
13
10
14
11
LP: ##1677507   Fix potential IP allocation from incorrect range.
15
12
16
13
17
5
2.1.5
14
2.1.5
18
6
=====
15
=====
19
7
16
20
8
17
21
=== modified file 'src/maasserver/models/subnet.py'
22
--- src/maasserver/models/subnet.py	2017-02-17 05:34:56 +0000
23
+++ src/maasserver/models/subnet.py	2017-03-30 17:25:45 +0000
24
@@ -593,8 +593,17 @@
25
593
        """
593
        """
26
594
        # Circular imports.
594
        # Circular imports.
27
595
        from maasserver.models import Discovery
595
        from maasserver.models import Discovery
30
596
        return Discovery.objects.filter(
596
        # Note: for the purposes of this function, being in part of a "used"
31
597
            subnet=self).by_unknown_ip().order_by('last_seen').first()
597
        # range (such as a router IP address or reserved range) makes it
32
598
        # "known". So we need to avoid those here in order to avoid stepping
33
599
        # on network infrastructure, reserved ranges, etc.
34
600
        unused = self.get_ipranges_not_in_use(ignore_discovered_ips=True)
35
601
        least_recent_neighbours = Discovery.objects.filter(
36
602
            subnet=self).by_unknown_ip().order_by('last_seen')
37
603
        for neighbor in least_recent_neighbours:
38
604
            if neighbor.ip in unused:
39
605
                return neighbor
40
606
        return None
41
598
607
42
599
    def get_iprange_usage(self, with_neighbours=False) -> MAASIPSet:
608
    def get_iprange_usage(self, with_neighbours=False) -> MAASIPSet:
43
600
        """Returns both the reserved and unreserved IP ranges in this Subnet.
609
        """Returns both the reserved and unreserved IP ranges in this Subnet.
44
601
610
45
=== modified file 'src/maasserver/models/tests/test_subnet.py'
46
--- src/maasserver/models/tests/test_subnet.py	2017-02-17 05:34:56 +0000
47
+++ src/maasserver/models/tests/test_subnet.py	2017-03-30 17:25:45 +0000
48
@@ -919,6 +919,23 @@
49
919
        discovery = subnet.get_least_recently_seen_unknown_neighbour()
919
        discovery = subnet.get_least_recently_seen_unknown_neighbour()
50
920
        self.assertThat(discovery.ip, Equals("10.0.0.2"))
920
        self.assertThat(discovery.ip, Equals("10.0.0.2"))
51
921
921
52
922
    def test__returns_least_recently_seen_neighbour_excludes_in_use(self):
53
923
        # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
54
924
        subnet = factory.make_Subnet(
55
925
            cidr="10.0.0.0/30", gateway_ip=None, dns_servers=None)
56
926
        rackif = factory.make_Interface(vlan=subnet.vlan)
57
927
        now = datetime.now()
58
928
        yesterday = now - timedelta(days=1)
59
929
        factory.make_Discovery(
60
930
            ip="10.0.0.1", interface=rackif, updated=now)
61
931
        factory.make_Discovery(
62
932
            ip="10.0.0.2", interface=rackif, updated=yesterday)
63
933
        factory.make_IPRange(
64
934
            subnet, start_ip="10.0.0.2", end_ip="10.0.0.2",
65
935
            type=IPRANGE_TYPE.RESERVED)
66
936
        discovery = subnet.get_least_recently_seen_unknown_neighbour()
67
937
        self.assertThat(discovery.ip, Equals("10.0.0.1"))
68
938
69
922
    def test__returns_none_if_no_neighbours(self):
939
    def test__returns_none_if_no_neighbours(self):
70
923
        # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
940
        # Note: 10.0.0.0/30 --> 10.0.0.1 and 10.0.0.0.2 are usable.
71
924
        subnet = factory.make_Subnet(
941
        subnet = factory.make_Subnet(
Reviewer	Review Type	Date Requested	Status
Mike Pontillo (community)			Approve on 2017-03-30
Review via email: mp+321472@code.launchpad.net