Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1848314 into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox
  3. fix-1848314
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 8956e06e4a5b620eb1e5f880ea9f014effa925e3
Merged at revision: 08f8a1bd8f59515e18b1a690cfb9d534fc14c36a
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:fix-1848314
Merge into: plainbox-provider-checkbox:master
Diff against target: 423 lines (+46/-46)
3 files modified
units/wireless/wifi-ap.pxu (+29/-29)
units/wireless/wireless-connection-manual.pxu (+9/-9)
units/wireless/wireless-connection-netplan.pxu (+8/-8)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+374342@code.launchpad.net

Description of the change

Fixes the linked bug

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved (tested by supplying the SUT udevadm data to the template engine)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/wireless/wifi-ap.pxu b/units/wireless/wifi-ap.pxu
2index df25b50..335d505 100644
3--- a/units/wireless/wifi-ap.pxu
4+++ b/units/wireless/wifi-ap.pxu
5@@ -1,6 +1,6 @@
6 unit: template
7 template-resource: device
8-template-filter: device.category == 'WIRELESS'
9+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
10 template-unit: job
11 id: wireless/wifi_ap_open_a_no_sta_{interface}_manual
12 category_id: wifi_ap
13@@ -29,7 +29,7 @@ flags: preserve-locale also-after-suspend
14
15 unit: template
16 template-resource: device
17-template-filter: device.category == 'WIRELESS'
18+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
19 template-unit: job
20 id: wireless/wifi_ap_open_a_no_sta_{interface}_auto
21 category_id: wifi_ap
22@@ -71,7 +71,7 @@ flags: preserve-locale also-after-suspend
23
24 unit: template
25 template-resource: device
26-template-filter: device.category == 'WIRELESS'
27+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
28 template-unit: job
29 id: wireless/wifi_ap_open_b_no_sta_{interface}_manual
30 category_id: wifi_ap
31@@ -100,7 +100,7 @@ flags: preserve-locale also-after-suspend
32
33 unit: template
34 template-resource: device
35-template-filter: device.category == 'WIRELESS'
36+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
37 template-unit: job
38 id: wireless/wifi_ap_open_b_no_sta_{interface}_auto
39 category_id: wifi_ap
40@@ -142,7 +142,7 @@ flags: preserve-locale also-after-suspend
41
42 unit: template
43 template-resource: device
44-template-filter: device.category == 'WIRELESS'
45+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
46 template-unit: job
47 id: wireless/wifi_ap_open_g_no_sta_{interface}_manual
48 category_id: wifi_ap
49@@ -171,7 +171,7 @@ flags: preserve-locale also-after-suspend
50
51 unit: template
52 template-resource: device
53-template-filter: device.category == 'WIRELESS'
54+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
55 template-unit: job
56 id: wireless/wifi_ap_open_g_no_sta_{interface}_auto
57 category_id: wifi_ap
58@@ -213,7 +213,7 @@ flags: preserve-locale also-after-suspend
59
60 unit: template
61 template-resource: device
62-template-filter: device.category == 'WIRELESS'
63+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
64 template-unit: job
65 id: wireless/wifi_ap_open_ad_no_sta_{interface}_manual
66 category_id: wifi_ap
67@@ -242,7 +242,7 @@ flags: preserve-locale also-after-suspend
68
69 unit: template
70 template-resource: device
71-template-filter: device.category == 'WIRELESS'
72+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
73 template-unit: job
74 id: wireless/wifi_ap_open_ad_no_sta_{interface}_auto
75 category_id: wifi_ap
76@@ -284,7 +284,7 @@ flags: preserve-locale also-after-suspend
77
78 unit: template
79 template-resource: device
80-template-filter: device.category == 'WIRELESS'
81+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
82 template-unit: job
83 id: wireless/wifi_ap_wpa_a_no_sta_{interface}_manual
84 category_id: wifi_ap
85@@ -314,7 +314,7 @@ flags: preserve-locale also-after-suspend
86
87 unit: template
88 template-resource: device
89-template-filter: device.category == 'WIRELESS'
90+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
91 template-unit: job
92 id: wireless/wifi_ap_wpa_a_no_sta_{interface}_auto
93 category_id: wifi_ap
94@@ -357,7 +357,7 @@ flags: preserve-locale also-after-suspend
95
96 unit: template
97 template-resource: device
98-template-filter: device.category == 'WIRELESS'
99+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
100 template-unit: job
101 id: wireless/wifi_ap_wpa_b_no_sta_{interface}_manual
102 category_id: wifi_ap
103@@ -387,7 +387,7 @@ flags: preserve-locale also-after-suspend
104
105 unit: template
106 template-resource: device
107-template-filter: device.category == 'WIRELESS'
108+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
109 template-unit: job
110 id: wireless/wifi_ap_wpa_b_no_sta_{interface}_auto
111 category_id: wifi_ap
112@@ -430,7 +430,7 @@ flags: preserve-locale also-after-suspend
113
114 unit: template
115 template-resource: device
116-template-filter: device.category == 'WIRELESS'
117+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
118 template-unit: job
119 id: wireless/wifi_ap_wpa_g_no_sta_{interface}_manual
120 category_id: wifi_ap
121@@ -460,7 +460,7 @@ flags: preserve-locale also-after-suspend
122
123 unit: template
124 template-resource: device
125-template-filter: device.category == 'WIRELESS'
126+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
127 template-unit: job
128 id: wireless/wifi_ap_wpa_g_no_sta_{interface}_auto
129 category_id: wifi_ap
130@@ -503,7 +503,7 @@ flags: preserve-locale also-after-suspend
131
132 unit: template
133 template-resource: device
134-template-filter: device.category == 'WIRELESS'
135+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
136 template-unit: job
137 id: wireless/wifi_ap_wpa_ad_no_sta_{interface}_manual
138 category_id: wifi_ap
139@@ -533,7 +533,7 @@ flags: preserve-locale also-after-suspend
140
141 unit: template
142 template-resource: device
143-template-filter: device.category == 'WIRELESS'
144+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
145 template-unit: job
146 id: wireless/wifi_ap_wpa_ad_no_sta_{interface}_auto
147 category_id: wifi_ap
148@@ -576,7 +576,7 @@ flags: preserve-locale also-after-suspend
149
150 unit: template
151 template-resource: device
152-template-filter: device.category == 'WIRELESS'
153+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
154 template-unit: job
155 id: wireless/wifi_ap_wpa_a_with_sta_{interface}
156 category_id: wifi_ap
157@@ -615,7 +615,7 @@ flags: preserve-locale also-after-suspend
158
159 unit: template
160 template-resource: device
161-template-filter: device.category == 'WIRELESS'
162+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
163 template-unit: job
164 id: wireless/wifi_ap_wpa_a_with_sta_{interface}_auto
165 category_id: wifi_ap
166@@ -664,7 +664,7 @@ flags: preserve-locale also-after-suspend
167
168 unit: template
169 template-resource: device
170-template-filter: device.category == 'WIRELESS'
171+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
172 template-unit: job
173 id: wireless/wifi_ap_wpa_b_with_sta_{interface}
174 category_id: wifi_ap
175@@ -703,7 +703,7 @@ flags: preserve-locale also-after-suspend
176
177 unit: template
178 template-resource: device
179-template-filter: device.category == 'WIRELESS'
180+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
181 template-unit: job
182 id: wireless/wifi_ap_wpa_b_with_sta_{interface}_auto
183 category_id: wifi_ap
184@@ -752,7 +752,7 @@ flags: preserve-locale also-after-suspend
185
186 unit: template
187 template-resource: device
188-template-filter: device.category == 'WIRELESS'
189+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
190 template-unit: job
191 id: wireless/wifi_ap_wpa_g_with_sta_{interface}
192 category_id: wifi_ap
193@@ -791,7 +791,7 @@ flags: preserve-locale also-after-suspend
194
195 unit: template
196 template-resource: device
197-template-filter: device.category == 'WIRELESS'
198+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
199 template-unit: job
200 id: wireless/wifi_ap_wpa_g_with_sta_{interface}_auto
201 category_id: wifi_ap
202@@ -840,7 +840,7 @@ flags: preserve-locale also-after-suspend
203
204 unit: template
205 template-resource: device
206-template-filter: device.category == 'WIRELESS'
207+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
208 template-unit: job
209 id: wireless/wifi_ap_wpa_ad_with_sta_{interface}
210 category_id: wifi_ap
211@@ -879,7 +879,7 @@ flags: preserve-locale also-after-suspend
212
213 unit: template
214 template-resource: device
215-template-filter: device.category == 'WIRELESS'
216+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
217 template-unit: job
218 id: wireless/wifi_ap_wpa_ad_with_sta_{interface}_auto
219 category_id: wifi_ap
220@@ -928,7 +928,7 @@ flags: preserve-locale also-after-suspend
221
222 unit: template
223 template-resource: device
224-template-filter: device.category == 'WIRELESS'
225+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
226 template-unit: job
227 id: wireless/wifi_ap_setup_wizard_{interface}_auto
228 category_id: wifi_ap
229@@ -959,7 +959,7 @@ flags: preserve-locale also-after-suspend
230
231 unit: template
232 template-resource: device
233-template-filter: device.category == 'WIRELESS'
234+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
235 template-unit: job
236 id: wireless/wifi_ap_across_reboot_{interface}_setup
237 category_id: wifi_ap
238@@ -991,7 +991,7 @@ flags: preserve-locale noreturn autorestart
239
240 unit: template
241 template-resource: device
242-template-filter: device.category == 'WIRELESS'
243+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
244 template-unit: job
245 id: wireless/wifi_ap_across_reboot_{interface}_setup_manual
246 category_id: wifi_ap
247@@ -1025,7 +1025,7 @@ flags: preserve-locale noreturn
248
249 unit: template
250 template-resource: device
251-template-filter: device.category == 'WIRELESS'
252+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
253 template-unit: job
254 id: wireless/wifi_ap_across_reboot_{interface}_check
255 category_id: wifi_ap
256@@ -1057,7 +1057,7 @@ flags: preserve-locale
257
258 unit: template
259 template-resource: device
260-template-filter: device.category == 'WIRELESS'
261+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
262 template-unit: job
263 id: wireless/wifi_ap_across_reboot_{interface}_check_manual
264 category_id: wifi_ap
265diff --git a/units/wireless/wireless-connection-manual.pxu b/units/wireless/wireless-connection-manual.pxu
266index 9986578..13ff465 100644
267--- a/units/wireless/wireless-connection-manual.pxu
268+++ b/units/wireless/wireless-connection-manual.pxu
269@@ -1,6 +1,6 @@
270 unit: template
271 template-resource: device
272-template-filter: device.category == 'WIRELESS'
273+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
274 template-unit: job
275 id: wireless/wireless_connection_open_ax_{interface}
276 _summary: Connect to unencrypted 802.11ax Wi-Fi network on {interface}
277@@ -21,7 +21,7 @@ flags: preserve-locale also-after-suspend
278
279 unit: template
280 template-resource: device
281-template-filter: device.category == 'WIRELESS'
282+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
283 template-unit: job
284 id: wireless/wireless_connection_open_ac_{interface}
285 _summary: Connect to unencrypted 802.11ac Wi-Fi network on {interface}
286@@ -42,7 +42,7 @@ flags: preserve-locale also-after-suspend
287
288 unit: template
289 template-resource: device
290-template-filter: device.category == 'WIRELESS'
291+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
292 template-unit: job
293 id: wireless/wireless_connection_open_bg_{interface}
294 _summary: Connect to unencrypted 802.11b/g Wi-Fi network on {interface}
295@@ -63,7 +63,7 @@ flags: preserve-locale also-after-suspend
296
297 unit: template
298 template-resource: device
299-template-filter: device.category == 'WIRELESS'
300+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
301 template-unit: job
302 id: wireless/wireless_connection_open_n_{interface}
303 _summary: Connect to unencrypted 802.11n Wi-Fi network on {interface}
304@@ -84,7 +84,7 @@ flags: preserve-locale also-after-suspend
305
306 unit: template
307 template-resource: device
308-template-filter: device.category == 'WIRELESS'
309+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
310 template-unit: job
311 id: wireless/wireless_connection_wpa_ax_{interface}
312 _summary: Connect to WPA-encrypted 802.11ax Wi-Fi network on {interface}
313@@ -105,7 +105,7 @@ flags: preserve-locale also-after-suspend
314
315 unit: template
316 template-resource: device
317-template-filter: device.category == 'WIRELESS'
318+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
319 template-unit: job
320 id: wireless/wireless_connection_wpa_ac_{interface}
321 _summary: Connect to WPA-encrypted 802.11ac Wi-Fi network on {interface}
322@@ -126,7 +126,7 @@ flags: preserve-locale also-after-suspend
323
324 unit: template
325 template-resource: device
326-template-filter: device.category == 'WIRELESS'
327+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
328 template-unit: job
329 id: wireless/wireless_connection_wpa_bg_{interface}
330 _summary: Connect to WPA-encrypted 802.11b/g Wi-Fi network {interface}
331@@ -147,7 +147,7 @@ flags: preserve-locale also-after-suspend
332
333 unit: template
334 template-resource: device
335-template-filter: device.category == 'WIRELESS'
336+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
337 template-unit: job
338 id: wireless/wireless_connection_wpa_n_{interface}
339 _summary: Connect to WPA-encrypted 802.11n Wi-Fi network on {interface}
340@@ -168,7 +168,7 @@ flags: preserve-locale also-after-suspend
341
342 unit: template
343 template-resource: device
344-template-filter: device.category == 'WIRELESS'
345+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
346 template-engine: jinja2
347 template-unit: job
348 plugin: shell
349diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu
350index 956f83d..0483ac1 100644
351--- a/units/wireless/wireless-connection-netplan.pxu
352+++ b/units/wireless/wireless-connection-netplan.pxu
353@@ -1,6 +1,6 @@
354 unit: template
355 template-resource: device
356-template-filter: device.category == 'WIRELESS'
357+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
358 template-engine: jinja2
359 template-unit: job
360 id: wireless/wireless_connection_open_ax_np_{{ interface }}
361@@ -24,7 +24,7 @@ requires:
362
363 unit: template
364 template-resource: device
365-template-filter: device.category == 'WIRELESS'
366+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
367 template-engine: jinja2
368 template-unit: job
369 id: wireless/wireless_connection_open_ac_np_{{ interface }}
370@@ -49,7 +49,7 @@ requires:
371
372 unit: template
373 template-resource: device
374-template-filter: device.category == 'WIRELESS'
375+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
376 template-engine: jinja2
377 template-unit: job
378 id: wireless/wireless_connection_open_bg_np_{{ interface }}
379@@ -72,7 +72,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
380
381 unit: template
382 template-resource: device
383-template-filter: device.category == 'WIRELESS'
384+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
385 template-engine: jinja2
386 template-unit: job
387 id: wireless/wireless_connection_open_n_np_{{ interface }}
388@@ -95,7 +95,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
389
390 unit: template
391 template-resource: device
392-template-filter: device.category == 'WIRELESS'
393+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
394 template-engine: jinja2
395 template-unit: job
396 id: wireless/wireless_connection_wpa_ax_np_{{ interface }}
397@@ -119,7 +119,7 @@ requires:
398
399 unit: template
400 template-resource: device
401-template-filter: device.category == 'WIRELESS'
402+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
403 template-engine: jinja2
404 template-unit: job
405 id: wireless/wireless_connection_wpa_ac_np_{{ interface }}
406@@ -143,7 +143,7 @@ requires:
407
408 unit: template
409 template-resource: device
410-template-filter: device.category == 'WIRELESS'
411+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
412 template-engine: jinja2
413 template-unit: job
414 id: wireless/wireless_connection_wpa_bg_np_{{ interface }}
415@@ -166,7 +166,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
416
417 unit: template
418 template-resource: device
419-template-filter: device.category == 'WIRELESS'
420+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
421 template-engine: jinja2
422 template-unit: job
423 id: wireless/wireless_connection_wpa_n_np_{{ interface }}

Subscribers

People subscribed via source and target branches