1
=== modified file 'src/maasserver/api.py'
2
--- src/maasserver/api.py	2014-04-14 23:32:50 +0000
3
+++ src/maasserver/api.py	2014-04-23 07:31:18 +0000
4
@@ -172,7 +172,7 @@
5
172
    Unauthorized,
172
    Unauthorized,
6
173
    )
173
    )
7
174
from maasserver.fields import (
174
from maasserver.fields import (
9
175
    mac_re,
175
    MAC_RE,
10
176
    validate_mac,
176
    validate_mac,
11
177
    )
177
    )
12
178
from maasserver.forms import (
178
from maasserver.forms import (
13
@@ -785,7 +785,7 @@
14
785
        match_macs = get_optional_list(request.GET, 'mac_address')
785
        match_macs = get_optional_list(request.GET, 'mac_address')
15
786
        if match_macs is not None:
786
        if match_macs is not None:
16
787
            invalid_macs = [
787
            invalid_macs = [
18
788
                mac for mac in match_macs if mac_re.match(mac) is None]
788
                mac for mac in match_macs if MAC_RE.match(mac) is None]
19
789
            if len(invalid_macs) != 0:
789
            if len(invalid_macs) != 0:
20
790
                raise ValidationError(
790
                raise ValidationError(
21
791
                    "Invalid MAC address(es): %s" % ", ".join(invalid_macs))
791
                    "Invalid MAC address(es): %s" % ", ".join(invalid_macs))
22
792
792
23
=== modified file 'src/maasserver/fields.py'
24
--- src/maasserver/fields.py	2014-02-21 06:59:04 +0000
25
+++ src/maasserver/fields.py	2014-04-23 07:31:18 +0000
26
@@ -17,6 +17,7 @@
27
17
    "MACAddressField",
17
    "MACAddressField",
28
18
    "MACAddressFormField",
18
    "MACAddressFormField",
29
19
    "register_mac_type",
19
    "register_mac_type",
30
20
    "VerboseRegexValidator",
31
20
    ]
21
    ]
32
21
22
33
22
from copy import deepcopy
23
from copy import deepcopy
34
@@ -33,20 +34,40 @@
35
33
    SubfieldBase,
34
    SubfieldBase,
36
34
    )
35
    )
37
35
from django.forms import (
36
from django.forms import (
38
37
    CharField,
39
36
    ModelChoiceField,
38
    ModelChoiceField,
40
37
    RegexField,
41
38
    )
39
    )
42
40
from django.utils.encoding import force_text
43
39
from maasserver.utils.orm import get_one
41
from maasserver.utils.orm import get_one
44
40
import psycopg2.extensions
42
import psycopg2.extensions
45
41
from south.modelsinspector import add_introspection_rules
43
from south.modelsinspector import add_introspection_rules
46
42
44
47
43
45
54
44
mac_re = re.compile(r'^\s*([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}\s*$')
46
MAC_RE = re.compile(r'^\s*([0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2}\s*$')
55
45
47
56
46
48
57
47
mac_error_msg = "Enter a valid MAC address (e.g. AA:BB:CC:DD:EE:FF)."
49
MAC_ERROR_MSG = "'%(value)s' is not a valid MAC address."
58
48
50
59
49
mac_validator = RegexValidator(regex=mac_re, message=mac_error_msg)
51
60
52
class VerboseRegexValidator(RegexValidator):
61
53
    """A verbose `RegexValidator`.
62
54
63
55
    This `RegexValidator` includes the checked value in the rendered error
64
56
    message when the validation fails.
65
57
    """
66
58
    # Set a bugus code to circumvent Django's attempt to re-interpret a
67
59
    # validator's error message using the field's message it is attached
68
60
    # to.
69
61
    code = 'bogus-code'
70
62
71
63
    def __call__(self, value):
72
64
        """Validates that the input matches the regular expression."""
73
65
        if not self.regex.search(force_text(value)):
74
66
            raise ValidationError(
75
67
                self.message % {'value': value}, code=self.code)
76
68
77
69
78
70
mac_validator = VerboseRegexValidator(regex=MAC_RE, message=MAC_ERROR_MSG)
79
50
71
80
51
72
81
52
def validate_mac(value):
73
def validate_mac(value):
82
@@ -157,12 +178,25 @@
83
157
        return nodegroup
