MAAS

Merge ~newell-jensen/maas:network-testing-api-doc-examples into maas:master

  1. Git
  2. lp:~newell-jensen/maas
  3. network-testing-api-doc-examples
  4. Merge into master
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 42d598bb6e67f6b7fa15a4de830deb246c701522
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:network-testing-api-doc-examples
Merge into: maas:master
Diff against target: 1246 lines (+351/-0)
4 files modified
src/maasserver/api/examples/machines.json (+245/-0)
src/maasserver/api/examples/nodes.json (+63/-0)
src/maasserver/api/examples/rackcontrollers.json (+32/-0)
src/maasserver/api/examples/regioncontrollers.json (+11/-0)
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+369197@code.launchpad.net

Commit message

Add interface_speed, link_connected, link_speed, interface_test_status, and interface_test_status_name to the api doc examples.

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b network-testing-api-doc-examples lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5911/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/api/examples/machines.json b/src/maasserver/api/examples/machines.json
2index 844deec..d757ffb 100644
3--- a/src/maasserver/api/examples/machines.json
4+++ b/src/maasserver/api/examples/machines.json
5@@ -52,6 +52,9 @@
6 "links": [],
7 "id": 69,
8 "parents": [],
9+ "link_connected": true,
10+ "interface_speed": 1000,
11+ "link_speed": 1000,
12 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/"
13 },
14 {
15@@ -92,6 +95,9 @@
16 "links": [],
17 "id": 70,
18 "parents": [],
19+ "link_connected": true,
20+ "interface_speed": 1000,
21+ "link_speed": 1000,
22 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/"
23 },
24 {
25@@ -132,6 +138,9 @@
26 "links": [],
27 "id": 71,
28 "parents": [],
29+ "link_connected": true,
30+ "interface_speed": 1000,
31+ "link_speed": 1000,
32 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/"
33 },
34 {
35@@ -174,6 +183,9 @@
36 "eth-D6eWMG",
37 "eth-jazQFg"
38 ],
39+ "link_connected": true,
40+ "interface_speed": 1000,
41+ "link_speed": 1000,
42 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/"
43 }
44 ],
45@@ -429,6 +441,9 @@
46 "links": [],
47 "id": 69,
48 "parents": [],
49+ "link_connected": true,
50+ "interface_speed": 1000,
51+ "link_speed": 1000,
52 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/"
53 },
54 "default_gateways": {
55@@ -449,6 +464,8 @@
56 "hostname": "newname",
57 "description": "Optional description for the machine.",
58 "testing_status_name": "Failed",
59+ "interface_test_status_name": "Unknown",
60+ "interface_test_status": -1,
61 "resource_uri": "/MAAS/api/2.0/machines/d8n3re/"
62 },
63 "machines-deploy": {
64@@ -501,6 +518,9 @@
65 "links": [],
66 "id": 69,
67 "parents": [],
68+ "link_connected": true,
69+ "interface_speed": 1000,
70+ "link_speed": 1000,
71 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/"
72 },
73 {
74@@ -541,6 +561,9 @@
75 "links": [],
76 "id": 70,
77 "parents": [],
78+ "link_connected": true,
79+ "interface_speed": 1000,
80+ "link_speed": 1000,
81 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/"
82 },
83 {
84@@ -581,6 +604,9 @@
85 "links": [],
86 "id": 71,
87 "parents": [],
88+ "link_connected": true,
89+ "interface_speed": 1000,
90+ "link_speed": 1000,
91 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/"
92 },
93 {
94@@ -623,6 +649,9 @@
95 "eth-D6eWMG",
96 "eth-jazQFg"
97 ],
98+ "link_connected": true,
99+ "interface_speed": 1000,
100+ "link_speed": 1000,
101 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/"
102 }
103 ],
104@@ -878,6 +907,9 @@
105 "links": [],
106 "id": 69,
107 "parents": [],
108+ "link_connected": true,
109+ "interface_speed": 1000,
110+ "link_speed": 1000,
111 "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/"
112 },
113 "default_gateways": {
114@@ -898,6 +930,8 @@
115 "hostname": "newname",
116 "description": "Optional description for the machine.",
117 "testing_status_name": "Failed",
118+ "interface_test_status_name": "Unknown",
119+ "interface_test_status": -1,
120 "resource_uri": "/MAAS/api/2.0/machines/d8n3re/"
121 },
122 "machines-release": {
123@@ -1044,6 +1078,9 @@
124 "tag-VOqx2b"
125 ],
126 "type": "physical",
127+ "link_connected": true,
128+ "interface_speed": 1000,
129+ "link_speed": 1000,
130 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
131 },
132 "hardware_info": {
133@@ -1178,6 +1215,9 @@
134 "tag-VOqx2b"
135 ],
136 "type": "physical",
137+ "link_connected": true,
138+ "interface_speed": 1000,
139+ "link_speed": 1000,
140 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
141 },
142 {
143@@ -1256,6 +1296,9 @@
144 "tag-RwynT2"
145 ],
146 "type": "physical",
147+ "link_connected": true,
148+ "interface_speed": 1000,
149+ "link_speed": 1000,
150 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/"
151 },
152 {
153@@ -1334,6 +1377,9 @@
154 "tag-PnEfvN"
155 ],
156 "type": "physical",
157+ "link_connected": true,
158+ "interface_speed": 1000,
159+ "link_speed": 1000,
160 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/"
161 },
162 {
163@@ -1411,6 +1457,9 @@
164 "tag-QK7j09"
165 ],
166 "type": "vlan",
167+ "link_connected": true,
168+ "interface_speed": 1000,
169+ "link_speed": 1000,
170 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/"
171 },
172 {
173@@ -1489,6 +1538,9 @@
174 "tag-GsPX3m"
175 ],
176 "type": "vlan",
177+ "link_connected": true,
178+ "interface_speed": 1000,
179+ "link_speed": 1000,
180 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/"
181 },
182 {
183@@ -1567,6 +1619,9 @@
184 "tag-xhApes"
185 ],
186 "type": "vlan",
187+ "link_connected": true,
188+ "interface_speed": 1000,
189+ "link_speed": 1000,
190 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/"
191 }
192 ],
193@@ -1803,6 +1858,8 @@
194 "owner": null,
195 "address_ttl": null,
196 "swap_size": null,
197+ "interface_test_status_name": "Unknown",
198+ "interface_test_status": -1,
199 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
200 },
201 "machines-commission": {
202@@ -1932,6 +1989,9 @@
203 "tags": [],
204 "parents": [],
205 "system_id": "8bk8nn",
206+ "link_connected": true,
207+ "interface_speed": 1000,
208+ "link_speed": 1000,
209 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/"
210 },
211 "interface_set": [
212@@ -1967,6 +2027,9 @@
213 "tags": [],
214 "parents": [],
215 "system_id": "8bk8nn",
216+ "link_connected": true,
217+ "interface_speed": 1000,
218+ "link_speed": 1000,
219 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/"
220 }
221 ],
222@@ -2055,6 +2118,8 @@
223 "system_id": "8bk8nn",
224 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/"
225 },
226+ "interface_test_status_name": "Unknown",
227+ "interface_test_status": -1,
228 "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/"
229 },
230 "machines-set-storage": {
231@@ -2184,6 +2249,9 @@
232 "tags": [],
233 "parents": [],
234 "system_id": "8bk8nn",
235+ "link_connected": true,
236+ "interface_speed": 1000,
237+ "link_speed": 1000,
238 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/"
239 },
240 "interface_set": [
241@@ -2219,6 +2287,9 @@
242 "tags": [],
243 "parents": [],
244 "system_id": "8bk8nn",
245+ "link_connected": true,
246+ "interface_speed": 1000,
247+ "link_speed": 1000,
248 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/"
249 }
250 ],
251@@ -2307,6 +2378,8 @@
252 "system_id": "8bk8nn",
253 "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/"
254 },
255+ "interface_test_status_name": "Unknown",
256+ "interface_test_status": -1,
257 "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/"
258 },
259 "machines-mount-special": {
260@@ -2500,6 +2573,9 @@
261 "product": null,
262 "id": 37,
263 "type": "physical",
264+ "link_connected": true,
265+ "interface_speed": 1000,
266+ "link_speed": 1000,
267 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
268 },
269 {
270@@ -2578,6 +2654,9 @@
271 "product": null,
272 "id": 38,
273 "type": "physical",
274+ "link_connected": true,
275+ "interface_speed": 1000,
276+ "link_speed": 1000,
277 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/"
278 },
279 {
280@@ -2656,6 +2735,9 @@
281 "product": null,
282 "id": 39,
283 "type": "physical",
284+ "link_connected": true,
285+ "interface_speed": 1000,
286+ "link_speed": 1000,
287 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/"
288 },
289 {
290@@ -2733,6 +2815,9 @@
291 "product": null,
292 "id": 40,
293 "type": "vlan",
294+ "link_connected": true,
295+ "interface_speed": 1000,
296+ "link_speed": 1000,
297 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/"
298 },
299 {
300@@ -2811,6 +2896,9 @@
301 "product": null,
302 "id": 41,
303 "type": "vlan",
304+ "link_connected": true,
305+ "interface_speed": 1000,
306+ "link_speed": 1000,
307 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/"
308 },
309 {
310@@ -2889,6 +2977,9 @@
311 "product": null,
312 "id": 42,
313 "type": "vlan",
314+ "link_connected": true,
315+ "interface_speed": 1000,
316+ "link_speed": 1000,
317 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/"
318 }
319 ],
320@@ -3036,6 +3127,9 @@
321 "product": null,
322 "id": 37,
323 "type": "physical",
324+ "link_connected": true,
325+ "interface_speed": 1000,
326+ "link_speed": 1000,
327 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
328 },
329 "raids": [],
330@@ -3220,6 +3314,8 @@
331 "power_state": "on",
332 "hostname": "above-robin",
333 "description": "Optional description for the machine.",
334+ "interface_test_status_name": "Unknown",
335+ "interface_test_status": -1,
336 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
337 },
338 "machines-unmount-special": {
339@@ -3413,6 +3509,9 @@
340 "product": null,
341 "id": 37,
342 "type": "physical",
343+ "link_connected": true,
344+ "interface_speed": 1000,
345+ "link_speed": 1000,
346 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
347 },
348 {
349@@ -3491,6 +3590,9 @@
350 "product": null,
351 "id": 38,
352 "type": "physical",
353+ "link_connected": true,
354+ "interface_speed": 1000,
355+ "link_speed": 1000,
356 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/"
357 },
358 {
359@@ -3569,6 +3671,9 @@
360 "product": null,
361 "id": 39,
362 "type": "physical",
363+ "link_connected": true,
364+ "interface_speed": 1000,
365+ "link_speed": 1000,
366 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/"
367 },
368 {
369@@ -3646,6 +3751,9 @@
370 "product": null,
371 "id": 40,
372 "type": "vlan",
373+ "link_connected": true,
374+ "interface_speed": 1000,
375+ "link_speed": 1000,
376 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/"
377 },
378 {
379@@ -3724,6 +3832,9 @@
380 "product": null,
381 "id": 41,
382 "type": "vlan",
383+ "link_connected": true,
384+ "interface_speed": 1000,
385+ "link_speed": 1000,
386 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/"
387 },
388 {
389@@ -3802,6 +3913,9 @@
390 "product": null,
391 "id": 42,
392 "type": "vlan",
393+ "link_connected": true,
394+ "interface_speed": 1000,
395+ "link_speed": 1000,
396 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/"
397 }
398 ],
399@@ -3949,6 +4063,9 @@
400 "product": null,
401 "id": 37,
402 "type": "physical",
403+ "link_connected": true,
404+ "interface_speed": 1000,
405+ "link_speed": 1000,
406 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
407 },
408 "raids": [],
409@@ -4133,6 +4250,8 @@
410 "power_state": "on",
411 "hostname": "above-robin",
412 "description": "Optional description for the machine.",
413+ "interface_test_status_name": "Unknown",
414+ "interface_test_status": -1,
415 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
416 },
417 "machines-clear-gateways": {
418@@ -4215,6 +4334,9 @@
419 ],
420 "mac_address": "cb:93:ac:d1:ed:65",
421 "effective_mtu": 1500,
422+ "link_connected": true,
423+ "interface_speed": 1000,
424+ "link_speed": 1000,
425 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
426 },
427 "locked": false,
428@@ -4436,6 +4558,9 @@
429 ],
430 "mac_address": "cb:93:ac:d1:ed:65",
431 "effective_mtu": 1500,
432+ "link_connected": true,
433+ "interface_speed": 1000,
434+ "link_speed": 1000,
435 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
436 },
437 {
438@@ -4514,6 +4639,9 @@
439 ],
440 "mac_address": "bc:d3:d5:28:88:dc",
441 "effective_mtu": 1500,
442+ "link_connected": true,
443+ "interface_speed": 1000,
444+ "link_speed": 1000,
445 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/"
446 },
447 {
448@@ -4592,6 +4720,9 @@
449 ],
450 "mac_address": "ad:5a:3e:a3:68:13",
451 "effective_mtu": 1500,
452+ "link_connected": true,
453+ "interface_speed": 1000,
454+ "link_speed": 1000,
455 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/"
456 },
457 {
458@@ -4669,6 +4800,9 @@
459 ],
460 "mac_address": "cb:93:ac:d1:ed:65",
461 "effective_mtu": 1500,
462+ "link_connected": true,
463+ "interface_speed": 1000,
464+ "link_speed": 1000,
465 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/"
466 },
467 {
468@@ -4747,6 +4881,9 @@
469 ],
470 "mac_address": "bc:d3:d5:28:88:dc",
471 "effective_mtu": 1500,
472+ "link_connected": true,
473+ "interface_speed": 1000,
474+ "link_speed": 1000,
475 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/"
476 },
477 {
478@@ -4825,6 +4962,9 @@
479 ],
480 "mac_address": "ad:5a:3e:a3:68:13",
481 "effective_mtu": 1500,
482+ "link_connected": true,
483+ "interface_speed": 1000,
484+ "link_speed": 1000,
485 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/"
486 }
487 ],
488@@ -5038,6 +5178,8 @@
489 "mainboard_firmware_version": "Unknown",
490 "mainboard_firmware_date": "Unknown"
491 },
492+ "interface_test_status_name": "Unknown",
493+ "interface_test_status": -1,
494 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
495 },
496 "machines-restore-networking": {
497@@ -5395,6 +5537,8 @@
498 "other_test_status": 2,
499 "storage_test_status_name": "Passed",
500 "cpu_count": 3,
501+ "interface_test_status_name": "Unknown",
502+ "interface_test_status": -1,
503 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
504 },
505 "machines-restore-storage": {
506@@ -5752,6 +5896,8 @@
507 "commissioning_status_name": "Passed",
508 "locked": false,
509 "virtualblockdevice_set": [],
510+ "interface_test_status_name": "Unknown",
511+ "interface_test_status": -1,
512 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
513 },
514 "machines-restore-default": {
515@@ -6109,6 +6255,8 @@
516 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/blockdevices/20/"
517 }
518 ],
519+ "interface_test_status_name": "Unknown",
520+ "interface_test_status": -1,
521 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
522 },
523 "machines-mark-broken": {
524@@ -6466,6 +6614,8 @@
525 "other_test_status": 2,
526 "boot_interface": null,
527 "virtualblockdevice_set": [],
528+ "interface_test_status_name": "Unknown",
529+ "interface_test_status": -1,
530 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
531 },
532 "machines-mark-fixed": {
533@@ -6823,6 +6973,8 @@
534 "netboot": true,
535 "status_name": "Ready",
536 "iscsiblockdevice_set": [],
537+ "interface_test_status_name": "Unknown",
538+ "interface_test_status": -1,
539 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
540 },
541 "machines-rescue-mode": {
542@@ -6952,6 +7104,9 @@
543 "tags": [],
544 "parents": [],
545 "system_id": "a8m7sr",
546+ "link_connected": true,
547+ "interface_speed": 1000,
548+ "link_speed": 1000,
549 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/"
550 },
551 "interface_set": [
552@@ -6987,6 +7142,9 @@
553 "tags": [],
554 "parents": [],
555 "system_id": "a8m7sr",
556+ "link_connected": true,
557+ "interface_speed": 1000,
558+ "link_speed": 1000,
559 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/"
560 }
561 ],
562@@ -7075,6 +7233,8 @@
563 "system_id": "a8m7sr",
564 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/"
565 },
566+ "interface_test_status_name": "Unknown",
567+ "interface_test_status": -1,
568 "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/"
569 },
570 "machines-exit-rescue-mode": {
571@@ -7204,6 +7364,9 @@
572 "tags": [],
573 "parents": [],
574 "system_id": "a8m7sr",
575+ "link_connected": true,
576+ "interface_speed": 1000,
577+ "link_speed": 1000,
578 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/"
579 },
580 "interface_set": [
581@@ -7239,6 +7402,9 @@
582 "tags": [],
583 "parents": [],
584 "system_id": "a8m7sr",
585+ "link_connected": true,
586+ "interface_speed": 1000,
587+ "link_speed": 1000,
588 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/"
589 }
590 ],
591@@ -7327,6 +7493,8 @@
592 "system_id": "a8m7sr",
593 "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/"
594 },
595+ "interface_test_status_name": "Unknown",
596+ "interface_test_status": -1,
597 "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/"
598 },
599 "machines-lock": {
600@@ -7451,6 +7619,9 @@
601 "discovered": null,
602 "vendor": null,
603 "id": 46,
604+ "link_connected": true,
605+ "interface_speed": 1000,
606+ "link_speed": 1000,
607 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/"
608 },
609 {
610@@ -7528,6 +7699,9 @@
611 "discovered": null,
612 "vendor": null,
613 "id": 47,
614+ "link_connected": true,
615+ "interface_speed": 1000,
616+ "link_speed": 1000,
617 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/"
618 },
619 {
620@@ -7605,6 +7779,9 @@
621 "discovered": null,
622 "vendor": null,
623 "id": 48,
624+ "link_connected": true,
625+ "interface_speed": 1000,
626+ "link_speed": 1000,
627 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/"
628 },
629 {
630@@ -7684,6 +7861,9 @@
631 "discovered": null,
632 "vendor": null,
633 "id": 49,
634+ "link_connected": true,
635+ "interface_speed": 1000,
636+ "link_speed": 1000,
637 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/"
638 },
639 {
640@@ -7763,6 +7943,9 @@
641 "discovered": null,
642 "vendor": null,
643 "id": 50,
644+ "link_connected": true,
645+ "interface_speed": 1000,
646+ "link_speed": 1000,
647 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/"
648 },
649 {
650@@ -7842,6 +8025,9 @@
651 "discovered": null,
652 "vendor": null,
653 "id": 51,
654+ "link_connected": true,
655+ "interface_speed": 1000,
656+ "link_speed": 1000,
657 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/"
658 }
659 ],
660@@ -7921,6 +8107,9 @@
661 "discovered": null,
662 "vendor": null,
663 "id": 46,
664+ "link_connected": true,
665+ "interface_speed": 1000,
666+ "link_speed": 1000,
667 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/"
668 },
669 "status_message": "(admin)",
670@@ -8246,6 +8435,8 @@
671 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/blockdevices/24/"
672 }
673 ],
674+ "interface_test_status_name": "Unknown",
675+ "interface_test_status": -1,
676 "resource_uri": "/MAAS/api/2.0/machines/recrwg/"
677 },
678 "machines-unlock": {
679@@ -8523,6 +8714,9 @@
680 "name": "eth-xMPy44",
681 "vendor": null,
682 "system_id": "recrwg",
683+ "link_connected": true,
684+ "interface_speed": 1000,
685+ "link_speed": 1000,
686 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/"
687 },
688 {
689@@ -8600,6 +8794,9 @@
690 "name": "eth-y3Syjk",
691 "vendor": null,
692 "system_id": "recrwg",
693+ "link_connected": true,
694+ "interface_speed": 1000,
695+ "link_speed": 1000,
696 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/"
697 },
698 {
699@@ -8677,6 +8874,9 @@
700 "name": "eth-mrQO2Y",
701 "vendor": null,
702 "system_id": "recrwg",
703+ "link_connected": true,
704+ "interface_speed": 1000,
705+ "link_speed": 1000,
706 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/"
707 },
708 {
709@@ -8756,6 +8956,9 @@
710 "name": "eth-xMPy44.10",
711 "vendor": null,
712 "system_id": "recrwg",
713+ "link_connected": true,
714+ "interface_speed": 1000,
715+ "link_speed": 1000,
716 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/"
717 },
718 {
719@@ -8835,6 +9038,9 @@
720 "name": "eth-y3Syjk.10",
721 "vendor": null,
722 "system_id": "recrwg",
723+ "link_connected": true,
724+ "interface_speed": 1000,
725+ "link_speed": 1000,
726 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/"
727 },
728 {
729@@ -8914,6 +9120,9 @@
730 "name": "eth-mrQO2Y.10",
731 "vendor": null,
732 "system_id": "recrwg",
733+ "link_connected": true,
734+ "interface_speed": 1000,
735+ "link_speed": 1000,
736 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/"
737 }
738 ],
739@@ -9117,6 +9326,9 @@
740 "name": "eth-xMPy44",
741 "vendor": null,
742 "system_id": "recrwg",
743+ "link_connected": true,
744+ "interface_speed": 1000,
745+ "link_speed": 1000,
746 "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/"
747 },
748 "distro_series": "",
749@@ -9165,6 +9377,8 @@
750 "resource_uri": "/MAAS/api/2.0/resourcepool/0/"
751 },
752 "power_type": "virsh",
753+ "interface_test_status_name": "Unknown",
754+ "interface_test_status": -1,
755 "resource_uri": "/MAAS/api/2.0/machines/recrwg/"
756 },
757 "machines-create": {
758@@ -9206,6 +9420,9 @@
759 "enabled": true,
760 "firmware_version": null,
761 "name": "eth0",
762+ "link_connected": true,
763+ "interface_speed": 1000,
764+ "link_speed": 1000,
765 "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/"
766 },
767 "cache_sets": [],
768@@ -9239,6 +9456,9 @@
769 "enabled": true,
770 "firmware_version": null,
771 "name": "eth0",
772+ "link_connected": false,
773+ "interface_speed": 0,
774+ "link_speed": 0,
775 "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/"
776 }
777 ],
778@@ -9308,6 +9528,8 @@
779 "memory_test_status": -1,
780 "raids": [],
781 "hwe_kernel": null,
782+ "interface_test_status_name": "Unknown",
783+ "interface_test_status": -1,
784 "resource_uri": "/MAAS/api/2.0/machines/p37gqk/"
785 },
786 "machines-allocate": {
787@@ -9580,6 +9802,9 @@
788 "id": 37,
789 "params": "",
790 "name": "eth-lKRYAa",
791+ "link_connected": true,
792+ "interface_speed": 1000,
793+ "link_speed": 1000,
794 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
795 },
796 "osystem": "",
797@@ -9777,6 +10002,9 @@
798 "id": 37,
799 "params": "",
800 "name": "eth-lKRYAa",
801+ "link_connected": true,
802+ "interface_speed": 1000,
803+ "link_speed": 1000,
804 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/"
805 },
806 {
807@@ -9855,6 +10083,9 @@
808 "id": 38,
809 "params": "",
810 "name": "eth-3ookc5",
811+ "link_connected": true,
812+ "interface_speed": 1000,
813+ "link_speed": 1000,
814 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/"
815 },
816 {
817@@ -9933,6 +10164,9 @@
818 "id": 39,
819 "params": "",
820 "name": "eth-W8E8f0",
821+ "link_connected": true,
822+ "interface_speed": 1000,
823+ "link_speed": 1000,
824 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/"
825 },
826 {
827@@ -10010,6 +10244,9 @@
828 "id": 40,
829 "params": "",
830 "name": "eth-lKRYAa.42",
831+ "link_connected": true,
832+ "interface_speed": 1000,
833+ "link_speed": 1000,
834 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/"
835 },
836 {
837@@ -10088,6 +10325,9 @@
838 "id": 41,
839 "params": "",
840 "name": "eth-3ookc5.42",
841+ "link_connected": true,
842+ "interface_speed": 1000,
843+ "link_speed": 1000,
844 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/"
845 },
846 {
847@@ -10166,6 +10406,9 @@
848 "id": 42,
849 "params": "",
850 "name": "eth-W8E8f0.42",
851+ "link_connected": true,
852+ "interface_speed": 1000,
853+ "link_speed": 1000,
854 "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/"
855 }
856 ],
857@@ -10214,6 +10457,8 @@
858 "cpu_speed": 0,
859 "cache_sets": [],
860 "owner_data": {},
861+ "interface_test_status_name": "Unknown",
862+ "interface_test_status": -1,
863 "resource_uri": "/MAAS/api/2.0/machines/thr3am/"
864 }
865 }
866diff --git a/src/maasserver/api/examples/nodes.json b/src/maasserver/api/examples/nodes.json
867index 1a4db79..23c19dd 100644
868--- a/src/maasserver/api/examples/nodes.json
869+++ b/src/maasserver/api/examples/nodes.json
870@@ -38,6 +38,9 @@
871 "links": [],
872 "effective_mtu": 1500,
873 "product": null,
874+ "link_connected": true,
875+ "interface_speed": 1000,
876+ "link_speed": 1000,
877 "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/"
878 },
879 "memory": 8192,
880@@ -224,6 +227,9 @@
881 "links": [],
882 "effective_mtu": 1500,
883 "product": null,
884+ "link_connected": true,
885+ "interface_speed": 1000,
886+ "link_speed": 1000,
887 "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/"
888 },
889 {
890@@ -264,6 +270,9 @@
891 "links": [],
892 "effective_mtu": 1500,
893 "product": null,
894+ "link_connected": true,
895+ "interface_speed": 1000,
896+ "link_speed": 1000,
897 "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/113/"
898 },
899 {
900@@ -304,6 +313,9 @@
901 "links": [],
902 "effective_mtu": 1500,
903 "product": null,
904+ "link_connected": true,
905+ "interface_speed": 1000,
906+ "link_speed": 1000,
907 "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/114/"
908 },
909 {
910@@ -346,6 +358,9 @@
911 "links": [],
912 "effective_mtu": 1500,
913 "product": null,
914+ "link_connected": true,
915+ "interface_speed": 1000,
916+ "link_speed": 1000,
917 "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/115/"
918 }
919 ],
920@@ -440,6 +455,8 @@
921 "other_test_status_name": "Passed",
922 "virtualblockdevice_set": [],
923 "cpu_speed": 0,
924+ "interface_test_status_name": "Unknown",
925+ "interface_test_status": -1,
926 "resource_uri": "/MAAS/api/2.0/machines/g8xyqs/"
927 },
928 "details": {
929@@ -630,6 +647,9 @@
930 }
931 }
932 ],
933+ "link_connected": true,
934+ "interface_speed": 1000,
935+ "link_speed": 1000,
936 "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/1/"
937 },
938 {
939@@ -699,6 +719,9 @@
940 }
941 }
942 ],
943+ "link_connected": true,
944+ "interface_speed": 1000,
945+ "link_speed": 1000,
946 "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/17/"
947 }
948 ],
949@@ -731,6 +754,8 @@
950 "storage_test_status_name": "Unknown",
951 "architecture": "amd64/generic",
952 "cpu_test_status_name": "Unknown",
953+ "interface_test_status_name": "Unknown",
954+ "interface_test_status": -1,
955 "resource_uri": "/MAAS/api/2.0/rackcontrollers/6gsym8/"
956 }
957 ],
958@@ -811,6 +836,9 @@
959 }
960 ],
961 "discovered": null,
962+ "link_connected": true,
963+ "interface_speed": 1000,
964+ "link_speed": 1000,
965 "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/"
966 },
967 "swap_size": null,
968@@ -942,6 +970,9 @@
969 }
970 ],
971 "discovered": null,
972+ "link_connected": true,
973+ "interface_speed": 1000,
974+ "link_speed": 1000,
975 "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/"
976 },
977 {
978@@ -1016,6 +1047,9 @@
979 }
980 ],
981 "discovered": null,
982+ "link_connected": true,
983+ "interface_speed": 1000,
984+ "link_speed": 1000,
985 "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/101/"
986 },
987 {
988@@ -1091,6 +1125,9 @@
989 }
990 ],
991 "discovered": null,
992+ "link_connected": true,
993+ "interface_speed": 1000,
994+ "link_speed": 1000,
995 "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/102/"
996 }
997 ],
998@@ -1429,6 +1466,8 @@
999 "ip_addresses": [
1000 "172.16.1.252"
1001 ],
1002+ "interface_test_status_name": "Unknown",
1003+ "interface_test_status": -1,
1004 "resource_uri": "/MAAS/api/2.0/machines/q46awd/"
1005 },
1006 "query-power-state": {
1007@@ -1513,6 +1552,9 @@
1008 "tags": [],
1009 "type": "physical",
1010 "params": "",
1011+ "link_connected": true,
1012+ "interface_speed": 1000,
1013+ "link_speed": 1000,
1014 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1015 },
1016 "boot_disk": {
1017@@ -1734,6 +1776,9 @@
1018 "tags": [],
1019 "type": "physical",
1020 "params": "",
1021+ "link_connected": true,
1022+ "interface_speed": 1000,
1023+ "link_speed": 1000,
1024 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1025 }
1026 ],
1027@@ -1820,6 +1865,8 @@
1028 "status_name": "Deployed",
1029 "storage_test_status_name": "Passed",
1030 "owner": "admin",
1031+ "interface_test_status_name": "Unknown",
1032+ "interface_test_status": -1,
1033 "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/"
1034 },
1035 "power-off": {
1036@@ -1901,6 +1948,9 @@
1037 "tags": [],
1038 "type": "physical",
1039 "params": "",
1040+ "link_connected": true,
1041+ "interface_speed": 1000,
1042+ "link_speed": 1000,
1043 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1044 },
1045 "boot_disk": {
1046@@ -2122,6 +2172,9 @@
1047 "tags": [],
1048 "type": "physical",
1049 "params": "",
1050+ "link_connected": true,
1051+ "interface_speed": 1000,
1052+ "link_speed": 1000,
1053 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1054 }
1055 ],
1056@@ -2208,6 +2261,8 @@
1057 "status_name": "Deployed",
1058 "storage_test_status_name": "Passed",
1059 "owner": "admin",
1060+ "interface_test_status_name": "Unknown",
1061+ "interface_test_status": -1,
1062 "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/"
1063 },
1064 "test": {
1065@@ -2365,6 +2420,9 @@
1066 "system_id": "e8xa8m",
1067 "enabled": true,
1068 "name": "ens4",
1069+ "link_connected": true,
1070+ "interface_speed": 1000,
1071+ "link_speed": 1000,
1072 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1073 },
1074 "pod": {
1075@@ -2592,10 +2650,15 @@
1076 "system_id": "e8xa8m",
1077 "enabled": true,
1078 "name": "ens4",
1079+ "link_connected": true,
1080+ "interface_speed": 1000,
1081+ "link_speed": 1000,
1082 "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/"
1083 }
1084 ],
1085 "commissioning_status_name": "Passed",
1086+ "interface_test_status_name": "Unknown",
1087+ "interface_test_status": -1,
1088 "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/"
1089 },
1090 "get-power-params": {
1091diff --git a/src/maasserver/api/examples/rackcontrollers.json b/src/maasserver/api/examples/rackcontrollers.json
1092index 8f29006..e74aacc 100644
1093--- a/src/maasserver/api/examples/rackcontrollers.json
1094+++ b/src/maasserver/api/examples/rackcontrollers.json
1095@@ -43,6 +43,9 @@
1096 "params": "",
1097 "vendor": null,
1098 "type": "physical",
1099+ "link_connected": true,
1100+ "interface_speed": 1000,
1101+ "link_speed": 1000,
1102 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/"
1103 },
1104 {
1105@@ -83,6 +86,9 @@
1106 "params": "",
1107 "vendor": null,
1108 "type": "physical",
1109+ "link_connected": true,
1110+ "interface_speed": 1000,
1111+ "link_speed": 1000,
1112 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/"
1113 },
1114 {
1115@@ -160,6 +166,9 @@
1116 "params": "",
1117 "vendor": null,
1118 "type": "physical",
1119+ "link_connected": true,
1120+ "interface_speed": 1000,
1121+ "link_speed": 1000,
1122 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/"
1123 },
1124 {
1125@@ -240,6 +249,9 @@
1126 "params": "",
1127 "vendor": null,
1128 "type": "bond",
1129+ "link_connected": true,
1130+ "interface_speed": 1000,
1131+ "link_speed": 1000,
1132 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/"
1133 },
1134 {
1135@@ -319,6 +331,9 @@
1136 "params": "",
1137 "vendor": null,
1138 "type": "vlan",
1139+ "link_connected": true,
1140+ "interface_speed": 1000,
1141+ "link_speed": 1000,
1142 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/"
1143 }
1144 ],
1145@@ -541,6 +556,9 @@
1146 "mac_address": "f9:d6:ff:1b:a9:64",
1147 "system_id": "fcka3t",
1148 "effective_mtu": 1500,
1149+ "link_connected": true,
1150+ "interface_speed": 1000,
1151+ "link_speed": 1000,
1152 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/"
1153 },
1154 {
1155@@ -581,6 +599,9 @@
1156 "mac_address": "4f:e6:e6:df:61:ec",
1157 "system_id": "fcka3t",
1158 "effective_mtu": 1500,
1159+ "link_connected": true,
1160+ "interface_speed": 1000,
1161+ "link_speed": 1000,
1162 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/"
1163 },
1164 {
1165@@ -658,6 +679,9 @@
1166 "mac_address": "ac:8e:44:fc:d0:97",
1167 "system_id": "fcka3t",
1168 "effective_mtu": 1500,
1169+ "link_connected": true,
1170+ "interface_speed": 1000,
1171+ "link_speed": 1000,
1172 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/"
1173 },
1174 {
1175@@ -738,6 +762,9 @@
1176 "mac_address": "b6:b4:a9:23:a9:af",
1177 "system_id": "fcka3t",
1178 "effective_mtu": 1500,
1179+ "link_connected": true,
1180+ "interface_speed": 1000,
1181+ "link_speed": 1000,
1182 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/"
1183 },
1184 {
1185@@ -817,6 +844,9 @@
1186 "mac_address": "b6:b4:a9:23:a9:af",
1187 "system_id": "fcka3t",
1188 "effective_mtu": 1500,
1189+ "link_connected": true,
1190+ "interface_speed": 1000,
1191+ "link_speed": 1000,
1192 "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/"
1193 }
1194 ],
1195@@ -916,6 +946,8 @@
1196 },
1197 "cpu_count": 0,
1198 "commissioning_status_name": "Unknown",
1199+ "interface_test_status_name": "Unknown",
1200+ "interface_test_status": -1,
1201 "resource_uri": "/MAAS/api/2.0/rackcontrollers/fcka3t/"
1202 }
1203 }
1204diff --git a/src/maasserver/api/examples/regioncontrollers.json b/src/maasserver/api/examples/regioncontrollers.json
1205index 7c6159c..8fe2f09 100644
1206--- a/src/maasserver/api/examples/regioncontrollers.json
1207+++ b/src/maasserver/api/examples/regioncontrollers.json
1208@@ -102,6 +102,9 @@
1209 },
1210 "system_id": "ccfqya",
1211 "children": [],
1212+ "link_connected": true,
1213+ "interface_speed": 1000,
1214+ "link_speed": 1000,
1215 "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/1/"
1216 },
1217 {
1218@@ -138,6 +141,9 @@
1219 "children": [
1220 "br0"
1221 ],
1222+ "link_connected": true,
1223+ "interface_speed": 1000,
1224+ "link_speed": 1000,
1225 "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/2/"
1226 },
1227 {
1228@@ -209,6 +215,9 @@
1229 },
1230 "system_id": "ccfqya",
1231 "children": [],
1232+ "link_connected": true,
1233+ "interface_speed": 1000,
1234+ "link_speed": 1000,
1235 "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/3/"
1236 }
1237 ],
1238@@ -243,6 +252,8 @@
1239 "other_test_status": -1,
1240 "cpu_test_status_name": "Unknown",
1241 "system_id": "ccfqya",
1242+ "interface_test_status_name": "Unknown",
1243+ "interface_test_status": -1,
1244 "resource_uri": "/MAAS/api/2.0/rackcontrollers/ccfqya/"
1245 }
1246 }

Subscribers

People subscribed via source and target branches