Checkbox

Merge lp:~sylvain-pineau/checkbox/fix-1517786 into lp:checkbox

  1. fix-1517786
  2. Merge into trunk
Proposed by Sylvain Pineau
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 4105
Merged at revision: 4110
Proposed branch: lp:~sylvain-pineau/checkbox/fix-1517786
Merge into: lp:checkbox
Diff against target: 532 lines (+105/-35)
2 files modified
providers/plainbox-provider-checkbox/jobs/suspend.txt.in (+54/-18)
providers/plainbox-provider-checkbox/jobs/wireless.txt.in (+51/-17)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/fix-1517786
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+278130@code.launchpad.net

Description of the change

Fixes the linked (Critical) bug. Ethernet can now be restored even on precise with the same nmcli command.

The biggest issue was not the precise command but I've found that by restoring the command at the end of test we were masking the real exit status of several tests (gateway ping test and iperf). This MR also fixes this problem.

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Looks good (except copy-paste methodology :D )
+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/jobs/suspend.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2015-11-02 08:33:27 +0000
3+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2015-11-20 11:20:06 +0000
4@@ -694,11 +694,13 @@
5 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
6 iw dev $INTERFACE link
7 gateway_ping_test --interface=$INTERFACE
8+ STATUS=$?
9 # We reconnect the Ethernet connection if any (lp:1471663)
10- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
11+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
12 if [[ ! -z $WIRED ]]; then
13 nmcli c up uuid $WIRED
14 fi
15+ exit $STATUS
16 else
17 exit 1
18 fi
19@@ -723,11 +725,13 @@
20 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
21 iw dev $INTERFACE link
22 gateway_ping_test --interface=$INTERFACE
23+ STATUS=$?
24 # We reconnect the Ethernet connection if any (lp:1471663)
25- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
26+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
27 if [[ ! -z $WIRED ]]; then
28 nmcli c up uuid $WIRED
29 fi
30+ exit $STATUS
31 else
32 exit 1
33 fi
34@@ -752,11 +756,13 @@
35 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
36 iw dev $INTERFACE link
37 gateway_ping_test --interface=$INTERFACE
38+ STATUS=$?
39 # We reconnect the Ethernet connection if any (lp:1471663)
40- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
41+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
42 if [[ ! -z $WIRED ]]; then
43 nmcli c up uuid $WIRED
44 fi
45+ exit $STATUS
46 else
47 exit 1
48 fi
49@@ -781,11 +787,13 @@
50 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
51 iw dev $INTERFACE link
52 gateway_ping_test --interface=$INTERFACE
53+ STATUS=$?
54 # We reconnect the Ethernet connection if any (lp:1471663)
55- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
56+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
57 if [[ ! -z $WIRED ]]; then
58 nmcli c up uuid $WIRED
59 fi
60+ exit $STATUS
61 else
62 exit 1
63 fi
64@@ -811,11 +819,13 @@
65 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
66 iw dev $INTERFACE link
67 gateway_ping_test --interface=$INTERFACE
68+ STATUS=$?
69 # We reconnect the Ethernet connection if any (lp:1471663)
70- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
71+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
72 if [[ ! -z $WIRED ]]; then
73 nmcli c up uuid $WIRED
74 fi
75+ exit $STATUS
76 else
77 exit 1
78 fi
79@@ -841,11 +851,13 @@
80 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
81 iw dev $INTERFACE link
82 gateway_ping_test --interface=$INTERFACE
83+ STATUS=$?
84 # We reconnect the Ethernet connection if any (lp:1471663)
85- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
86+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
87 if [[ ! -z $WIRED ]]; then
88 nmcli c up uuid $WIRED
89 fi
90+ exit $STATUS
91 else
92 exit 1
93 fi
94@@ -870,11 +882,13 @@
95 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
96 iw dev $INTERFACE link
97 gateway_ping_test --interface=$INTERFACE
98+ STATUS=$?
99 # We reconnect the Ethernet connection if any (lp:1471663)
100- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
101+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
102 if [[ ! -z $WIRED ]]; then
103 nmcli c up uuid $WIRED
104 fi
105+ exit $STATUS
106 else
107 exit 1
108 fi
109@@ -899,11 +913,13 @@
110 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
111 iw dev $INTERFACE link
112 gateway_ping_test --interface=$INTERFACE
113+ STATUS=$?
114 # We reconnect the Ethernet connection if any (lp:1471663)
115- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
116+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
117 if [[ ! -z $WIRED ]]; then
118 nmcli c up uuid $WIRED
119 fi
120+ exit $STATUS
121 else
122 exit 1
123 fi
124@@ -928,11 +944,13 @@
125 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
126 iw dev $INTERFACE link
127 gateway_ping_test --interface=$INTERFACE
128+ STATUS=$?
129 # We reconnect the Ethernet connection if any (lp:1471663)
130- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
131+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
132 if [[ ! -z $WIRED ]]; then
133 nmcli c up uuid $WIRED
134 fi
135+ exit $STATUS
136 else
137 exit 1
138 fi
139@@ -957,11 +975,13 @@
140 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
141 iw dev $INTERFACE link
142 gateway_ping_test --interface=$INTERFACE
143+ STATUS=$?
144 # We reconnect the Ethernet connection if any (lp:1471663)
145- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
146+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
147 if [[ ! -z $WIRED ]]; then
148 nmcli c up uuid $WIRED
149 fi
150+ exit $STATUS
151 else
152 exit 1
153 fi
154@@ -987,11 +1007,13 @@
155 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
156 iw dev $INTERFACE link
157 gateway_ping_test --interface=$INTERFACE
158+ STATUS=$?
159 # We reconnect the Ethernet connection if any (lp:1471663)
160- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
161+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
162 if [[ ! -z $WIRED ]]; then
163 nmcli c up uuid $WIRED
164 fi
165+ exit $STATUS
166 else
167 exit 1
168 fi
169@@ -1017,11 +1039,13 @@
170 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
171 iw dev $INTERFACE link
172 gateway_ping_test --interface=$INTERFACE
173+ STATUS=$?
174 # We reconnect the Ethernet connection if any (lp:1471663)
175- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
176+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
177 if [[ ! -z $WIRED ]]; then
178 nmcli c up uuid $WIRED
179 fi
180+ exit $STATUS
181 else
182 exit 1
183 fi
184@@ -1116,11 +1140,13 @@
185 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
186 iw dev $INTERFACE link
187 gateway_ping_test --interface=$INTERFACE
188+ STATUS=$?
189 # We reconnect the Ethernet connection if any (lp:1471663)
190- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
191+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
192 if [[ ! -z $WIRED ]]; then
193 nmcli c up uuid $WIRED
194 fi
195+ exit $STATUS
196 else
197 exit 1
198 fi
199@@ -1154,11 +1180,13 @@
200 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
201 iw dev $INTERFACE link
202 gateway_ping_test --interface=$INTERFACE
203+ STATUS=$?
204 # We reconnect the Ethernet connection if any (lp:1471663)
205- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
206+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
207 if [[ ! -z $WIRED ]]; then
208 nmcli c up uuid $WIRED
209 fi
210+ exit $STATUS
211 else
212 exit 1
213 fi
214@@ -1192,11 +1220,13 @@
215 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
216 iw dev $INTERFACE link
217 gateway_ping_test --interface=$INTERFACE
218+ STATUS=$?
219 # We reconnect the Ethernet connection if any (lp:1471663)
220- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
221+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
222 if [[ ! -z $WIRED ]]; then
223 nmcli c up uuid $WIRED
224 fi
225+ exit $STATUS
226 else
227 exit 1
228 fi
229@@ -1230,11 +1260,13 @@
230 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
231 iw dev $INTERFACE link
232 gateway_ping_test --interface=$INTERFACE
233+ STATUS=$?
234 # We reconnect the Ethernet connection if any (lp:1471663)
235- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
236+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
237 if [[ ! -z $WIRED ]]; then
238 nmcli c up uuid $WIRED
239 fi
240+ exit $STATUS
241 else
242 exit 1
243 fi
244@@ -1268,11 +1300,13 @@
245 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
246 iw dev $INTERFACE link
247 gateway_ping_test --interface=$INTERFACE
248+ STATUS=$?
249 # We reconnect the Ethernet connection if any (lp:1471663)
250- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
251+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
252 if [[ ! -z $WIRED ]]; then
253 nmcli c up uuid $WIRED
254 fi
255+ exit $STATUS
256 else
257 exit 1
258 fi
259@@ -1306,11 +1340,13 @@
260 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
261 iw dev $INTERFACE link
262 gateway_ping_test --interface=$INTERFACE
263+ STATUS=$?
264 # We reconnect the Ethernet connection if any (lp:1471663)
265- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
266+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
267 if [[ ! -z $WIRED ]]; then
268 nmcli c up uuid $WIRED
269 fi
270+ exit $STATUS
271 else
272 exit 1
273 fi
274
275=== modified file 'providers/plainbox-provider-checkbox/jobs/wireless.txt.in'
276--- providers/plainbox-provider-checkbox/jobs/wireless.txt.in 2015-10-29 15:41:06 +0000
277+++ providers/plainbox-provider-checkbox/jobs/wireless.txt.in 2015-11-20 11:20:06 +0000
278@@ -63,11 +63,13 @@
279 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
280 iw dev $INTERFACE link
281 gateway_ping_test --interface=$INTERFACE
282+ STATUS=$?
283 # We reconnect the Ethernet connection if any (lp:1471663)
284- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
285+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
286 if [[ ! -z $WIRED ]]; then
287 nmcli c up uuid $WIRED
288 fi
289+ exit $STATUS
290 else
291 exit 1
292 fi
293@@ -91,11 +93,13 @@
294 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
295 iw dev $INTERFACE link
296 gateway_ping_test --interface=$INTERFACE
297+ STATUS=$?
298 # We reconnect the Ethernet connection if any (lp:1471663)
299- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
300+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
301 if [[ ! -z $WIRED ]]; then
302 nmcli c up uuid $WIRED
303 fi
304+ exit $STATUS
305 else
306 exit 1
307 fi
308@@ -119,11 +123,13 @@
309 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
310 iw dev $INTERFACE link
311 gateway_ping_test --interface=$INTERFACE
312+ STATUS=$?
313 # We reconnect the Ethernet connection if any (lp:1471663)
314- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
315+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
316 if [[ ! -z $WIRED ]]; then
317 nmcli c up uuid $WIRED
318 fi
319+ exit $STATUS
320 else
321 exit 1
322 fi
323@@ -147,11 +153,13 @@
324 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
325 iw dev $INTERFACE link
326 gateway_ping_test --interface=$INTERFACE
327+ STATUS=$?
328 # We reconnect the Ethernet connection if any (lp:1471663)
329- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
330+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
331 if [[ ! -z $WIRED ]]; then
332 nmcli c up uuid $WIRED
333 fi
334+ exit $STATUS
335 else
336 exit 1
337 fi
338@@ -176,11 +184,13 @@
339 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
340 iw dev $INTERFACE link
341 gateway_ping_test --interface=$INTERFACE
342+ STATUS=$?
343 # We reconnect the Ethernet connection if any (lp:1471663)
344- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
345+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
346 if [[ ! -z $WIRED ]]; then
347 nmcli c up uuid $WIRED
348 fi
349+ exit $STATUS
350 else
351 exit 1
352 fi
353@@ -205,11 +215,13 @@
354 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
355 iw dev $INTERFACE link
356 gateway_ping_test --interface=$INTERFACE
357+ STATUS=$?
358 # We reconnect the Ethernet connection if any (lp:1471663)
359- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
360+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
361 if [[ ! -z $WIRED ]]; then
362 nmcli c up uuid $WIRED
363 fi
364+ exit $STATUS
365 else
366 exit 1
367 fi
368@@ -233,11 +245,13 @@
369 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
370 iw dev $INTERFACE link
371 gateway_ping_test --interface=$INTERFACE
372+ STATUS=$?
373 # We reconnect the Ethernet connection if any (lp:1471663)
374- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
375+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
376 if [[ ! -z $WIRED ]]; then
377 nmcli c up uuid $WIRED
378 fi
379+ exit $STATUS
380 else
381 exit 1
382 fi
383@@ -270,11 +284,13 @@
384 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
385 iw dev $INTERFACE link
386 gateway_ping_test --interface=$INTERFACE
387+ STATUS=$?
388 # We reconnect the Ethernet connection if any (lp:1471663)
389- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
390+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
391 if [[ ! -z $WIRED ]]; then
392 nmcli c up uuid $WIRED
393 fi
394+ exit $STATUS
395 else
396 exit 1
397 fi
398@@ -308,11 +324,13 @@
399 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
400 iw dev $INTERFACE link
401 gateway_ping_test --interface=$INTERFACE
402+ STATUS=$?
403 # We reconnect the Ethernet connection if any (lp:1471663)
404- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
405+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
406 if [[ ! -z $WIRED ]]; then
407 nmcli c up uuid $WIRED
408 fi
409+ exit $STATUS
410 else
411 exit 1
412 fi
413@@ -346,11 +364,13 @@
414 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
415 iw dev $INTERFACE link
416 gateway_ping_test --interface=$INTERFACE
417+ STATUS=$?
418 # We reconnect the Ethernet connection if any (lp:1471663)
419- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
420+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
421 if [[ ! -z $WIRED ]]; then
422 nmcli c up uuid $WIRED
423 fi
424+ exit $STATUS
425 else
426 exit 1
427 fi
428@@ -384,11 +404,13 @@
429 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
430 iw dev $INTERFACE link
431 gateway_ping_test --interface=$INTERFACE
432+ STATUS=$?
433 # We reconnect the Ethernet connection if any (lp:1471663)
434- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
435+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
436 if [[ ! -z $WIRED ]]; then
437 nmcli c up uuid $WIRED
438 fi
439+ exit $STATUS
440 else
441 exit 1
442 fi
443@@ -422,11 +444,13 @@
444 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
445 iw dev $INTERFACE link
446 gateway_ping_test --interface=$INTERFACE
447+ STATUS=$?
448 # We reconnect the Ethernet connection if any (lp:1471663)
449- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
450+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
451 if [[ ! -z $WIRED ]]; then
452 nmcli c up uuid $WIRED
453 fi
454+ exit $STATUS
455 else
456 exit 1
457 fi
458@@ -459,11 +483,13 @@
459 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
460 iw dev $INTERFACE link
461 iperf -c $SERVER_IPERF -t 300 -i 30
462+ STATUS=$?
463 # We reconnect the Ethernet connection if any (lp:1471663)
464- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
465+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
466 if [[ ! -z $WIRED ]]; then
467 nmcli c up uuid $WIRED
468 fi
469+ exit $STATUS
470 else
471 exit 1
472 fi
473@@ -486,11 +512,13 @@
474 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
475 iw dev $INTERFACE link
476 iperf -c $SERVER_IPERF -t 300 -i 30 -u -b 100m -p 5050
477+ STATUS=$?
478 # We reconnect the Ethernet connection if any (lp:1471663)
479- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
480+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
481 if [[ ! -z $WIRED ]]; then
482 nmcli c up uuid $WIRED
483 fi
484+ exit $STATUS
485 else
486 exit 1
487 fi
488@@ -513,11 +541,13 @@
489 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
490 iw dev $INTERFACE link
491 gateway_ping_test --interface=$INTERFACE
492+ STATUS=$?
493 # We reconnect the Ethernet connection if any (lp:1471663)
494- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
495+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
496 if [[ ! -z $WIRED ]]; then
497 nmcli c up uuid $WIRED
498 fi
499+ exit $STATUS
500 else
501 exit 1
502 fi
503@@ -541,11 +571,13 @@
504 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
505 iw dev $INTERFACE link
506 gateway_ping_test --interface=$INTERFACE
507+ STATUS=$?
508 # We reconnect the Ethernet connection if any (lp:1471663)
509- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
510+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
511 if [[ ! -z $WIRED ]]; then
512 nmcli c up uuid $WIRED
513 fi
514+ exit $STATUS
515 else
516 exit 1
517 fi
518@@ -588,11 +620,13 @@
519 INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
520 iw dev $INTERFACE link
521 gateway_ping_test --interface=$INTERFACE
522+ STATUS=$?
523 # We reconnect the Ethernet connection if any (lp:1471663)
524- WIRED=$((nmcli -f CONNECTIONS dev list 2>&1 || nmcli -f CONNECTIONS dev show) | grep -oP "\S+(?= \| Wired)")
525+ WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
526 if [[ ! -z $WIRED ]]; then
527 nmcli c up uuid $WIRED
528 fi
529+ exit $STATUS
530 else
531 exit 1
532 fi

Subscribers

People subscribed via source and target branches