178
        return nodegroup
84
158
179
85
159
180
87
160
class MACAddressFormField(RegexField):
181
class VerboseRegexField(CharField):
88
182
89
183
    def __init__(self, regex, message, *args, **kwargs):
90
184
        """A field that validates its value with a regular expression.
91
185
92
186
        :param regex: Either a string or a compiled regular expression object.
93
187
        :param message: Error message to use when the validation fails.
94
188
        """
95
189
        super(VerboseRegexField, self).__init__(*args, **kwargs)
96
190
        self.validators.append(
97
191
            VerboseRegexValidator(regex=regex, message=message))
98
192
99
193
100
194
class MACAddressFormField(VerboseRegexField):
101
161
    """Form field type: MAC address."""
195
    """Form field type: MAC address."""
102
162
196
103
163
    def __init__(self, *args, **kwargs):
197
    def __init__(self, *args, **kwargs):
104
164
        super(MACAddressFormField, self).__init__(
198
        super(MACAddressFormField, self).__init__(
106
165
            regex=mac_re, error_message=mac_error_msg, *args, **kwargs)
199
            regex=MAC_RE, message=MAC_ERROR_MSG, *args, **kwargs)
107
166
200
108
167
201
109
168
class MACAddressField(Field):
202
class MACAddressField(Field):
110
169
203
111
=== modified file 'src/maasserver/forms.py'
112
--- src/maasserver/forms.py	2014-04-10 20:21:24 +0000
113
+++ src/maasserver/forms.py	2014-04-23 07:31:18 +0000
114
@@ -532,6 +532,33 @@
115
532
532
116
533
IP_BASED_HOSTNAME_REGEXP = re.compile('\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}')
533
IP_BASED_HOSTNAME_REGEXP = re.compile('\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}')
117
534
534
118
535
MAX_MESSAGES = 10
119
536
120
537
121
538
def merge_error_messages(summary, errors, limit=MAX_MESSAGES):
122
539
    """Merge a collection of errors into a summary message of limited size.
123
540
124
541
    :param summary: The message summarizing the error.
125
542
    :type summary: unicode
126
543
    :param errors: The list of errors to merge.
127
544
    :type errors: iterable
128
545
    :param limit: The maximum number of individual error messages to include in
129
546
        the summary error message.
130
547
    :type limit: int
131
548
    """
132
549
    ellipsis_msg = ''
133
550
    if len(errors) > limit:
134
551
        nb_errors = len(errors) - limit
135
552
        ellipsis_msg = (
136
553
            " and %d more error%s" % (
137
554
                nb_errors,
138
555
                's' if nb_errors > 1 else ''))
139
556
    return "%s (%s%s)" % (
140
557
        summary,
141
558
        ' \u2014 '.join(errors[:limit]),
142
559
        ellipsis_msg
143
560
    )
144
561
145
535
562
146
536
class WithMACAddressesMixin:
563
class WithMACAddressesMixin:
147
537
    """A form mixin which dynamically adds a MultipleMACAddressField to the
564
    """A form mixin which dynamically adds a MultipleMACAddressField to the
148
@@ -558,17 +585,19 @@
149
558
            self.errors.get('mac_addresses', None) is not None and
585
            self.errors.get('mac_addresses', None) is not None and
150
559
            len(self.data['mac_addresses']) > 1)
586
            len(self.data['mac_addresses']) > 1)
151
560
        if reformat_mac_address_error:
587
        if reformat_mac_address_error:
154
561
            self.errors['mac_addresses'] = (
588
            self.errors['mac_addresses'] = [merge_error_messages(
155
562
                ['One or more MAC addresses is invalid.'])
589
                "One or more MAC addresses is invalid.",
156
590
                self.errors['mac_addresses'])]
157
563
        return valid
591
        return valid
158
564
592
159
565
    def clean_mac_addresses(self):
593
    def clean_mac_addresses(self):
160
566
        data = self.cleaned_data['mac_addresses']
594
        data = self.cleaned_data['mac_addresses']
