Merge ~newell-jensen/maas:network-testing-api-doc-examples into maas:master
- Git
- lp:~newell-jensen/maas
- network-testing-api-doc-examples
- 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) |
Related bugs: |
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_
Description of the change
To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote : | # |
LANDING
-b network-
STATUS: FAILED BUILD
LOG: http://
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/src/maasserver/api/examples/machines.json b/src/maasserver/api/examples/machines.json | |||
2 | index 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 | 52 | "links": [], | 52 | "links": [], |
7 | 53 | "id": 69, | 53 | "id": 69, |
8 | 54 | "parents": [], | 54 | "parents": [], |
9 | 55 | "link_connected": true, | ||
10 | 56 | "interface_speed": 1000, | ||
11 | 57 | "link_speed": 1000, | ||
12 | 55 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" | 58 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" |
13 | 56 | }, | 59 | }, |
14 | 57 | { | 60 | { |
15 | @@ -92,6 +95,9 @@ | |||
16 | 92 | "links": [], | 95 | "links": [], |
17 | 93 | "id": 70, | 96 | "id": 70, |
18 | 94 | "parents": [], | 97 | "parents": [], |
19 | 98 | "link_connected": true, | ||
20 | 99 | "interface_speed": 1000, | ||
21 | 100 | "link_speed": 1000, | ||
22 | 95 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/" | 101 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/" |
23 | 96 | }, | 102 | }, |
24 | 97 | { | 103 | { |
25 | @@ -132,6 +138,9 @@ | |||
26 | 132 | "links": [], | 138 | "links": [], |
27 | 133 | "id": 71, | 139 | "id": 71, |
28 | 134 | "parents": [], | 140 | "parents": [], |
29 | 141 | "link_connected": true, | ||
30 | 142 | "interface_speed": 1000, | ||
31 | 143 | "link_speed": 1000, | ||
32 | 135 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/" | 144 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/" |
33 | 136 | }, | 145 | }, |
34 | 137 | { | 146 | { |
35 | @@ -174,6 +183,9 @@ | |||
36 | 174 | "eth-D6eWMG", | 183 | "eth-D6eWMG", |
37 | 175 | "eth-jazQFg" | 184 | "eth-jazQFg" |
38 | 176 | ], | 185 | ], |
39 | 186 | "link_connected": true, | ||
40 | 187 | "interface_speed": 1000, | ||
41 | 188 | "link_speed": 1000, | ||
42 | 177 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/" | 189 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/" |
43 | 178 | } | 190 | } |
44 | 179 | ], | 191 | ], |
45 | @@ -429,6 +441,9 @@ | |||
46 | 429 | "links": [], | 441 | "links": [], |
47 | 430 | "id": 69, | 442 | "id": 69, |
48 | 431 | "parents": [], | 443 | "parents": [], |
49 | 444 | "link_connected": true, | ||
50 | 445 | "interface_speed": 1000, | ||
51 | 446 | "link_speed": 1000, | ||
52 | 432 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" | 447 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" |
53 | 433 | }, | 448 | }, |
54 | 434 | "default_gateways": { | 449 | "default_gateways": { |
55 | @@ -449,6 +464,8 @@ | |||
56 | 449 | "hostname": "newname", | 464 | "hostname": "newname", |
57 | 450 | "description": "Optional description for the machine.", | 465 | "description": "Optional description for the machine.", |
58 | 451 | "testing_status_name": "Failed", | 466 | "testing_status_name": "Failed", |
59 | 467 | "interface_test_status_name": "Unknown", | ||
60 | 468 | "interface_test_status": -1, | ||
61 | 452 | "resource_uri": "/MAAS/api/2.0/machines/d8n3re/" | 469 | "resource_uri": "/MAAS/api/2.0/machines/d8n3re/" |
62 | 453 | }, | 470 | }, |
63 | 454 | "machines-deploy": { | 471 | "machines-deploy": { |
64 | @@ -501,6 +518,9 @@ | |||
65 | 501 | "links": [], | 518 | "links": [], |
66 | 502 | "id": 69, | 519 | "id": 69, |
67 | 503 | "parents": [], | 520 | "parents": [], |
68 | 521 | "link_connected": true, | ||
69 | 522 | "interface_speed": 1000, | ||
70 | 523 | "link_speed": 1000, | ||
71 | 504 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" | 524 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" |
72 | 505 | }, | 525 | }, |
73 | 506 | { | 526 | { |
74 | @@ -541,6 +561,9 @@ | |||
75 | 541 | "links": [], | 561 | "links": [], |
76 | 542 | "id": 70, | 562 | "id": 70, |
77 | 543 | "parents": [], | 563 | "parents": [], |
78 | 564 | "link_connected": true, | ||
79 | 565 | "interface_speed": 1000, | ||
80 | 566 | "link_speed": 1000, | ||
81 | 544 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/" | 567 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/70/" |
82 | 545 | }, | 568 | }, |
83 | 546 | { | 569 | { |
84 | @@ -581,6 +604,9 @@ | |||
85 | 581 | "links": [], | 604 | "links": [], |
86 | 582 | "id": 71, | 605 | "id": 71, |
87 | 583 | "parents": [], | 606 | "parents": [], |
88 | 607 | "link_connected": true, | ||
89 | 608 | "interface_speed": 1000, | ||
90 | 609 | "link_speed": 1000, | ||
91 | 584 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/" | 610 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/71/" |
92 | 585 | }, | 611 | }, |
93 | 586 | { | 612 | { |
94 | @@ -623,6 +649,9 @@ | |||
95 | 623 | "eth-D6eWMG", | 649 | "eth-D6eWMG", |
96 | 624 | "eth-jazQFg" | 650 | "eth-jazQFg" |
97 | 625 | ], | 651 | ], |
98 | 652 | "link_connected": true, | ||
99 | 653 | "interface_speed": 1000, | ||
100 | 654 | "link_speed": 1000, | ||
101 | 626 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/" | 655 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/72/" |
102 | 627 | } | 656 | } |
103 | 628 | ], | 657 | ], |
104 | @@ -878,6 +907,9 @@ | |||
105 | 878 | "links": [], | 907 | "links": [], |
106 | 879 | "id": 69, | 908 | "id": 69, |
107 | 880 | "parents": [], | 909 | "parents": [], |
108 | 910 | "link_connected": true, | ||
109 | 911 | "interface_speed": 1000, | ||
110 | 912 | "link_speed": 1000, | ||
111 | 881 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" | 913 | "resource_uri": "/MAAS/api/2.0/nodes/d8n3re/interfaces/69/" |
112 | 882 | }, | 914 | }, |
113 | 883 | "default_gateways": { | 915 | "default_gateways": { |
114 | @@ -898,6 +930,8 @@ | |||
115 | 898 | "hostname": "newname", | 930 | "hostname": "newname", |
116 | 899 | "description": "Optional description for the machine.", | 931 | "description": "Optional description for the machine.", |
117 | 900 | "testing_status_name": "Failed", | 932 | "testing_status_name": "Failed", |
118 | 933 | "interface_test_status_name": "Unknown", | ||
119 | 934 | "interface_test_status": -1, | ||
120 | 901 | "resource_uri": "/MAAS/api/2.0/machines/d8n3re/" | 935 | "resource_uri": "/MAAS/api/2.0/machines/d8n3re/" |
121 | 902 | }, | 936 | }, |
122 | 903 | "machines-release": { | 937 | "machines-release": { |
123 | @@ -1044,6 +1078,9 @@ | |||
124 | 1044 | "tag-VOqx2b" | 1078 | "tag-VOqx2b" |
125 | 1045 | ], | 1079 | ], |
126 | 1046 | "type": "physical", | 1080 | "type": "physical", |
127 | 1081 | "link_connected": true, | ||
128 | 1082 | "interface_speed": 1000, | ||
129 | 1083 | "link_speed": 1000, | ||
130 | 1047 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 1084 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
131 | 1048 | }, | 1085 | }, |
132 | 1049 | "hardware_info": { | 1086 | "hardware_info": { |
133 | @@ -1178,6 +1215,9 @@ | |||
134 | 1178 | "tag-VOqx2b" | 1215 | "tag-VOqx2b" |
135 | 1179 | ], | 1216 | ], |
136 | 1180 | "type": "physical", | 1217 | "type": "physical", |
137 | 1218 | "link_connected": true, | ||
138 | 1219 | "interface_speed": 1000, | ||
139 | 1220 | "link_speed": 1000, | ||
140 | 1181 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 1221 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
141 | 1182 | }, | 1222 | }, |
142 | 1183 | { | 1223 | { |
143 | @@ -1256,6 +1296,9 @@ | |||
144 | 1256 | "tag-RwynT2" | 1296 | "tag-RwynT2" |
145 | 1257 | ], | 1297 | ], |
146 | 1258 | "type": "physical", | 1298 | "type": "physical", |
147 | 1299 | "link_connected": true, | ||
148 | 1300 | "interface_speed": 1000, | ||
149 | 1301 | "link_speed": 1000, | ||
150 | 1259 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" | 1302 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" |
151 | 1260 | }, | 1303 | }, |
152 | 1261 | { | 1304 | { |
153 | @@ -1334,6 +1377,9 @@ | |||
154 | 1334 | "tag-PnEfvN" | 1377 | "tag-PnEfvN" |
155 | 1335 | ], | 1378 | ], |
156 | 1336 | "type": "physical", | 1379 | "type": "physical", |
157 | 1380 | "link_connected": true, | ||
158 | 1381 | "interface_speed": 1000, | ||
159 | 1382 | "link_speed": 1000, | ||
160 | 1337 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" | 1383 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" |
161 | 1338 | }, | 1384 | }, |
162 | 1339 | { | 1385 | { |
163 | @@ -1411,6 +1457,9 @@ | |||
164 | 1411 | "tag-QK7j09" | 1457 | "tag-QK7j09" |
165 | 1412 | ], | 1458 | ], |
166 | 1413 | "type": "vlan", | 1459 | "type": "vlan", |
167 | 1460 | "link_connected": true, | ||
168 | 1461 | "interface_speed": 1000, | ||
169 | 1462 | "link_speed": 1000, | ||
170 | 1414 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" | 1463 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" |
171 | 1415 | }, | 1464 | }, |
172 | 1416 | { | 1465 | { |
173 | @@ -1489,6 +1538,9 @@ | |||
174 | 1489 | "tag-GsPX3m" | 1538 | "tag-GsPX3m" |
175 | 1490 | ], | 1539 | ], |
176 | 1491 | "type": "vlan", | 1540 | "type": "vlan", |
177 | 1541 | "link_connected": true, | ||
178 | 1542 | "interface_speed": 1000, | ||
179 | 1543 | "link_speed": 1000, | ||
180 | 1492 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" | 1544 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" |
181 | 1493 | }, | 1545 | }, |
182 | 1494 | { | 1546 | { |
183 | @@ -1567,6 +1619,9 @@ | |||
184 | 1567 | "tag-xhApes" | 1619 | "tag-xhApes" |
185 | 1568 | ], | 1620 | ], |
186 | 1569 | "type": "vlan", | 1621 | "type": "vlan", |
187 | 1622 | "link_connected": true, | ||
188 | 1623 | "interface_speed": 1000, | ||
189 | 1624 | "link_speed": 1000, | ||
190 | 1570 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" | 1625 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" |
191 | 1571 | } | 1626 | } |
192 | 1572 | ], | 1627 | ], |
193 | @@ -1803,6 +1858,8 @@ | |||
194 | 1803 | "owner": null, | 1858 | "owner": null, |
195 | 1804 | "address_ttl": null, | 1859 | "address_ttl": null, |
196 | 1805 | "swap_size": null, | 1860 | "swap_size": null, |
197 | 1861 | "interface_test_status_name": "Unknown", | ||
198 | 1862 | "interface_test_status": -1, | ||
199 | 1806 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 1863 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
200 | 1807 | }, | 1864 | }, |
201 | 1808 | "machines-commission": { | 1865 | "machines-commission": { |
202 | @@ -1932,6 +1989,9 @@ | |||
203 | 1932 | "tags": [], | 1989 | "tags": [], |
204 | 1933 | "parents": [], | 1990 | "parents": [], |
205 | 1934 | "system_id": "8bk8nn", | 1991 | "system_id": "8bk8nn", |
206 | 1992 | "link_connected": true, | ||
207 | 1993 | "interface_speed": 1000, | ||
208 | 1994 | "link_speed": 1000, | ||
209 | 1935 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" | 1995 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" |
210 | 1936 | }, | 1996 | }, |
211 | 1937 | "interface_set": [ | 1997 | "interface_set": [ |
212 | @@ -1967,6 +2027,9 @@ | |||
213 | 1967 | "tags": [], | 2027 | "tags": [], |
214 | 1968 | "parents": [], | 2028 | "parents": [], |
215 | 1969 | "system_id": "8bk8nn", | 2029 | "system_id": "8bk8nn", |
216 | 2030 | "link_connected": true, | ||
217 | 2031 | "interface_speed": 1000, | ||
218 | 2032 | "link_speed": 1000, | ||
219 | 1970 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" | 2033 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" |
220 | 1971 | } | 2034 | } |
221 | 1972 | ], | 2035 | ], |
222 | @@ -2055,6 +2118,8 @@ | |||
223 | 2055 | "system_id": "8bk8nn", | 2118 | "system_id": "8bk8nn", |
224 | 2056 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/" | 2119 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/" |
225 | 2057 | }, | 2120 | }, |
226 | 2121 | "interface_test_status_name": "Unknown", | ||
227 | 2122 | "interface_test_status": -1, | ||
228 | 2058 | "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/" | 2123 | "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/" |
229 | 2059 | }, | 2124 | }, |
230 | 2060 | "machines-set-storage": { | 2125 | "machines-set-storage": { |
231 | @@ -2184,6 +2249,9 @@ | |||
232 | 2184 | "tags": [], | 2249 | "tags": [], |
233 | 2185 | "parents": [], | 2250 | "parents": [], |
234 | 2186 | "system_id": "8bk8nn", | 2251 | "system_id": "8bk8nn", |
235 | 2252 | "link_connected": true, | ||
236 | 2253 | "interface_speed": 1000, | ||
237 | 2254 | "link_speed": 1000, | ||
238 | 2187 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" | 2255 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" |
239 | 2188 | }, | 2256 | }, |
240 | 2189 | "interface_set": [ | 2257 | "interface_set": [ |
241 | @@ -2219,6 +2287,9 @@ | |||
242 | 2219 | "tags": [], | 2287 | "tags": [], |
243 | 2220 | "parents": [], | 2288 | "parents": [], |
244 | 2221 | "system_id": "8bk8nn", | 2289 | "system_id": "8bk8nn", |
245 | 2290 | "link_connected": true, | ||
246 | 2291 | "interface_speed": 1000, | ||
247 | 2292 | "link_speed": 1000, | ||
248 | 2222 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" | 2293 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/interfaces/4/" |
249 | 2223 | } | 2294 | } |
250 | 2224 | ], | 2295 | ], |
251 | @@ -2307,6 +2378,8 @@ | |||
252 | 2307 | "system_id": "8bk8nn", | 2378 | "system_id": "8bk8nn", |
253 | 2308 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/" | 2379 | "resource_uri": "/MAAS/api/2.0/nodes/8bk8nn/blockdevices/1/" |
254 | 2309 | }, | 2380 | }, |
255 | 2381 | "interface_test_status_name": "Unknown", | ||
256 | 2382 | "interface_test_status": -1, | ||
257 | 2310 | "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/" | 2383 | "resource_uri": "/MAAS/api/2.0/machines/8bk8nn/" |
258 | 2311 | }, | 2384 | }, |
259 | 2312 | "machines-mount-special": { | 2385 | "machines-mount-special": { |
260 | @@ -2500,6 +2573,9 @@ | |||
261 | 2500 | "product": null, | 2573 | "product": null, |
262 | 2501 | "id": 37, | 2574 | "id": 37, |
263 | 2502 | "type": "physical", | 2575 | "type": "physical", |
264 | 2576 | "link_connected": true, | ||
265 | 2577 | "interface_speed": 1000, | ||
266 | 2578 | "link_speed": 1000, | ||
267 | 2503 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 2579 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
268 | 2504 | }, | 2580 | }, |
269 | 2505 | { | 2581 | { |
270 | @@ -2578,6 +2654,9 @@ | |||
271 | 2578 | "product": null, | 2654 | "product": null, |
272 | 2579 | "id": 38, | 2655 | "id": 38, |
273 | 2580 | "type": "physical", | 2656 | "type": "physical", |
274 | 2657 | "link_connected": true, | ||
275 | 2658 | "interface_speed": 1000, | ||
276 | 2659 | "link_speed": 1000, | ||
277 | 2581 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" | 2660 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" |
278 | 2582 | }, | 2661 | }, |
279 | 2583 | { | 2662 | { |
280 | @@ -2656,6 +2735,9 @@ | |||
281 | 2656 | "product": null, | 2735 | "product": null, |
282 | 2657 | "id": 39, | 2736 | "id": 39, |
283 | 2658 | "type": "physical", | 2737 | "type": "physical", |
284 | 2738 | "link_connected": true, | ||
285 | 2739 | "interface_speed": 1000, | ||
286 | 2740 | "link_speed": 1000, | ||
287 | 2659 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" | 2741 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" |
288 | 2660 | }, | 2742 | }, |
289 | 2661 | { | 2743 | { |
290 | @@ -2733,6 +2815,9 @@ | |||
291 | 2733 | "product": null, | 2815 | "product": null, |
292 | 2734 | "id": 40, | 2816 | "id": 40, |
293 | 2735 | "type": "vlan", | 2817 | "type": "vlan", |
294 | 2818 | "link_connected": true, | ||
295 | 2819 | "interface_speed": 1000, | ||
296 | 2820 | "link_speed": 1000, | ||
297 | 2736 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" | 2821 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" |
298 | 2737 | }, | 2822 | }, |
299 | 2738 | { | 2823 | { |
300 | @@ -2811,6 +2896,9 @@ | |||
301 | 2811 | "product": null, | 2896 | "product": null, |
302 | 2812 | "id": 41, | 2897 | "id": 41, |
303 | 2813 | "type": "vlan", | 2898 | "type": "vlan", |
304 | 2899 | "link_connected": true, | ||
305 | 2900 | "interface_speed": 1000, | ||
306 | 2901 | "link_speed": 1000, | ||
307 | 2814 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" | 2902 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" |
308 | 2815 | }, | 2903 | }, |
309 | 2816 | { | 2904 | { |
310 | @@ -2889,6 +2977,9 @@ | |||
311 | 2889 | "product": null, | 2977 | "product": null, |
312 | 2890 | "id": 42, | 2978 | "id": 42, |
313 | 2891 | "type": "vlan", | 2979 | "type": "vlan", |
314 | 2980 | "link_connected": true, | ||
315 | 2981 | "interface_speed": 1000, | ||
316 | 2982 | "link_speed": 1000, | ||
317 | 2892 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" | 2983 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" |
318 | 2893 | } | 2984 | } |
319 | 2894 | ], | 2985 | ], |
320 | @@ -3036,6 +3127,9 @@ | |||
321 | 3036 | "product": null, | 3127 | "product": null, |
322 | 3037 | "id": 37, | 3128 | "id": 37, |
323 | 3038 | "type": "physical", | 3129 | "type": "physical", |
324 | 3130 | "link_connected": true, | ||
325 | 3131 | "interface_speed": 1000, | ||
326 | 3132 | "link_speed": 1000, | ||
327 | 3039 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 3133 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
328 | 3040 | }, | 3134 | }, |
329 | 3041 | "raids": [], | 3135 | "raids": [], |
330 | @@ -3220,6 +3314,8 @@ | |||
331 | 3220 | "power_state": "on", | 3314 | "power_state": "on", |
332 | 3221 | "hostname": "above-robin", | 3315 | "hostname": "above-robin", |
333 | 3222 | "description": "Optional description for the machine.", | 3316 | "description": "Optional description for the machine.", |
334 | 3317 | "interface_test_status_name": "Unknown", | ||
335 | 3318 | "interface_test_status": -1, | ||
336 | 3223 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 3319 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
337 | 3224 | }, | 3320 | }, |
338 | 3225 | "machines-unmount-special": { | 3321 | "machines-unmount-special": { |
339 | @@ -3413,6 +3509,9 @@ | |||
340 | 3413 | "product": null, | 3509 | "product": null, |
341 | 3414 | "id": 37, | 3510 | "id": 37, |
342 | 3415 | "type": "physical", | 3511 | "type": "physical", |
343 | 3512 | "link_connected": true, | ||
344 | 3513 | "interface_speed": 1000, | ||
345 | 3514 | "link_speed": 1000, | ||
346 | 3416 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 3515 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
347 | 3417 | }, | 3516 | }, |
348 | 3418 | { | 3517 | { |
349 | @@ -3491,6 +3590,9 @@ | |||
350 | 3491 | "product": null, | 3590 | "product": null, |
351 | 3492 | "id": 38, | 3591 | "id": 38, |
352 | 3493 | "type": "physical", | 3592 | "type": "physical", |
353 | 3593 | "link_connected": true, | ||
354 | 3594 | "interface_speed": 1000, | ||
355 | 3595 | "link_speed": 1000, | ||
356 | 3494 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" | 3596 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" |
357 | 3495 | }, | 3597 | }, |
358 | 3496 | { | 3598 | { |
359 | @@ -3569,6 +3671,9 @@ | |||
360 | 3569 | "product": null, | 3671 | "product": null, |
361 | 3570 | "id": 39, | 3672 | "id": 39, |
362 | 3571 | "type": "physical", | 3673 | "type": "physical", |
363 | 3674 | "link_connected": true, | ||
364 | 3675 | "interface_speed": 1000, | ||
365 | 3676 | "link_speed": 1000, | ||
366 | 3572 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" | 3677 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" |
367 | 3573 | }, | 3678 | }, |
368 | 3574 | { | 3679 | { |
369 | @@ -3646,6 +3751,9 @@ | |||
370 | 3646 | "product": null, | 3751 | "product": null, |
371 | 3647 | "id": 40, | 3752 | "id": 40, |
372 | 3648 | "type": "vlan", | 3753 | "type": "vlan", |
373 | 3754 | "link_connected": true, | ||
374 | 3755 | "interface_speed": 1000, | ||
375 | 3756 | "link_speed": 1000, | ||
376 | 3649 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" | 3757 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" |
377 | 3650 | }, | 3758 | }, |
378 | 3651 | { | 3759 | { |
379 | @@ -3724,6 +3832,9 @@ | |||
380 | 3724 | "product": null, | 3832 | "product": null, |
381 | 3725 | "id": 41, | 3833 | "id": 41, |
382 | 3726 | "type": "vlan", | 3834 | "type": "vlan", |
383 | 3835 | "link_connected": true, | ||
384 | 3836 | "interface_speed": 1000, | ||
385 | 3837 | "link_speed": 1000, | ||
386 | 3727 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" | 3838 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" |
387 | 3728 | }, | 3839 | }, |
388 | 3729 | { | 3840 | { |
389 | @@ -3802,6 +3913,9 @@ | |||
390 | 3802 | "product": null, | 3913 | "product": null, |
391 | 3803 | "id": 42, | 3914 | "id": 42, |
392 | 3804 | "type": "vlan", | 3915 | "type": "vlan", |
393 | 3916 | "link_connected": true, | ||
394 | 3917 | "interface_speed": 1000, | ||
395 | 3918 | "link_speed": 1000, | ||
396 | 3805 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" | 3919 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" |
397 | 3806 | } | 3920 | } |
398 | 3807 | ], | 3921 | ], |
399 | @@ -3949,6 +4063,9 @@ | |||
400 | 3949 | "product": null, | 4063 | "product": null, |
401 | 3950 | "id": 37, | 4064 | "id": 37, |
402 | 3951 | "type": "physical", | 4065 | "type": "physical", |
403 | 4066 | "link_connected": true, | ||
404 | 4067 | "interface_speed": 1000, | ||
405 | 4068 | "link_speed": 1000, | ||
406 | 3952 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 4069 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
407 | 3953 | }, | 4070 | }, |
408 | 3954 | "raids": [], | 4071 | "raids": [], |
409 | @@ -4133,6 +4250,8 @@ | |||
410 | 4133 | "power_state": "on", | 4250 | "power_state": "on", |
411 | 4134 | "hostname": "above-robin", | 4251 | "hostname": "above-robin", |
412 | 4135 | "description": "Optional description for the machine.", | 4252 | "description": "Optional description for the machine.", |
413 | 4253 | "interface_test_status_name": "Unknown", | ||
414 | 4254 | "interface_test_status": -1, | ||
415 | 4136 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 4255 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
416 | 4137 | }, | 4256 | }, |
417 | 4138 | "machines-clear-gateways": { | 4257 | "machines-clear-gateways": { |
418 | @@ -4215,6 +4334,9 @@ | |||
419 | 4215 | ], | 4334 | ], |
420 | 4216 | "mac_address": "cb:93:ac:d1:ed:65", | 4335 | "mac_address": "cb:93:ac:d1:ed:65", |
421 | 4217 | "effective_mtu": 1500, | 4336 | "effective_mtu": 1500, |
422 | 4337 | "link_connected": true, | ||
423 | 4338 | "interface_speed": 1000, | ||
424 | 4339 | "link_speed": 1000, | ||
425 | 4218 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 4340 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
426 | 4219 | }, | 4341 | }, |
427 | 4220 | "locked": false, | 4342 | "locked": false, |
428 | @@ -4436,6 +4558,9 @@ | |||
429 | 4436 | ], | 4558 | ], |
430 | 4437 | "mac_address": "cb:93:ac:d1:ed:65", | 4559 | "mac_address": "cb:93:ac:d1:ed:65", |
431 | 4438 | "effective_mtu": 1500, | 4560 | "effective_mtu": 1500, |
432 | 4561 | "link_connected": true, | ||
433 | 4562 | "interface_speed": 1000, | ||
434 | 4563 | "link_speed": 1000, | ||
435 | 4439 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 4564 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
436 | 4440 | }, | 4565 | }, |
437 | 4441 | { | 4566 | { |
438 | @@ -4514,6 +4639,9 @@ | |||
439 | 4514 | ], | 4639 | ], |
440 | 4515 | "mac_address": "bc:d3:d5:28:88:dc", | 4640 | "mac_address": "bc:d3:d5:28:88:dc", |
441 | 4516 | "effective_mtu": 1500, | 4641 | "effective_mtu": 1500, |
442 | 4642 | "link_connected": true, | ||
443 | 4643 | "interface_speed": 1000, | ||
444 | 4644 | "link_speed": 1000, | ||
445 | 4517 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" | 4645 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" |
446 | 4518 | }, | 4646 | }, |
447 | 4519 | { | 4647 | { |
448 | @@ -4592,6 +4720,9 @@ | |||
449 | 4592 | ], | 4720 | ], |
450 | 4593 | "mac_address": "ad:5a:3e:a3:68:13", | 4721 | "mac_address": "ad:5a:3e:a3:68:13", |
451 | 4594 | "effective_mtu": 1500, | 4722 | "effective_mtu": 1500, |
452 | 4723 | "link_connected": true, | ||
453 | 4724 | "interface_speed": 1000, | ||
454 | 4725 | "link_speed": 1000, | ||
455 | 4595 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" | 4726 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" |
456 | 4596 | }, | 4727 | }, |
457 | 4597 | { | 4728 | { |
458 | @@ -4669,6 +4800,9 @@ | |||
459 | 4669 | ], | 4800 | ], |
460 | 4670 | "mac_address": "cb:93:ac:d1:ed:65", | 4801 | "mac_address": "cb:93:ac:d1:ed:65", |
461 | 4671 | "effective_mtu": 1500, | 4802 | "effective_mtu": 1500, |
462 | 4803 | "link_connected": true, | ||
463 | 4804 | "interface_speed": 1000, | ||
464 | 4805 | "link_speed": 1000, | ||
465 | 4672 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" | 4806 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" |
466 | 4673 | }, | 4807 | }, |
467 | 4674 | { | 4808 | { |
468 | @@ -4747,6 +4881,9 @@ | |||
469 | 4747 | ], | 4881 | ], |
470 | 4748 | "mac_address": "bc:d3:d5:28:88:dc", | 4882 | "mac_address": "bc:d3:d5:28:88:dc", |
471 | 4749 | "effective_mtu": 1500, | 4883 | "effective_mtu": 1500, |
472 | 4884 | "link_connected": true, | ||
473 | 4885 | "interface_speed": 1000, | ||
474 | 4886 | "link_speed": 1000, | ||
475 | 4750 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" | 4887 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" |
476 | 4751 | }, | 4888 | }, |
477 | 4752 | { | 4889 | { |
478 | @@ -4825,6 +4962,9 @@ | |||
479 | 4825 | ], | 4962 | ], |
480 | 4826 | "mac_address": "ad:5a:3e:a3:68:13", | 4963 | "mac_address": "ad:5a:3e:a3:68:13", |
481 | 4827 | "effective_mtu": 1500, | 4964 | "effective_mtu": 1500, |
482 | 4965 | "link_connected": true, | ||
483 | 4966 | "interface_speed": 1000, | ||
484 | 4967 | "link_speed": 1000, | ||
485 | 4828 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" | 4968 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" |
486 | 4829 | } | 4969 | } |
487 | 4830 | ], | 4970 | ], |
488 | @@ -5038,6 +5178,8 @@ | |||
489 | 5038 | "mainboard_firmware_version": "Unknown", | 5178 | "mainboard_firmware_version": "Unknown", |
490 | 5039 | "mainboard_firmware_date": "Unknown" | 5179 | "mainboard_firmware_date": "Unknown" |
491 | 5040 | }, | 5180 | }, |
492 | 5181 | "interface_test_status_name": "Unknown", | ||
493 | 5182 | "interface_test_status": -1, | ||
494 | 5041 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 5183 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
495 | 5042 | }, | 5184 | }, |
496 | 5043 | "machines-restore-networking": { | 5185 | "machines-restore-networking": { |
497 | @@ -5395,6 +5537,8 @@ | |||
498 | 5395 | "other_test_status": 2, | 5537 | "other_test_status": 2, |
499 | 5396 | "storage_test_status_name": "Passed", | 5538 | "storage_test_status_name": "Passed", |
500 | 5397 | "cpu_count": 3, | 5539 | "cpu_count": 3, |
501 | 5540 | "interface_test_status_name": "Unknown", | ||
502 | 5541 | "interface_test_status": -1, | ||
503 | 5398 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 5542 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
504 | 5399 | }, | 5543 | }, |
505 | 5400 | "machines-restore-storage": { | 5544 | "machines-restore-storage": { |
506 | @@ -5752,6 +5896,8 @@ | |||
507 | 5752 | "commissioning_status_name": "Passed", | 5896 | "commissioning_status_name": "Passed", |
508 | 5753 | "locked": false, | 5897 | "locked": false, |
509 | 5754 | "virtualblockdevice_set": [], | 5898 | "virtualblockdevice_set": [], |
510 | 5899 | "interface_test_status_name": "Unknown", | ||
511 | 5900 | "interface_test_status": -1, | ||
512 | 5755 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 5901 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
513 | 5756 | }, | 5902 | }, |
514 | 5757 | "machines-restore-default": { | 5903 | "machines-restore-default": { |
515 | @@ -6109,6 +6255,8 @@ | |||
516 | 6109 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/blockdevices/20/" | 6255 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/blockdevices/20/" |
517 | 6110 | } | 6256 | } |
518 | 6111 | ], | 6257 | ], |
519 | 6258 | "interface_test_status_name": "Unknown", | ||
520 | 6259 | "interface_test_status": -1, | ||
521 | 6112 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 6260 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
522 | 6113 | }, | 6261 | }, |
523 | 6114 | "machines-mark-broken": { | 6262 | "machines-mark-broken": { |
524 | @@ -6466,6 +6614,8 @@ | |||
525 | 6466 | "other_test_status": 2, | 6614 | "other_test_status": 2, |
526 | 6467 | "boot_interface": null, | 6615 | "boot_interface": null, |
527 | 6468 | "virtualblockdevice_set": [], | 6616 | "virtualblockdevice_set": [], |
528 | 6617 | "interface_test_status_name": "Unknown", | ||
529 | 6618 | "interface_test_status": -1, | ||
530 | 6469 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 6619 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
531 | 6470 | }, | 6620 | }, |
532 | 6471 | "machines-mark-fixed": { | 6621 | "machines-mark-fixed": { |
533 | @@ -6823,6 +6973,8 @@ | |||
534 | 6823 | "netboot": true, | 6973 | "netboot": true, |
535 | 6824 | "status_name": "Ready", | 6974 | "status_name": "Ready", |
536 | 6825 | "iscsiblockdevice_set": [], | 6975 | "iscsiblockdevice_set": [], |
537 | 6976 | "interface_test_status_name": "Unknown", | ||
538 | 6977 | "interface_test_status": -1, | ||
539 | 6826 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 6978 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
540 | 6827 | }, | 6979 | }, |
541 | 6828 | "machines-rescue-mode": { | 6980 | "machines-rescue-mode": { |
542 | @@ -6952,6 +7104,9 @@ | |||
543 | 6952 | "tags": [], | 7104 | "tags": [], |
544 | 6953 | "parents": [], | 7105 | "parents": [], |
545 | 6954 | "system_id": "a8m7sr", | 7106 | "system_id": "a8m7sr", |
546 | 7107 | "link_connected": true, | ||
547 | 7108 | "interface_speed": 1000, | ||
548 | 7109 | "link_speed": 1000, | ||
549 | 6955 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" | 7110 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" |
550 | 6956 | }, | 7111 | }, |
551 | 6957 | "interface_set": [ | 7112 | "interface_set": [ |
552 | @@ -6987,6 +7142,9 @@ | |||
553 | 6987 | "tags": [], | 7142 | "tags": [], |
554 | 6988 | "parents": [], | 7143 | "parents": [], |
555 | 6989 | "system_id": "a8m7sr", | 7144 | "system_id": "a8m7sr", |
556 | 7145 | "link_connected": true, | ||
557 | 7146 | "interface_speed": 1000, | ||
558 | 7147 | "link_speed": 1000, | ||
559 | 6990 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" | 7148 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" |
560 | 6991 | } | 7149 | } |
561 | 6992 | ], | 7150 | ], |
562 | @@ -7075,6 +7233,8 @@ | |||
563 | 7075 | "system_id": "a8m7sr", | 7233 | "system_id": "a8m7sr", |
564 | 7076 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/" | 7234 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/" |
565 | 7077 | }, | 7235 | }, |
566 | 7236 | "interface_test_status_name": "Unknown", | ||
567 | 7237 | "interface_test_status": -1, | ||
568 | 7078 | "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/" | 7238 | "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/" |
569 | 7079 | }, | 7239 | }, |
570 | 7080 | "machines-exit-rescue-mode": { | 7240 | "machines-exit-rescue-mode": { |
571 | @@ -7204,6 +7364,9 @@ | |||
572 | 7204 | "tags": [], | 7364 | "tags": [], |
573 | 7205 | "parents": [], | 7365 | "parents": [], |
574 | 7206 | "system_id": "a8m7sr", | 7366 | "system_id": "a8m7sr", |
575 | 7367 | "link_connected": true, | ||
576 | 7368 | "interface_speed": 1000, | ||
577 | 7369 | "link_speed": 1000, | ||
578 | 7207 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" | 7370 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" |
579 | 7208 | }, | 7371 | }, |
580 | 7209 | "interface_set": [ | 7372 | "interface_set": [ |
581 | @@ -7239,6 +7402,9 @@ | |||
582 | 7239 | "tags": [], | 7402 | "tags": [], |
583 | 7240 | "parents": [], | 7403 | "parents": [], |
584 | 7241 | "system_id": "a8m7sr", | 7404 | "system_id": "a8m7sr", |
585 | 7405 | "link_connected": true, | ||
586 | 7406 | "interface_speed": 1000, | ||
587 | 7407 | "link_speed": 1000, | ||
588 | 7242 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" | 7408 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/interfaces/6/" |
589 | 7243 | } | 7409 | } |
590 | 7244 | ], | 7410 | ], |
591 | @@ -7327,6 +7493,8 @@ | |||
592 | 7327 | "system_id": "a8m7sr", | 7493 | "system_id": "a8m7sr", |
593 | 7328 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/" | 7494 | "resource_uri": "/MAAS/api/2.0/nodes/a8m7sr/blockdevices/3/" |
594 | 7329 | }, | 7495 | }, |
595 | 7496 | "interface_test_status_name": "Unknown", | ||
596 | 7497 | "interface_test_status": -1, | ||
597 | 7330 | "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/" | 7498 | "resource_uri": "/MAAS/api/2.0/machines/a8m7sr/" |
598 | 7331 | }, | 7499 | }, |
599 | 7332 | "machines-lock": { | 7500 | "machines-lock": { |
600 | @@ -7451,6 +7619,9 @@ | |||
601 | 7451 | "discovered": null, | 7619 | "discovered": null, |
602 | 7452 | "vendor": null, | 7620 | "vendor": null, |
603 | 7453 | "id": 46, | 7621 | "id": 46, |
604 | 7622 | "link_connected": true, | ||
605 | 7623 | "interface_speed": 1000, | ||
606 | 7624 | "link_speed": 1000, | ||
607 | 7454 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" | 7625 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" |
608 | 7455 | }, | 7626 | }, |
609 | 7456 | { | 7627 | { |
610 | @@ -7528,6 +7699,9 @@ | |||
611 | 7528 | "discovered": null, | 7699 | "discovered": null, |
612 | 7529 | "vendor": null, | 7700 | "vendor": null, |
613 | 7530 | "id": 47, | 7701 | "id": 47, |
614 | 7702 | "link_connected": true, | ||
615 | 7703 | "interface_speed": 1000, | ||
616 | 7704 | "link_speed": 1000, | ||
617 | 7531 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/" | 7705 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/" |
618 | 7532 | }, | 7706 | }, |
619 | 7533 | { | 7707 | { |
620 | @@ -7605,6 +7779,9 @@ | |||
621 | 7605 | "discovered": null, | 7779 | "discovered": null, |
622 | 7606 | "vendor": null, | 7780 | "vendor": null, |
623 | 7607 | "id": 48, | 7781 | "id": 48, |
624 | 7782 | "link_connected": true, | ||
625 | 7783 | "interface_speed": 1000, | ||
626 | 7784 | "link_speed": 1000, | ||
627 | 7608 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/" | 7785 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/" |
628 | 7609 | }, | 7786 | }, |
629 | 7610 | { | 7787 | { |
630 | @@ -7684,6 +7861,9 @@ | |||
631 | 7684 | "discovered": null, | 7861 | "discovered": null, |
632 | 7685 | "vendor": null, | 7862 | "vendor": null, |
633 | 7686 | "id": 49, | 7863 | "id": 49, |
634 | 7864 | "link_connected": true, | ||
635 | 7865 | "interface_speed": 1000, | ||
636 | 7866 | "link_speed": 1000, | ||
637 | 7687 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/" | 7867 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/" |
638 | 7688 | }, | 7868 | }, |
639 | 7689 | { | 7869 | { |
640 | @@ -7763,6 +7943,9 @@ | |||
641 | 7763 | "discovered": null, | 7943 | "discovered": null, |
642 | 7764 | "vendor": null, | 7944 | "vendor": null, |
643 | 7765 | "id": 50, | 7945 | "id": 50, |
644 | 7946 | "link_connected": true, | ||
645 | 7947 | "interface_speed": 1000, | ||
646 | 7948 | "link_speed": 1000, | ||
647 | 7766 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/" | 7949 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/" |
648 | 7767 | }, | 7950 | }, |
649 | 7768 | { | 7951 | { |
650 | @@ -7842,6 +8025,9 @@ | |||
651 | 7842 | "discovered": null, | 8025 | "discovered": null, |
652 | 7843 | "vendor": null, | 8026 | "vendor": null, |
653 | 7844 | "id": 51, | 8027 | "id": 51, |
654 | 8028 | "link_connected": true, | ||
655 | 8029 | "interface_speed": 1000, | ||
656 | 8030 | "link_speed": 1000, | ||
657 | 7845 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/" | 8031 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/" |
658 | 7846 | } | 8032 | } |
659 | 7847 | ], | 8033 | ], |
660 | @@ -7921,6 +8107,9 @@ | |||
661 | 7921 | "discovered": null, | 8107 | "discovered": null, |
662 | 7922 | "vendor": null, | 8108 | "vendor": null, |
663 | 7923 | "id": 46, | 8109 | "id": 46, |
664 | 8110 | "link_connected": true, | ||
665 | 8111 | "interface_speed": 1000, | ||
666 | 8112 | "link_speed": 1000, | ||
667 | 7924 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" | 8113 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" |
668 | 7925 | }, | 8114 | }, |
669 | 7926 | "status_message": "(admin)", | 8115 | "status_message": "(admin)", |
670 | @@ -8246,6 +8435,8 @@ | |||
671 | 8246 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/blockdevices/24/" | 8435 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/blockdevices/24/" |
672 | 8247 | } | 8436 | } |
673 | 8248 | ], | 8437 | ], |
674 | 8438 | "interface_test_status_name": "Unknown", | ||
675 | 8439 | "interface_test_status": -1, | ||
676 | 8249 | "resource_uri": "/MAAS/api/2.0/machines/recrwg/" | 8440 | "resource_uri": "/MAAS/api/2.0/machines/recrwg/" |
677 | 8250 | }, | 8441 | }, |
678 | 8251 | "machines-unlock": { | 8442 | "machines-unlock": { |
679 | @@ -8523,6 +8714,9 @@ | |||
680 | 8523 | "name": "eth-xMPy44", | 8714 | "name": "eth-xMPy44", |
681 | 8524 | "vendor": null, | 8715 | "vendor": null, |
682 | 8525 | "system_id": "recrwg", | 8716 | "system_id": "recrwg", |
683 | 8717 | "link_connected": true, | ||
684 | 8718 | "interface_speed": 1000, | ||
685 | 8719 | "link_speed": 1000, | ||
686 | 8526 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" | 8720 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" |
687 | 8527 | }, | 8721 | }, |
688 | 8528 | { | 8722 | { |
689 | @@ -8600,6 +8794,9 @@ | |||
690 | 8600 | "name": "eth-y3Syjk", | 8794 | "name": "eth-y3Syjk", |
691 | 8601 | "vendor": null, | 8795 | "vendor": null, |
692 | 8602 | "system_id": "recrwg", | 8796 | "system_id": "recrwg", |
693 | 8797 | "link_connected": true, | ||
694 | 8798 | "interface_speed": 1000, | ||
695 | 8799 | "link_speed": 1000, | ||
696 | 8603 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/" | 8800 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/47/" |
697 | 8604 | }, | 8801 | }, |
698 | 8605 | { | 8802 | { |
699 | @@ -8677,6 +8874,9 @@ | |||
700 | 8677 | "name": "eth-mrQO2Y", | 8874 | "name": "eth-mrQO2Y", |
701 | 8678 | "vendor": null, | 8875 | "vendor": null, |
702 | 8679 | "system_id": "recrwg", | 8876 | "system_id": "recrwg", |
703 | 8877 | "link_connected": true, | ||
704 | 8878 | "interface_speed": 1000, | ||
705 | 8879 | "link_speed": 1000, | ||
706 | 8680 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/" | 8880 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/48/" |
707 | 8681 | }, | 8881 | }, |
708 | 8682 | { | 8882 | { |
709 | @@ -8756,6 +8956,9 @@ | |||
710 | 8756 | "name": "eth-xMPy44.10", | 8956 | "name": "eth-xMPy44.10", |
711 | 8757 | "vendor": null, | 8957 | "vendor": null, |
712 | 8758 | "system_id": "recrwg", | 8958 | "system_id": "recrwg", |
713 | 8959 | "link_connected": true, | ||
714 | 8960 | "interface_speed": 1000, | ||
715 | 8961 | "link_speed": 1000, | ||
716 | 8759 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/" | 8962 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/49/" |
717 | 8760 | }, | 8963 | }, |
718 | 8761 | { | 8964 | { |
719 | @@ -8835,6 +9038,9 @@ | |||
720 | 8835 | "name": "eth-y3Syjk.10", | 9038 | "name": "eth-y3Syjk.10", |
721 | 8836 | "vendor": null, | 9039 | "vendor": null, |
722 | 8837 | "system_id": "recrwg", | 9040 | "system_id": "recrwg", |
723 | 9041 | "link_connected": true, | ||
724 | 9042 | "interface_speed": 1000, | ||
725 | 9043 | "link_speed": 1000, | ||
726 | 8838 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/" | 9044 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/50/" |
727 | 8839 | }, | 9045 | }, |
728 | 8840 | { | 9046 | { |
729 | @@ -8914,6 +9120,9 @@ | |||
730 | 8914 | "name": "eth-mrQO2Y.10", | 9120 | "name": "eth-mrQO2Y.10", |
731 | 8915 | "vendor": null, | 9121 | "vendor": null, |
732 | 8916 | "system_id": "recrwg", | 9122 | "system_id": "recrwg", |
733 | 9123 | "link_connected": true, | ||
734 | 9124 | "interface_speed": 1000, | ||
735 | 9125 | "link_speed": 1000, | ||
736 | 8917 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/" | 9126 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/51/" |
737 | 8918 | } | 9127 | } |
738 | 8919 | ], | 9128 | ], |
739 | @@ -9117,6 +9326,9 @@ | |||
740 | 9117 | "name": "eth-xMPy44", | 9326 | "name": "eth-xMPy44", |
741 | 9118 | "vendor": null, | 9327 | "vendor": null, |
742 | 9119 | "system_id": "recrwg", | 9328 | "system_id": "recrwg", |
743 | 9329 | "link_connected": true, | ||
744 | 9330 | "interface_speed": 1000, | ||
745 | 9331 | "link_speed": 1000, | ||
746 | 9120 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" | 9332 | "resource_uri": "/MAAS/api/2.0/nodes/recrwg/interfaces/46/" |
747 | 9121 | }, | 9333 | }, |
748 | 9122 | "distro_series": "", | 9334 | "distro_series": "", |
749 | @@ -9165,6 +9377,8 @@ | |||
750 | 9165 | "resource_uri": "/MAAS/api/2.0/resourcepool/0/" | 9377 | "resource_uri": "/MAAS/api/2.0/resourcepool/0/" |
751 | 9166 | }, | 9378 | }, |
752 | 9167 | "power_type": "virsh", | 9379 | "power_type": "virsh", |
753 | 9380 | "interface_test_status_name": "Unknown", | ||
754 | 9381 | "interface_test_status": -1, | ||
755 | 9168 | "resource_uri": "/MAAS/api/2.0/machines/recrwg/" | 9382 | "resource_uri": "/MAAS/api/2.0/machines/recrwg/" |
756 | 9169 | }, | 9383 | }, |
757 | 9170 | "machines-create": { | 9384 | "machines-create": { |
758 | @@ -9206,6 +9420,9 @@ | |||
759 | 9206 | "enabled": true, | 9420 | "enabled": true, |
760 | 9207 | "firmware_version": null, | 9421 | "firmware_version": null, |
761 | 9208 | "name": "eth0", | 9422 | "name": "eth0", |
762 | 9423 | "link_connected": true, | ||
763 | 9424 | "interface_speed": 1000, | ||
764 | 9425 | "link_speed": 1000, | ||
765 | 9209 | "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/" | 9426 | "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/" |
766 | 9210 | }, | 9427 | }, |
767 | 9211 | "cache_sets": [], | 9428 | "cache_sets": [], |
768 | @@ -9239,6 +9456,9 @@ | |||
769 | 9239 | "enabled": true, | 9456 | "enabled": true, |
770 | 9240 | "firmware_version": null, | 9457 | "firmware_version": null, |
771 | 9241 | "name": "eth0", | 9458 | "name": "eth0", |
772 | 9459 | "link_connected": false, | ||
773 | 9460 | "interface_speed": 0, | ||
774 | 9461 | "link_speed": 0, | ||
775 | 9242 | "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/" | 9462 | "resource_uri": "/MAAS/api/2.0/nodes/p37gqk/interfaces/137/" |
776 | 9243 | } | 9463 | } |
777 | 9244 | ], | 9464 | ], |
778 | @@ -9308,6 +9528,8 @@ | |||
779 | 9308 | "memory_test_status": -1, | 9528 | "memory_test_status": -1, |
780 | 9309 | "raids": [], | 9529 | "raids": [], |
781 | 9310 | "hwe_kernel": null, | 9530 | "hwe_kernel": null, |
782 | 9531 | "interface_test_status_name": "Unknown", | ||
783 | 9532 | "interface_test_status": -1, | ||
784 | 9311 | "resource_uri": "/MAAS/api/2.0/machines/p37gqk/" | 9533 | "resource_uri": "/MAAS/api/2.0/machines/p37gqk/" |
785 | 9312 | }, | 9534 | }, |
786 | 9313 | "machines-allocate": { | 9535 | "machines-allocate": { |
787 | @@ -9580,6 +9802,9 @@ | |||
788 | 9580 | "id": 37, | 9802 | "id": 37, |
789 | 9581 | "params": "", | 9803 | "params": "", |
790 | 9582 | "name": "eth-lKRYAa", | 9804 | "name": "eth-lKRYAa", |
791 | 9805 | "link_connected": true, | ||
792 | 9806 | "interface_speed": 1000, | ||
793 | 9807 | "link_speed": 1000, | ||
794 | 9583 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 9808 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
795 | 9584 | }, | 9809 | }, |
796 | 9585 | "osystem": "", | 9810 | "osystem": "", |
797 | @@ -9777,6 +10002,9 @@ | |||
798 | 9777 | "id": 37, | 10002 | "id": 37, |
799 | 9778 | "params": "", | 10003 | "params": "", |
800 | 9779 | "name": "eth-lKRYAa", | 10004 | "name": "eth-lKRYAa", |
801 | 10005 | "link_connected": true, | ||
802 | 10006 | "interface_speed": 1000, | ||
803 | 10007 | "link_speed": 1000, | ||
804 | 9780 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" | 10008 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/37/" |
805 | 9781 | }, | 10009 | }, |
806 | 9782 | { | 10010 | { |
807 | @@ -9855,6 +10083,9 @@ | |||
808 | 9855 | "id": 38, | 10083 | "id": 38, |
809 | 9856 | "params": "", | 10084 | "params": "", |
810 | 9857 | "name": "eth-3ookc5", | 10085 | "name": "eth-3ookc5", |
811 | 10086 | "link_connected": true, | ||
812 | 10087 | "interface_speed": 1000, | ||
813 | 10088 | "link_speed": 1000, | ||
814 | 9858 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" | 10089 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/38/" |
815 | 9859 | }, | 10090 | }, |
816 | 9860 | { | 10091 | { |
817 | @@ -9933,6 +10164,9 @@ | |||
818 | 9933 | "id": 39, | 10164 | "id": 39, |
819 | 9934 | "params": "", | 10165 | "params": "", |
820 | 9935 | "name": "eth-W8E8f0", | 10166 | "name": "eth-W8E8f0", |
821 | 10167 | "link_connected": true, | ||
822 | 10168 | "interface_speed": 1000, | ||
823 | 10169 | "link_speed": 1000, | ||
824 | 9936 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" | 10170 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/39/" |
825 | 9937 | }, | 10171 | }, |
826 | 9938 | { | 10172 | { |
827 | @@ -10010,6 +10244,9 @@ | |||
828 | 10010 | "id": 40, | 10244 | "id": 40, |
829 | 10011 | "params": "", | 10245 | "params": "", |
830 | 10012 | "name": "eth-lKRYAa.42", | 10246 | "name": "eth-lKRYAa.42", |
831 | 10247 | "link_connected": true, | ||
832 | 10248 | "interface_speed": 1000, | ||
833 | 10249 | "link_speed": 1000, | ||
834 | 10013 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" | 10250 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/40/" |
835 | 10014 | }, | 10251 | }, |
836 | 10015 | { | 10252 | { |
837 | @@ -10088,6 +10325,9 @@ | |||
838 | 10088 | "id": 41, | 10325 | "id": 41, |
839 | 10089 | "params": "", | 10326 | "params": "", |
840 | 10090 | "name": "eth-3ookc5.42", | 10327 | "name": "eth-3ookc5.42", |
841 | 10328 | "link_connected": true, | ||
842 | 10329 | "interface_speed": 1000, | ||
843 | 10330 | "link_speed": 1000, | ||
844 | 10091 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" | 10331 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/41/" |
845 | 10092 | }, | 10332 | }, |
846 | 10093 | { | 10333 | { |
847 | @@ -10166,6 +10406,9 @@ | |||
848 | 10166 | "id": 42, | 10406 | "id": 42, |
849 | 10167 | "params": "", | 10407 | "params": "", |
850 | 10168 | "name": "eth-W8E8f0.42", | 10408 | "name": "eth-W8E8f0.42", |
851 | 10409 | "link_connected": true, | ||
852 | 10410 | "interface_speed": 1000, | ||
853 | 10411 | "link_speed": 1000, | ||
854 | 10169 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" | 10412 | "resource_uri": "/MAAS/api/2.0/nodes/thr3am/interfaces/42/" |
855 | 10170 | } | 10413 | } |
856 | 10171 | ], | 10414 | ], |
857 | @@ -10214,6 +10457,8 @@ | |||
858 | 10214 | "cpu_speed": 0, | 10457 | "cpu_speed": 0, |
859 | 10215 | "cache_sets": [], | 10458 | "cache_sets": [], |
860 | 10216 | "owner_data": {}, | 10459 | "owner_data": {}, |
861 | 10460 | "interface_test_status_name": "Unknown", | ||
862 | 10461 | "interface_test_status": -1, | ||
863 | 10217 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" | 10462 | "resource_uri": "/MAAS/api/2.0/machines/thr3am/" |
864 | 10218 | } | 10463 | } |
865 | 10219 | } | 10464 | } |
866 | diff --git a/src/maasserver/api/examples/nodes.json b/src/maasserver/api/examples/nodes.json | |||
867 | index 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 | 38 | "links": [], | 38 | "links": [], |
872 | 39 | "effective_mtu": 1500, | 39 | "effective_mtu": 1500, |
873 | 40 | "product": null, | 40 | "product": null, |
874 | 41 | "link_connected": true, | ||
875 | 42 | "interface_speed": 1000, | ||
876 | 43 | "link_speed": 1000, | ||
877 | 41 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/" | 44 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/" |
878 | 42 | }, | 45 | }, |
879 | 43 | "memory": 8192, | 46 | "memory": 8192, |
880 | @@ -224,6 +227,9 @@ | |||
881 | 224 | "links": [], | 227 | "links": [], |
882 | 225 | "effective_mtu": 1500, | 228 | "effective_mtu": 1500, |
883 | 226 | "product": null, | 229 | "product": null, |
884 | 230 | "link_connected": true, | ||
885 | 231 | "interface_speed": 1000, | ||
886 | 232 | "link_speed": 1000, | ||
887 | 227 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/" | 233 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/112/" |
888 | 228 | }, | 234 | }, |
889 | 229 | { | 235 | { |
890 | @@ -264,6 +270,9 @@ | |||
891 | 264 | "links": [], | 270 | "links": [], |
892 | 265 | "effective_mtu": 1500, | 271 | "effective_mtu": 1500, |
893 | 266 | "product": null, | 272 | "product": null, |
894 | 273 | "link_connected": true, | ||
895 | 274 | "interface_speed": 1000, | ||
896 | 275 | "link_speed": 1000, | ||
897 | 267 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/113/" | 276 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/113/" |
898 | 268 | }, | 277 | }, |
899 | 269 | { | 278 | { |
900 | @@ -304,6 +313,9 @@ | |||
901 | 304 | "links": [], | 313 | "links": [], |
902 | 305 | "effective_mtu": 1500, | 314 | "effective_mtu": 1500, |
903 | 306 | "product": null, | 315 | "product": null, |
904 | 316 | "link_connected": true, | ||
905 | 317 | "interface_speed": 1000, | ||
906 | 318 | "link_speed": 1000, | ||
907 | 307 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/114/" | 319 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/114/" |
908 | 308 | }, | 320 | }, |
909 | 309 | { | 321 | { |
910 | @@ -346,6 +358,9 @@ | |||
911 | 346 | "links": [], | 358 | "links": [], |
912 | 347 | "effective_mtu": 1500, | 359 | "effective_mtu": 1500, |
913 | 348 | "product": null, | 360 | "product": null, |
914 | 361 | "link_connected": true, | ||
915 | 362 | "interface_speed": 1000, | ||
916 | 363 | "link_speed": 1000, | ||
917 | 349 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/115/" | 364 | "resource_uri": "/MAAS/api/2.0/nodes/g8xyqs/interfaces/115/" |
918 | 350 | } | 365 | } |
919 | 351 | ], | 366 | ], |
920 | @@ -440,6 +455,8 @@ | |||
921 | 440 | "other_test_status_name": "Passed", | 455 | "other_test_status_name": "Passed", |
922 | 441 | "virtualblockdevice_set": [], | 456 | "virtualblockdevice_set": [], |
923 | 442 | "cpu_speed": 0, | 457 | "cpu_speed": 0, |
924 | 458 | "interface_test_status_name": "Unknown", | ||
925 | 459 | "interface_test_status": -1, | ||
926 | 443 | "resource_uri": "/MAAS/api/2.0/machines/g8xyqs/" | 460 | "resource_uri": "/MAAS/api/2.0/machines/g8xyqs/" |
927 | 444 | }, | 461 | }, |
928 | 445 | "details": { | 462 | "details": { |
929 | @@ -630,6 +647,9 @@ | |||
930 | 630 | } | 647 | } |
931 | 631 | } | 648 | } |
932 | 632 | ], | 649 | ], |
933 | 650 | "link_connected": true, | ||
934 | 651 | "interface_speed": 1000, | ||
935 | 652 | "link_speed": 1000, | ||
936 | 633 | "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/1/" | 653 | "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/1/" |
937 | 634 | }, | 654 | }, |
938 | 635 | { | 655 | { |
939 | @@ -699,6 +719,9 @@ | |||
940 | 699 | } | 719 | } |
941 | 700 | } | 720 | } |
942 | 701 | ], | 721 | ], |
943 | 722 | "link_connected": true, | ||
944 | 723 | "interface_speed": 1000, | ||
945 | 724 | "link_speed": 1000, | ||
946 | 702 | "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/17/" | 725 | "resource_uri": "/MAAS/api/2.0/nodes/6gsym8/interfaces/17/" |
947 | 703 | } | 726 | } |
948 | 704 | ], | 727 | ], |
949 | @@ -731,6 +754,8 @@ | |||
950 | 731 | "storage_test_status_name": "Unknown", | 754 | "storage_test_status_name": "Unknown", |
951 | 732 | "architecture": "amd64/generic", | 755 | "architecture": "amd64/generic", |
952 | 733 | "cpu_test_status_name": "Unknown", | 756 | "cpu_test_status_name": "Unknown", |
953 | 757 | "interface_test_status_name": "Unknown", | ||
954 | 758 | "interface_test_status": -1, | ||
955 | 734 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/6gsym8/" | 759 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/6gsym8/" |
956 | 735 | } | 760 | } |
957 | 736 | ], | 761 | ], |
958 | @@ -811,6 +836,9 @@ | |||
959 | 811 | } | 836 | } |
960 | 812 | ], | 837 | ], |
961 | 813 | "discovered": null, | 838 | "discovered": null, |
962 | 839 | "link_connected": true, | ||
963 | 840 | "interface_speed": 1000, | ||
964 | 841 | "link_speed": 1000, | ||
965 | 814 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/" | 842 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/" |
966 | 815 | }, | 843 | }, |
967 | 816 | "swap_size": null, | 844 | "swap_size": null, |
968 | @@ -942,6 +970,9 @@ | |||
969 | 942 | } | 970 | } |
970 | 943 | ], | 971 | ], |
971 | 944 | "discovered": null, | 972 | "discovered": null, |
972 | 973 | "link_connected": true, | ||
973 | 974 | "interface_speed": 1000, | ||
974 | 975 | "link_speed": 1000, | ||
975 | 945 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/" | 976 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/100/" |
976 | 946 | }, | 977 | }, |
977 | 947 | { | 978 | { |
978 | @@ -1016,6 +1047,9 @@ | |||
979 | 1016 | } | 1047 | } |
980 | 1017 | ], | 1048 | ], |
981 | 1018 | "discovered": null, | 1049 | "discovered": null, |
982 | 1050 | "link_connected": true, | ||
983 | 1051 | "interface_speed": 1000, | ||
984 | 1052 | "link_speed": 1000, | ||
985 | 1019 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/101/" | 1053 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/101/" |
986 | 1020 | }, | 1054 | }, |
987 | 1021 | { | 1055 | { |
988 | @@ -1091,6 +1125,9 @@ | |||
989 | 1091 | } | 1125 | } |
990 | 1092 | ], | 1126 | ], |
991 | 1093 | "discovered": null, | 1127 | "discovered": null, |
992 | 1128 | "link_connected": true, | ||
993 | 1129 | "interface_speed": 1000, | ||
994 | 1130 | "link_speed": 1000, | ||
995 | 1094 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/102/" | 1131 | "resource_uri": "/MAAS/api/2.0/nodes/q46awd/interfaces/102/" |
996 | 1095 | } | 1132 | } |
997 | 1096 | ], | 1133 | ], |
998 | @@ -1429,6 +1466,8 @@ | |||
999 | 1429 | "ip_addresses": [ | 1466 | "ip_addresses": [ |
1000 | 1430 | "172.16.1.252" | 1467 | "172.16.1.252" |
1001 | 1431 | ], | 1468 | ], |
1002 | 1469 | "interface_test_status_name": "Unknown", | ||
1003 | 1470 | "interface_test_status": -1, | ||
1004 | 1432 | "resource_uri": "/MAAS/api/2.0/machines/q46awd/" | 1471 | "resource_uri": "/MAAS/api/2.0/machines/q46awd/" |
1005 | 1433 | }, | 1472 | }, |
1006 | 1434 | "query-power-state": { | 1473 | "query-power-state": { |
1007 | @@ -1513,6 +1552,9 @@ | |||
1008 | 1513 | "tags": [], | 1552 | "tags": [], |
1009 | 1514 | "type": "physical", | 1553 | "type": "physical", |
1010 | 1515 | "params": "", | 1554 | "params": "", |
1011 | 1555 | "link_connected": true, | ||
1012 | 1556 | "interface_speed": 1000, | ||
1013 | 1557 | "link_speed": 1000, | ||
1014 | 1516 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 1558 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1015 | 1517 | }, | 1559 | }, |
1016 | 1518 | "boot_disk": { | 1560 | "boot_disk": { |
1017 | @@ -1734,6 +1776,9 @@ | |||
1018 | 1734 | "tags": [], | 1776 | "tags": [], |
1019 | 1735 | "type": "physical", | 1777 | "type": "physical", |
1020 | 1736 | "params": "", | 1778 | "params": "", |
1021 | 1779 | "link_connected": true, | ||
1022 | 1780 | "interface_speed": 1000, | ||
1023 | 1781 | "link_speed": 1000, | ||
1024 | 1737 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 1782 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1025 | 1738 | } | 1783 | } |
1026 | 1739 | ], | 1784 | ], |
1027 | @@ -1820,6 +1865,8 @@ | |||
1028 | 1820 | "status_name": "Deployed", | 1865 | "status_name": "Deployed", |
1029 | 1821 | "storage_test_status_name": "Passed", | 1866 | "storage_test_status_name": "Passed", |
1030 | 1822 | "owner": "admin", | 1867 | "owner": "admin", |
1031 | 1868 | "interface_test_status_name": "Unknown", | ||
1032 | 1869 | "interface_test_status": -1, | ||
1033 | 1823 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" | 1870 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" |
1034 | 1824 | }, | 1871 | }, |
1035 | 1825 | "power-off": { | 1872 | "power-off": { |
1036 | @@ -1901,6 +1948,9 @@ | |||
1037 | 1901 | "tags": [], | 1948 | "tags": [], |
1038 | 1902 | "type": "physical", | 1949 | "type": "physical", |
1039 | 1903 | "params": "", | 1950 | "params": "", |
1040 | 1951 | "link_connected": true, | ||
1041 | 1952 | "interface_speed": 1000, | ||
1042 | 1953 | "link_speed": 1000, | ||
1043 | 1904 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 1954 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1044 | 1905 | }, | 1955 | }, |
1045 | 1906 | "boot_disk": { | 1956 | "boot_disk": { |
1046 | @@ -2122,6 +2172,9 @@ | |||
1047 | 2122 | "tags": [], | 2172 | "tags": [], |
1048 | 2123 | "type": "physical", | 2173 | "type": "physical", |
1049 | 2124 | "params": "", | 2174 | "params": "", |
1050 | 2175 | "link_connected": true, | ||
1051 | 2176 | "interface_speed": 1000, | ||
1052 | 2177 | "link_speed": 1000, | ||
1053 | 2125 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 2178 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1054 | 2126 | } | 2179 | } |
1055 | 2127 | ], | 2180 | ], |
1056 | @@ -2208,6 +2261,8 @@ | |||
1057 | 2208 | "status_name": "Deployed", | 2261 | "status_name": "Deployed", |
1058 | 2209 | "storage_test_status_name": "Passed", | 2262 | "storage_test_status_name": "Passed", |
1059 | 2210 | "owner": "admin", | 2263 | "owner": "admin", |
1060 | 2264 | "interface_test_status_name": "Unknown", | ||
1061 | 2265 | "interface_test_status": -1, | ||
1062 | 2211 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" | 2266 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" |
1063 | 2212 | }, | 2267 | }, |
1064 | 2213 | "test": { | 2268 | "test": { |
1065 | @@ -2365,6 +2420,9 @@ | |||
1066 | 2365 | "system_id": "e8xa8m", | 2420 | "system_id": "e8xa8m", |
1067 | 2366 | "enabled": true, | 2421 | "enabled": true, |
1068 | 2367 | "name": "ens4", | 2422 | "name": "ens4", |
1069 | 2423 | "link_connected": true, | ||
1070 | 2424 | "interface_speed": 1000, | ||
1071 | 2425 | "link_speed": 1000, | ||
1072 | 2368 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 2426 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1073 | 2369 | }, | 2427 | }, |
1074 | 2370 | "pod": { | 2428 | "pod": { |
1075 | @@ -2592,10 +2650,15 @@ | |||
1076 | 2592 | "system_id": "e8xa8m", | 2650 | "system_id": "e8xa8m", |
1077 | 2593 | "enabled": true, | 2651 | "enabled": true, |
1078 | 2594 | "name": "ens4", | 2652 | "name": "ens4", |
1079 | 2653 | "link_connected": true, | ||
1080 | 2654 | "interface_speed": 1000, | ||
1081 | 2655 | "link_speed": 1000, | ||
1082 | 2595 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" | 2656 | "resource_uri": "/MAAS/api/2.0/nodes/e8xa8m/interfaces/5/" |
1083 | 2596 | } | 2657 | } |
1084 | 2597 | ], | 2658 | ], |
1085 | 2598 | "commissioning_status_name": "Passed", | 2659 | "commissioning_status_name": "Passed", |
1086 | 2660 | "interface_test_status_name": "Unknown", | ||
1087 | 2661 | "interface_test_status": -1, | ||
1088 | 2599 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" | 2662 | "resource_uri": "/MAAS/api/2.0/machines/e8xa8m/" |
1089 | 2600 | }, | 2663 | }, |
1090 | 2601 | "get-power-params": { | 2664 | "get-power-params": { |
1091 | diff --git a/src/maasserver/api/examples/rackcontrollers.json b/src/maasserver/api/examples/rackcontrollers.json | |||
1092 | index 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 | 43 | "params": "", | 43 | "params": "", |
1097 | 44 | "vendor": null, | 44 | "vendor": null, |
1098 | 45 | "type": "physical", | 45 | "type": "physical", |
1099 | 46 | "link_connected": true, | ||
1100 | 47 | "interface_speed": 1000, | ||
1101 | 48 | "link_speed": 1000, | ||
1102 | 46 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/" | 49 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/" |
1103 | 47 | }, | 50 | }, |
1104 | 48 | { | 51 | { |
1105 | @@ -83,6 +86,9 @@ | |||
1106 | 83 | "params": "", | 86 | "params": "", |
1107 | 84 | "vendor": null, | 87 | "vendor": null, |
1108 | 85 | "type": "physical", | 88 | "type": "physical", |
1109 | 89 | "link_connected": true, | ||
1110 | 90 | "interface_speed": 1000, | ||
1111 | 91 | "link_speed": 1000, | ||
1112 | 86 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/" | 92 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/" |
1113 | 87 | }, | 93 | }, |
1114 | 88 | { | 94 | { |
1115 | @@ -160,6 +166,9 @@ | |||
1116 | 160 | "params": "", | 166 | "params": "", |
1117 | 161 | "vendor": null, | 167 | "vendor": null, |
1118 | 162 | "type": "physical", | 168 | "type": "physical", |
1119 | 169 | "link_connected": true, | ||
1120 | 170 | "interface_speed": 1000, | ||
1121 | 171 | "link_speed": 1000, | ||
1122 | 163 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/" | 172 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/" |
1123 | 164 | }, | 173 | }, |
1124 | 165 | { | 174 | { |
1125 | @@ -240,6 +249,9 @@ | |||
1126 | 240 | "params": "", | 249 | "params": "", |
1127 | 241 | "vendor": null, | 250 | "vendor": null, |
1128 | 242 | "type": "bond", | 251 | "type": "bond", |
1129 | 252 | "link_connected": true, | ||
1130 | 253 | "interface_speed": 1000, | ||
1131 | 254 | "link_speed": 1000, | ||
1132 | 243 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/" | 255 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/" |
1133 | 244 | }, | 256 | }, |
1134 | 245 | { | 257 | { |
1135 | @@ -319,6 +331,9 @@ | |||
1136 | 319 | "params": "", | 331 | "params": "", |
1137 | 320 | "vendor": null, | 332 | "vendor": null, |
1138 | 321 | "type": "vlan", | 333 | "type": "vlan", |
1139 | 334 | "link_connected": true, | ||
1140 | 335 | "interface_speed": 1000, | ||
1141 | 336 | "link_speed": 1000, | ||
1142 | 322 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/" | 337 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/" |
1143 | 323 | } | 338 | } |
1144 | 324 | ], | 339 | ], |
1145 | @@ -541,6 +556,9 @@ | |||
1146 | 541 | "mac_address": "f9:d6:ff:1b:a9:64", | 556 | "mac_address": "f9:d6:ff:1b:a9:64", |
1147 | 542 | "system_id": "fcka3t", | 557 | "system_id": "fcka3t", |
1148 | 543 | "effective_mtu": 1500, | 558 | "effective_mtu": 1500, |
1149 | 559 | "link_connected": true, | ||
1150 | 560 | "interface_speed": 1000, | ||
1151 | 561 | "link_speed": 1000, | ||
1152 | 544 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/" | 562 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/6/" |
1153 | 545 | }, | 563 | }, |
1154 | 546 | { | 564 | { |
1155 | @@ -581,6 +599,9 @@ | |||
1156 | 581 | "mac_address": "4f:e6:e6:df:61:ec", | 599 | "mac_address": "4f:e6:e6:df:61:ec", |
1157 | 582 | "system_id": "fcka3t", | 600 | "system_id": "fcka3t", |
1158 | 583 | "effective_mtu": 1500, | 601 | "effective_mtu": 1500, |
1159 | 602 | "link_connected": true, | ||
1160 | 603 | "interface_speed": 1000, | ||
1161 | 604 | "link_speed": 1000, | ||
1162 | 584 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/" | 605 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/7/" |
1163 | 585 | }, | 606 | }, |
1164 | 586 | { | 607 | { |
1165 | @@ -658,6 +679,9 @@ | |||
1166 | 658 | "mac_address": "ac:8e:44:fc:d0:97", | 679 | "mac_address": "ac:8e:44:fc:d0:97", |
1167 | 659 | "system_id": "fcka3t", | 680 | "system_id": "fcka3t", |
1168 | 660 | "effective_mtu": 1500, | 681 | "effective_mtu": 1500, |
1169 | 682 | "link_connected": true, | ||
1170 | 683 | "interface_speed": 1000, | ||
1171 | 684 | "link_speed": 1000, | ||
1172 | 661 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/" | 685 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/8/" |
1173 | 662 | }, | 686 | }, |
1174 | 663 | { | 687 | { |
1175 | @@ -738,6 +762,9 @@ | |||
1176 | 738 | "mac_address": "b6:b4:a9:23:a9:af", | 762 | "mac_address": "b6:b4:a9:23:a9:af", |
1177 | 739 | "system_id": "fcka3t", | 763 | "system_id": "fcka3t", |
1178 | 740 | "effective_mtu": 1500, | 764 | "effective_mtu": 1500, |
1179 | 765 | "link_connected": true, | ||
1180 | 766 | "interface_speed": 1000, | ||
1181 | 767 | "link_speed": 1000, | ||
1182 | 741 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/" | 768 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/9/" |
1183 | 742 | }, | 769 | }, |
1184 | 743 | { | 770 | { |
1185 | @@ -817,6 +844,9 @@ | |||
1186 | 817 | "mac_address": "b6:b4:a9:23:a9:af", | 844 | "mac_address": "b6:b4:a9:23:a9:af", |
1187 | 818 | "system_id": "fcka3t", | 845 | "system_id": "fcka3t", |
1188 | 819 | "effective_mtu": 1500, | 846 | "effective_mtu": 1500, |
1189 | 847 | "link_connected": true, | ||
1190 | 848 | "interface_speed": 1000, | ||
1191 | 849 | "link_speed": 1000, | ||
1192 | 820 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/" | 850 | "resource_uri": "/MAAS/api/2.0/nodes/fcka3t/interfaces/10/" |
1193 | 821 | } | 851 | } |
1194 | 822 | ], | 852 | ], |
1195 | @@ -916,6 +946,8 @@ | |||
1196 | 916 | }, | 946 | }, |
1197 | 917 | "cpu_count": 0, | 947 | "cpu_count": 0, |
1198 | 918 | "commissioning_status_name": "Unknown", | 948 | "commissioning_status_name": "Unknown", |
1199 | 949 | "interface_test_status_name": "Unknown", | ||
1200 | 950 | "interface_test_status": -1, | ||
1201 | 919 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/fcka3t/" | 951 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/fcka3t/" |
1202 | 920 | } | 952 | } |
1203 | 921 | } | 953 | } |
1204 | diff --git a/src/maasserver/api/examples/regioncontrollers.json b/src/maasserver/api/examples/regioncontrollers.json | |||
1205 | index 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 | 102 | }, | 102 | }, |
1210 | 103 | "system_id": "ccfqya", | 103 | "system_id": "ccfqya", |
1211 | 104 | "children": [], | 104 | "children": [], |
1212 | 105 | "link_connected": true, | ||
1213 | 106 | "interface_speed": 1000, | ||
1214 | 107 | "link_speed": 1000, | ||
1215 | 105 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/1/" | 108 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/1/" |
1216 | 106 | }, | 109 | }, |
1217 | 107 | { | 110 | { |
1218 | @@ -138,6 +141,9 @@ | |||
1219 | 138 | "children": [ | 141 | "children": [ |
1220 | 139 | "br0" | 142 | "br0" |
1221 | 140 | ], | 143 | ], |
1222 | 144 | "link_connected": true, | ||
1223 | 145 | "interface_speed": 1000, | ||
1224 | 146 | "link_speed": 1000, | ||
1225 | 141 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/2/" | 147 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/2/" |
1226 | 142 | }, | 148 | }, |
1227 | 143 | { | 149 | { |
1228 | @@ -209,6 +215,9 @@ | |||
1229 | 209 | }, | 215 | }, |
1230 | 210 | "system_id": "ccfqya", | 216 | "system_id": "ccfqya", |
1231 | 211 | "children": [], | 217 | "children": [], |
1232 | 218 | "link_connected": true, | ||
1233 | 219 | "interface_speed": 1000, | ||
1234 | 220 | "link_speed": 1000, | ||
1235 | 212 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/3/" | 221 | "resource_uri": "/MAAS/api/2.0/nodes/ccfqya/interfaces/3/" |
1236 | 213 | } | 222 | } |
1237 | 214 | ], | 223 | ], |
1238 | @@ -243,6 +252,8 @@ | |||
1239 | 243 | "other_test_status": -1, | 252 | "other_test_status": -1, |
1240 | 244 | "cpu_test_status_name": "Unknown", | 253 | "cpu_test_status_name": "Unknown", |
1241 | 245 | "system_id": "ccfqya", | 254 | "system_id": "ccfqya", |
1242 | 255 | "interface_test_status_name": "Unknown", | ||
1243 | 256 | "interface_test_status": -1, | ||
1244 | 246 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/ccfqya/" | 257 | "resource_uri": "/MAAS/api/2.0/rackcontrollers/ccfqya/" |
1245 | 247 | } | 258 | } |
1246 | 248 | } | 259 | } |
LGTM!