1
=== modified file 'src/maasserver/api/tests/test_devices.py'
2
--- src/maasserver/api/tests/test_devices.py	2016-04-14 15:25:36 +0000
3
+++ src/maasserver/api/tests/test_devices.py	2016-04-19 16:54:49 +0000
4
@@ -133,6 +133,24 @@
5
133
        self.assertEquals(domain, device.domain)
133
        self.assertEquals(domain, device.domain)
6
134
        self.assertEqual(device.node_type, NODE_TYPE.DEVICE)
134
        self.assertEqual(device.node_type, NODE_TYPE.DEVICE)
7
135
135
8
136
    def test_POST_without_macs_raises_appropriate_error(self):
9
137
        hostname = factory.make_name('host')
10
138
        domain = factory.make_Domain()
11
139
        response = self.client.post(
12
140
            reverse('devices_handler'),
13
141
            {
14
142
                'hostname': hostname,
15
143
                'domain': domain.name,
16
144
            })
17
145
        self.assertEqual(
18
146
            http.client.BAD_REQUEST, response.status_code, response.content)
19
147
20
148
    def test_empty_POST_raises_appropriate_error(self):
21
149
        response = self.client.post(
22
150
            reverse('devices_handler'), {})
23
151
        self.assertEqual(
24
152
            http.client.BAD_REQUEST, response.status_code, response.content)
25
153
26
136
    def test_POST_returns_limited_fields(self):
154
    def test_POST_returns_limited_fields(self):