161
595
        errors = []
162
567
        for mac in data:
596
        for mac in data:
163
568
            if MACAddress.objects.filter(mac_address=mac.lower()).exists():
597
            if MACAddress.objects.filter(mac_address=mac.lower()).exists():
167
569
                raise ValidationError(
598
                errors.append('MAC address %s already in use.' % mac)
168
570
                    {'mac_addresses': [
599
        if errors:
169
571
                        'Mac address %s already in use.' % mac]})
600
            raise ValidationError({'mac_addresses': errors})
170
572
        return data
601
        return data
171
573
602
172
574
    def save(self):
603
    def save(self):
173
575
604
174
=== modified file 'src/maasserver/tests/test_api_enlistment.py'
175
--- src/maasserver/tests/test_api_enlistment.py	2014-03-27 04:15:45 +0000
176
+++ src/maasserver/tests/test_api_enlistment.py	2014-04-23 07:31:18 +0000
177
@@ -280,7 +280,7 @@
178
280
        self.assertEqual(httplib.BAD_REQUEST, response.status_code)
280
        self.assertEqual(httplib.BAD_REQUEST, response.status_code)
179
281
        self.assertIn('application/json', response['Content-Type'])
281
        self.assertIn('application/json', response['Content-Type'])
180
282
        self.assertEqual(
282
        self.assertEqual(
182
283
            ["Mac address %s already in use." % mac],
283
            ["MAC address %s already in use." % mac],
183
284
            parsed_result['mac_addresses'])
284
            parsed_result['mac_addresses'])
184
285
285
185
286
    def test_POST_fails_with_bad_operation(self):
286
    def test_POST_fails_with_bad_operation(self):
186
@@ -316,7 +316,10 @@
187
316
        self.assertEqual(httplib.BAD_REQUEST, response.status_code)
316
        self.assertEqual(httplib.BAD_REQUEST, response.status_code)
188
317
        self.assertIn('application/json', response['Content-Type'])
317
        self.assertIn('application/json', response['Content-Type'])
189
318
        self.assertEqual(
318
        self.assertEqual(
191
319
            ["One or more MAC addresses is invalid."],
319
            [
192
320
                "One or more MAC addresses is invalid. "
193
321
                "('invalid' is not a valid MAC address.)"
194
322
            ],
195
320
            parsed_result['mac_addresses'])
323
            parsed_result['mac_addresses'])
196
321
324
197
322
    def test_POST_invalid_architecture_returns_bad_request(self):
325
    def test_POST_invalid_architecture_returns_bad_request(self):
198
323
326
199
=== modified file 'src/maasserver/tests/test_api_macaddress.py'
200
--- src/maasserver/tests/test_api_macaddress.py	2014-02-20 10:29:15 +0000
201
+++ src/maasserver/tests/test_api_macaddress.py	2014-04-23 07:31:18 +0000
202
@@ -120,7 +120,7 @@
203
120
        self.assertEqual(400, response.status_code)
120
        self.assertEqual(400, response.status_code)
204
121
        self.assertEqual(['mac_address'], list(parsed_result))
121
        self.assertEqual(['mac_address'], list(parsed_result))
205
122
        self.assertEqual(
122
        self.assertEqual(
207
123
            ["Enter a valid MAC address (e.g. AA:BB:CC:DD:EE:FF)."],
123
            ["'invalid-mac' is not a valid MAC address."],
208
124
            parsed_result['mac_address'])
124
            parsed_result['mac_address'])
209
125
125
210
126
    def test_macs_DELETE_mac(self):
126
    def test_macs_DELETE_mac(self):
211
127
127
212
=== modified file 'src/maasserver/tests/test_api_node.py'
213
--- src/maasserver/tests/test_api_node.py	2014-04-03 16:12:28 +0000
214
+++ src/maasserver/tests/test_api_node.py	2014-04-23 07:31:18 +0000
215
@@ -29,7 +29,7 @@
216
29
    )
29
    )
217
30
from maasserver.fields import (
30
from maasserver.fields import (
218
31
    MAC,
31
    MAC,
220
32
    mac_error_msg,
32
    MAC_ERROR_MSG,
221
33
    )
33
    )
