1
=== modified file 'src/maasserver/api/tests/test_ipranges.py'
2
--- src/maasserver/api/tests/test_ipranges.py	2016-04-11 16:23:26 +0000
3
+++ src/maasserver/api/tests/test_ipranges.py	2016-04-26 00:06:28 +0000
4
@@ -92,6 +92,19 @@
5
92
        self.assertThat(data['end_ip'], Equals('10.0.0.20'))
92
        self.assertThat(data['end_ip'], Equals('10.0.0.20'))
6
93
        self.assertThat(data['subnet']['id'], Equals(subnet.id))
93
        self.assertThat(data['subnet']['id'], Equals(subnet.id))
7
94
94
8
95
    def test_create_requires_type_and_reports_simple_error_if_missing(self):
9
96
        self.become_admin()
10
97
        uri = get_ipranges_uri()
11
98
        factory.make_Subnet(cidr='10.0.0.0/24')
12
99
        response = self.client.post(uri, {
13
100
            "start_ip": "10.0.0.10",
14
101
            "end_ip": "10.0.0.20",
15
102
        })
16
103
        self.assertEqual(
17
104
            http.client.BAD_REQUEST, response.status_code, response.content)
18
105
        self.assertThat(response.content, Equals(
19
106
            b'{"type": ["This field is required."]}'))
20
107
21
95
108
22
96
class TestIPRangeAPI(APITestCase):
109
class TestIPRangeAPI(APITestCase):
23
97
110
24
98
111
25
=== modified file 'src/maasserver/models/iprange.py'
26
--- src/maasserver/models/iprange.py	2016-04-11 16:23:26 +0000
27
+++ src/maasserver/models/iprange.py	2016-04-26 00:06:28 +0000
28
@@ -183,12 +183,17 @@
29
183
                validation_errors[field] = [message]
183
                validation_errors[field] = [message]
30
184
            raise ValidationError(validation_errors)
184
            raise ValidationError(validation_errors)
31
185
185
32
186
        # Check against the valid types before going further, since whether
33
187
        # or not the range overlaps anything that could cause an error heavily
34
188
        # depends on its type.
35
189
        valid_types = {choice[0] for choice in IPRANGE_TYPE_CHOICES}
36
186
        """Make sure the new or updated range isn't going to cause a conflict.
190
        """Make sure the new or updated range isn't going to cause a conflict.
37
187
        If it will, raise ValidationError.
191
        If it will, raise ValidationError.
38
188
        """
192
        """
39
189
        # If model is incomplete, save() will fail, so don't bother checking.
193
        # If model is incomplete, save() will fail, so don't bother checking.
42
190
        if self.subnet_id is None or self.start_ip is None or (
194
        if (self.subnet_id is None or self.start_ip is None or
43
191
                self.end_ip is None) or self.type is None:
195
                self.end_ip is None or self.type is None or
44
196
                self.type not in valid_types):
45
192
            return
197
            return
46
193
198
47
194
        # The _state.adding flag is False if this instance exists in the DB.
199
        # The _state.adding flag is False if this instance exists in the DB.
Reviewer	Review Type	Date Requested	Status
Blake Rouse (community)		2016-04-26	Approve on 2016-04-26
Review via email: mp+292869@code.launchpad.net