27
137
        response = self.client.post(
155
        response = self.client.post(
28
138
            reverse('devices_handler'),
156
            reverse('devices_handler'),
29
139
157
30
=== modified file 'src/maasserver/forms.py'
31
--- src/maasserver/forms.py	2016-04-15 22:14:33 +0000
32
+++ src/maasserver/forms.py	2016-04-19 16:54:49 +0000
33
@@ -55,6 +55,7 @@
34
55
    Form,
55
    Form,
35
56
    MultipleChoiceField,
56
    MultipleChoiceField,
36
57
)
57
)
37
58
from django.http import QueryDict
38
58
from django.utils.safestring import mark_safe
59
from django.utils.safestring import mark_safe
39
59
from lxml import etree
60
from lxml import etree
40
60
from maasserver.api.utils import get_overridden_query_dict
61
from maasserver.api.utils import get_overridden_query_dict
41
@@ -128,6 +129,7 @@
42
128
from maasserver.utils.converters import machine_readable_bytes
129
from maasserver.utils.converters import machine_readable_bytes
43
129
from maasserver.utils.forms import (
130
from maasserver.utils.forms import (
44
130
    compose_invalid_choice_text,
131
    compose_invalid_choice_text,
45
132
    get_QueryDict,
46
131
    set_form_error,
133
    set_form_error,
47
132
)
134
)
48
133
from maasserver.utils.orm import (
135
from maasserver.utils.orm import (
49
@@ -1055,6 +1057,12 @@
50
1055
1057
51
1056
    def __init__(self, *args, **kwargs):
1058
    def __init__(self, *args, **kwargs):
52
1057
        super(WithMACAddressesMixin, self).__init__(*args, **kwargs)
1059
        super(WithMACAddressesMixin, self).__init__(*args, **kwargs)
53
1060
        # This is a workaround for a Django bug in which self.data (which is
54
1061
        # supposed to be a QueryDict) ends up being a normal Python dict.
55
1062
        # This class requires a QueryDict (which it seems like Django should
56
1063
        # enforce, for consistency).
57
1064
        if not isinstance(self.data, QueryDict):
58
1065
            self.data = get_QueryDict(self.data)
59
1058
        self.set_up_mac_addresses_field()
1066
        self.set_up_mac_addresses_field()
60
1059
1067
61
1060
    def set_up_mac_addresses_field(self):
1068
    def set_up_mac_addresses_field(self):
62
1061
1069
63
=== modified file 'src/maasserver/tests/test_forms_device.py'
64
--- src/maasserver/tests/test_forms_device.py	2016-03-28 13:54:47 +0000
65
+++ src/maasserver/tests/test_forms_device.py	2016-04-19 16:54:49 +0000
66
@@ -5,10 +5,27 @@
67
5
5
68
6
__all__ = []
6
__all__ = []
69
7
7
71
8
from maasserver.forms import DeviceForm
8
from django.http import HttpRequest
72
9
from django.http.request import QueryDict
73
10
from maasserver.forms import (
74
11
    DeviceForm,
75
12
    DeviceWithMACsForm,
76
13
)
77
14
from maasserver.models import (
78
15
    Device,
79
16
    Interface,
80
17
)
81
9
from maasserver.testing.factory import factory
18
from maasserver.testing.factory import factory
82
10
from maasserver.testing.testcase import MAASServerTestCase
19
from maasserver.testing.testcase import MAASServerTestCase
84
11
from maasserver.utils.orm import reload_object
20
from maasserver.utils.forms import get_QueryDict
85
21
from maasserver.utils.orm import (
86
22
    get_one,
87
23
    reload_object,
88
24
)
89
25
from testtools.matchers import (
90
26
    Contains,
91
27
    Equals,
92
28
)
93
12
29
94
13
30
95
14
class TestDeviceForm(MAASServerTestCase):
31
class TestDeviceForm(MAASServerTestCase):
96
@@ -39,3 +56,48 @@
97
39
        reload_object(parent)
56
        reload_object(parent)
98
40
57
99
41
        self.assertEqual(parent, device.parent)
58
        self.assertEqual(parent, device.parent)
100
59
101
60
102
61
class TestDeviceWithMACsForm(MAASServerTestCase):
103
62
104
63
    def make_request(self):
105
64
        """Return a :class:`HttpRequest` with the given parameters."""
106
65
        request = HttpRequest()
107
66
        request.user = factory.make_User()
108
67
        return request
109
68
110
69
    def test_contains_mac_addresses_field_and_converts_non_querydict(self):
111
70
        form = DeviceWithMACsForm(data={})
112
71
        self.assertThat(form.fields, Contains('mac_addresses'))
113
72
        self.assertIsInstance(form.data, QueryDict)
114
73
115
74
    def test_creates_device_with_mac(self):
116
75
        hostname = factory.make_name("device")
117
76
        mac = factory.make_mac_address()
118
77
        form = DeviceWithMACsForm(data=get_QueryDict({
119
78
            "hostname": hostname,
120
79
            "mac_addresses": mac
121
80
        }), request=self.make_request())
122
81
        self.assertTrue(form.is_valid(), dict(form.errors))
123
82
        form.save()
124
83
        device = get_one(Device.objects.filter(hostname=hostname))
125
84
        self.assertThat(device.hostname, Equals(hostname))
126
85
        iface = get_one(Interface.objects.filter(mac_address=mac))
127
86
        self.assertThat(iface.node, Equals(device))
128
87
129
88
    def test_creates_device_with_macs(self):
130
89
        hostname = factory.make_name("device")
131
90
        mac1 = factory.make_mac_address()
132
91
        mac2 = factory.make_mac_address()
133
92
        form = DeviceWithMACsForm(data=get_QueryDict({
134
93
            "hostname": hostname,
135
94
            "mac_addresses": [mac1, mac2]
136
95
        }), request=self.make_request())
137
96
        self.assertTrue(form.is_valid(), dict(form.errors))
138
97
        form.save()
139
98
        device = get_one(Device.objects.filter(hostname=hostname))
140
99
        self.assertThat(device.hostname, Equals(hostname))
141
100
        iface = get_one(Interface.objects.filter(mac_address=mac1))
142
101
        self.assertThat(iface.node, Equals(device))
143
102
        iface = get_one(Interface.objects.filter(mac_address=mac2))
144
103
        self.assertThat(iface.node, Equals(device))
145
42
104
146
=== modified file 'src/maasserver/utils/forms.py'
147
--- src/maasserver/utils/forms.py	2015-12-01 18:12:59 +0000
148
+++ src/maasserver/utils/forms.py	2016-04-19 16:54:49 +0000
149
@@ -32,9 +32,9 @@
150
32
    )
32
    )
151
33
33
152
34
34
154
35
def get_QueryDict(params):
35
def get_QueryDict(params, mutable=True):
155
36
    """Convert `params` to a `QueryDict`."""
36
    """Convert `params` to a `QueryDict`."""
157
37
    query_dict = QueryDict('', mutable=True)
37
    query_dict = QueryDict('', mutable=mutable)
158
38
    for k, v in params.items():
38
    for k, v in params.items():
159
39
        if isinstance(v, list):
39
        if isinstance(v, list):
160
40
            query_dict.setlist(k, v)
40
            query_dict.setlist(k, v)
Reviewer	Date Requested	Status
Mike Pontillo (community)		Approve on 2016-04-19
Gavin Panella (community)	2016-04-12	Approve on 2016-04-19
Review via email: mp+291580@code.launchpad.net