222
34
from maasserver.models import Node
34
from maasserver.models import Node
223
35
from maasserver.testing import (
35
from maasserver.testing import (
224
@@ -574,11 +574,11 @@
225
574
        response = self.client_put(
574
        response = self.client_put(
226
575
            self.get_node_uri(node),
575
            self.get_node_uri(node),
227
576
            {'power_parameters_mac_address': new_power_address})
576
            {'power_parameters_mac_address': new_power_address})
229
577
577
        error_msg = MAC_ERROR_MSG % {'value': new_power_address}
230
578
        self.assertEqual(
578
        self.assertEqual(
231
579
            (
579
            (
232
580
                httplib.BAD_REQUEST,
580
                httplib.BAD_REQUEST,
234
581
                {'power_parameters': ["MAC Address: %s" % mac_error_msg]},
581
                {'power_parameters': ["MAC Address: %s" % error_msg]},
235
582
            ),
582
            ),
236
583
            (response.status_code, json.loads(response.content)))
583
            (response.status_code, json.loads(response.content)))
237
584
584
238
585
585
239
=== modified file 'src/maasserver/tests/test_fields.py'
240
--- src/maasserver/tests/test_fields.py	2014-02-21 03:49:40 +0000
241
+++ src/maasserver/tests/test_fields.py	2014-04-23 07:31:18 +0000
242
@@ -28,6 +28,8 @@
243
28
    NodeGroupFormField,
28
    NodeGroupFormField,
244
29
    register_mac_type,
29
    register_mac_type,
245
30
    validate_mac,
30
    validate_mac,
246
31
    VerboseRegexField,
247
32
    VerboseRegexValidator,
248
31
    )
33
    )
249
32
from maasserver.models import (
34
from maasserver.models import (
250
33
    MACAddress,
35
    MACAddress,
251
@@ -222,6 +224,35 @@
252
222
        pass
224
        pass
253
223
225
254
224
226
255
227
class TestVerboseRegexValidator(MAASServerTestCase):
256
228
257
229
    def test_VerboseRegexValidator_validates_value(self):
258
230
        validator = VerboseRegexValidator(
259
231
            regex="test", message="Unknown value")
260
232
        self.assertIsNone(validator('test'))
261
233
262
234
    def test_VerboseRegexValidator_validation_error_includes_value(self):
263
235
        message = "Unknown value: %(value)s"
264
236
        validator = VerboseRegexValidator(regex="test", message=message)
265
237
        value = factory.make_name('value')
266
238
        error = self.assertRaises(ValidationError, validator, value)
267
239
        self.assertEqual(message % {'value': value}, error.message)
268
240
269
241
270
242
class TestVerboseRegexField(MAASServerTestCase):
271
243
272
244
    def test_VerboseRegexField_accepts_valid_value(self):
273
245
        field = VerboseRegexField(regex="test", message="Unknown value")
274
246
        self.assertEqual('test', field.clean('test'))
275
247
276
248
    def test_VerboseRegexField_validation_error_includes_value(self):
277
249
        message = "Unknown value: %(value)s"
278
250
        field = VerboseRegexField(regex="test", message=message)
279
251
        value = factory.make_name('value')
280
252
        error = self.assertRaises(ValidationError, field.clean, value)
281
253
        self.assertEqual([message % {'value': value}], error.messages)
282
254
283
255
284
225
class TestMACAddressField(MAASServerTestCase):
256
class TestMACAddressField(MAASServerTestCase):
285
226
257
286
227
    def test_mac_address_is_stored_normalized_and_loaded(self):
258
    def test_mac_address_is_stored_normalized_and_loaded(self):
287
228
259
288
=== modified file 'src/maasserver/tests/test_forms.py'
289
--- src/maasserver/tests/test_forms.py	2014-04-10 15:30:11 +0000
290
+++ src/maasserver/tests/test_forms.py	2014-04-23 07:31:18 +0000
291
@@ -47,6 +47,8 @@
292
47
    INTERFACES_VALIDATION_ERROR_MESSAGE,
47
    INTERFACES_VALIDATION_ERROR_MESSAGE,
293
48
    list_all_usable_architectures,
48
    list_all_usable_architectures,
294
49
    MACAddressForm,
49
    MACAddressForm,
295
50
    MAX_MESSAGES,
296
51
    merge_error_messages,
297
50
    NetworkForm,
52
    NetworkForm,
298
51
    NewUserCreationForm,
53
    NewUserCreationForm,
299
52
    NO_ARCHITECTURES_AVAILABLE,
54
    NO_ARCHITECTURES_AVAILABLE,
300
@@ -274,7 +276,7 @@
301
274
        self.assertFalse(form.is_valid())
276
        self.assertFalse(form.is_valid())
302
275
        self.assertEqual(['mac_addresses'], list(form.errors))
277
        self.assertEqual(['mac_addresses'], list(form.errors))
303
276
        self.assertEqual(
278
        self.assertEqual(
305
277
            ['Enter a valid MAC address (e.g. AA:BB:CC:DD:EE:FF).'],
279
            ["'invalid' is not a valid MAC address."],
306
278
            form.errors['mac_addresses'])
280
            form.errors['mac_addresses'])
307
279
281
308
280
    def test_NodeWithMACAddressesForm_multiple_invalid(self):
282
    def test_NodeWithMACAddressesForm_multiple_invalid(self):
309
@@ -287,7 +289,11 @@
310
287
        self.assertFalse(form.is_valid())
289
        self.assertFalse(form.is_valid())
311
288
        self.assertEqual(['mac_addresses'], list(form.errors))
290
        self.assertEqual(['mac_addresses'], list(form.errors))
312
289
        self.assertEqual(
291
        self.assertEqual(
314
290
            ['One or more MAC addresses is invalid.'],
292
            [
315
293
                "One or more MAC addresses is invalid. "
316
294
                "('invalid_1' is not a valid MAC address. \u2014"
317
295
                " 'invalid_2' is not a valid MAC address.)"
318
296
            ],
319
291
            form.errors['mac_addresses'])
297
            form.errors['mac_addresses'])
320
292
298
321
293
    def test_NodeWithMACAddressesForm_empty(self):
299
    def test_NodeWithMACAddressesForm_empty(self):
322
@@ -782,6 +788,38 @@
323
782
            list(form.fields))
788
            list(form.fields))
