1
=== modified file 'src/maasserver/api/interfaces.py'
2
--- src/maasserver/api/interfaces.py	2017-03-29 13:34:01 +0000
3
+++ src/maasserver/api/interfaces.py	2017-04-20 22:42:24 +0000
4
@@ -124,7 +124,26 @@
5
124
        """
124
        """
6
125
        node = Node.objects.get_node_or_404(
125
        node = Node.objects.get_node_or_404(
7
126
            system_id, request.user, NODE_PERMISSION.VIEW)
126
            system_id, request.user, NODE_PERMISSION.VIEW)
9
127
        return node.interface_set.all()
127
        queryset = node.interface_set.all()
10
128
        prefetch_related_fields = [
11
129
            'node',
12
130
            'vlan__primary_rack',
13
131
            'vlan__secondary_rack',
14
132
            'vlan__fabric__vlan_set',
15
133
            'vlan__space',
16
134
            'parents',
17
135
            'ip_addresses__subnet',
18
136
            # Prefetch 3 levels deep, anything more will require extra queries.
19
137
            'children_relationships__child__vlan',
20
138
            ('children_relationships__child__'
21
139
             'children_relationships__child__vlan'),
22
140
            ('children_relationships__child__'
23
141
             'children_relationships__child__'
24
142
             'children_relationships__child__vlan'),
25
143
        ]
26
144
        for prefetch in prefetch_related_fields:
27
145
            queryset = queryset.prefetch_related(prefetch)
28
146
        return queryset
29
128
147
30
129
    @operation(idempotent=False)
148
    @operation(idempotent=False)
31
130
    def create_physical(self, request, system_id):
149
    def create_physical(self, request, system_id):
32
131
150
33
=== modified file 'src/maasserver/api/nodes.py'
34
--- src/maasserver/api/nodes.py	2017-04-17 17:25:47 +0000
35
+++ src/maasserver/api/nodes.py	2017-04-20 22:42:24 +0000
36
@@ -352,14 +352,20 @@
37
352
            'boot_interface__parents',
352
            'boot_interface__parents',
38
353
            ('boot_interface__children_relationships__child__'
353
            ('boot_interface__children_relationships__child__'
39
354
             'children_relationships__child'),
354
             'children_relationships__child'),
40
355
            'interface_set__node',
41
355
            'interface_set__vlan__primary_rack',
356
            'interface_set__vlan__primary_rack',
42
356
            'interface_set__vlan__secondary_rack',
357
            'interface_set__vlan__secondary_rack',
43
357
            'interface_set__vlan__fabric__vlan_set',
358
            'interface_set__vlan__fabric__vlan_set',
44
358
            'interface_set__vlan__space',
359
            'interface_set__vlan__space',
45
359
            'interface_set__parents',
360
            'interface_set__parents',
46
360
            'interface_set__ip_addresses__subnet',
361
            'interface_set__ip_addresses__subnet',
49
361
            ('interface_set__children_relationships__child__'
362
            # Prefetch 3 levels deep, anything more will require extra queries.
50
362
             'children_relationships__child'),
363
            'interface_set__children_relationships__child__vlan',
51
364
            ('interface_set__children_relationships__child__'
52
365
             'children_relationships__child__vlan'),
53
366
            ('interface_set__children_relationships__child__'
54
367
             'children_relationships__child__'
55
368
             'children_relationships__child__vlan'),
56
363
            'tags',
369
            'tags',
57
364
        ]
370
        ]
58
365
        for prefetch in prefetch_related_fields:
371
        for prefetch in prefetch_related_fields:
59
366
372
60
=== modified file 'src/maasserver/api/tests/test_interfaces.py'
61
--- src/maasserver/api/tests/test_interfaces.py	2017-01-28 00:51:47 +0000
62
+++ src/maasserver/api/tests/test_interfaces.py	2017-04-20 22:42:24 +0000
63
@@ -9,6 +9,7 @@
64
9
import random
9
import random
65
10
10
66
11
from django.core.urlresolvers import reverse
11
from django.core.urlresolvers import reverse
67
12
from maasserver import middleware
68
12
from maasserver.enum import (
13
from maasserver.enum import (
69
13
    INTERFACE_LINK_TYPE,
14
    INTERFACE_LINK_TYPE,
70
14
    INTERFACE_TYPE,
15
    INTERFACE_TYPE,
71
@@ -24,6 +25,7 @@
72
24
from maasserver.testing.factory import factory
25
from maasserver.testing.factory import factory
73
25
from maasserver.utils.converters import json_load_bytes
26
from maasserver.utils.converters import json_load_bytes
74
26
from maasserver.utils.orm import reload_object
27
from maasserver.utils.orm import reload_object
75
28
from maastesting.djangotestcase import count_queries
76
27
from testtools.matchers import (
29
from testtools.matchers import (
77
28
    Contains,
30
    Contains,
78
29
    ContainsDict,
31
    ContainsDict,
79
@@ -135,6 +137,42 @@
80
135
        self.assertEqual(
137
        self.assertEqual(
81
136
            interface.id, json_load_bytes(response.content)[0]['id'])
138
            interface.id, json_load_bytes(response.content)[0]['id'])
82
137
139
83
140
    def test_read_uses_constant_number_of_queries(self):
84
141
        # Patch middleware so it does not affect query counting.
85
142
        self.patch(
86
143
            middleware.ExternalComponentsMiddleware,
87
144
            '_check_rack_controller_connectivity')
88
145
89
146
        node = factory.make_Node()
90
147
        bond1, parents1, children1 = make_complex_interface(node)
91
148
        uri = get_interfaces_uri(node)
92
149
93
150
        num_queries1, response1 = count_queries(self.client.get, uri)
94
151
95
152
        bond2, parents2, children2 = make_complex_interface(node)
96
153
        num_queries2, response2 = count_queries(self.client.get, uri)
97
154
98
155
        # Make sure the responses are ok as it's not useful to compare the
99
156
        # number of queries if they are not.
100
157
        parsed_result_1 = json_load_bytes(response1.content)
101
158
        parsed_result_2 = json_load_bytes(response2.content)
102
159
        self.assertEqual(
103
160
            [
104
161
                http.client.OK, http.client.OK,
105
162
                len([bond1] + parents1 + children1),
106
163
                len(
107
164
                    [bond1, bond2] +
108
165
                    parents1 + parents2 +
109
166
                    children1 + children2),
110
167
            ],
111
168
            [
112
169
                response1.status_code,
113
170
                response2.status_code,
114
171
                len(parsed_result_1),
115
172
                len(parsed_result_2),
116
173
            ])
117
174
        self.assertEqual(num_queries1, num_queries2)
118
175
119
138
    def test_create_physical(self):
176
    def test_create_physical(self):
120
139
        self.become_admin()
177
        self.become_admin()
121
140
        for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
178
        for status in (NODE_STATUS.READY, NODE_STATUS.BROKEN):
Reviewer	Review Type	Date Requested	Status
Mike Pontillo (community)		2017-04-20	Approve on 2017-04-20
Review via email: mp+322887@code.launchpad.net