324
783
789
325
784
790
326
791
class TestMergeErrorMessages(MAASServerTestCase):
327
792
328
793
    def test_merge_error_messages_returns_summary_message(self):
329
794
        summary = factory.make_name('summary')
330
795
        errors = [factory.make_name('error') for _ in range(2)]
331
796
        result = merge_error_messages(summary, errors, 5)
332
797
        self.assertEqual(
333
798
            "%s (%s)" % (summary, ' \u2014 '.join(errors)), result)
334
799
335
800
    def test_merge_error_messages_includes_limited_number_of_msgs(self):
336
801
        summary = factory.make_name('summary')
337
802
        errors = [
338
803
            factory.make_name('error')
339
804
            for _ in range(MAX_MESSAGES + 2)]
340
805
        result = merge_error_messages(summary, errors)
341
806
        self.assertEqual(
342
807
            "%s (%s and 2 more errors)" % (
343
808
                summary, ' \u2014 '.join(errors[:MAX_MESSAGES])),
344
809
            result)
345
810
346
811
    def test_merge_error_messages_with_one_more_error(self):
347
812
        summary = factory.make_name('summary')
348
813
        errors = [
349
814
            factory.make_name('error')
350
815
            for _ in range(MAX_MESSAGES + 1)]
351
816
        result = merge_error_messages(summary, errors)
352
817
        self.assertEqual(
353
818
            "%s (%s and 1 more error)" % (
354
819
                summary, ' \u2014 '.join(errors[:MAX_MESSAGES])),
355
820
            result)
356
821
357
822
358
785
class TestMACAddressForm(MAASServerTestCase):
823
class TestMACAddressForm(MAASServerTestCase):
359
786
824
360
787
    def test_MACAddressForm_creates_mac_address(self):
825
    def test_MACAddressForm_creates_mac_address(self):
Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)		2014-04-18	Approve on 2014-04-22
Review via email: mp+216416@code.launchpad.net