wireless: Never instantiate wireless jobs if the interface is UNKNOWN

Fixes: lp:1848314 

3 files changed, 46 insertions, 46 deletions

diff --git a/units/wireless/wifi-ap.pxu b/units/wireless/wifi-ap.pxu
index df25b503..335d5051 100644
--- a/units/wireless/wifi-ap.pxu
+++ b/units/wireless/wifi-ap.pxu
@@ -1,6 +1,6 @@
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_a_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -29,7 +29,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_a_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -71,7 +71,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_b_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -100,7 +100,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_b_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -142,7 +142,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_g_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -171,7 +171,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_g_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -213,7 +213,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_ad_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -242,7 +242,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_open_ad_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -284,7 +284,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_a_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -314,7 +314,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_a_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -357,7 +357,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_b_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -387,7 +387,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_b_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -430,7 +430,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_g_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -460,7 +460,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_g_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -503,7 +503,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_ad_no_sta_{interface}_manual
 category_id: wifi_ap
@@ -533,7 +533,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_ad_no_sta_{interface}_auto
 category_id: wifi_ap
@@ -576,7 +576,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_a_with_sta_{interface}
 category_id: wifi_ap
@@ -615,7 +615,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_a_with_sta_{interface}_auto
 category_id: wifi_ap
@@ -664,7 +664,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_b_with_sta_{interface}
 category_id: wifi_ap
@@ -703,7 +703,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_b_with_sta_{interface}_auto
 category_id: wifi_ap
@@ -752,7 +752,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_g_with_sta_{interface}
 category_id: wifi_ap
@@ -791,7 +791,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_g_with_sta_{interface}_auto
 category_id: wifi_ap
@@ -840,7 +840,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_ad_with_sta_{interface}
 category_id: wifi_ap
@@ -879,7 +879,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_wpa_ad_with_sta_{interface}_auto
 category_id: wifi_ap
@@ -928,7 +928,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_setup_wizard_{interface}_auto
 category_id: wifi_ap
@@ -959,7 +959,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_across_reboot_{interface}_setup
 category_id: wifi_ap
@@ -991,7 +991,7 @@ flags: preserve-locale noreturn autorestart
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_across_reboot_{interface}_setup_manual
 category_id: wifi_ap
@@ -1025,7 +1025,7 @@ flags: preserve-locale noreturn
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_across_reboot_{interface}_check
 category_id: wifi_ap
@@ -1057,7 +1057,7 @@ flags: preserve-locale
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wifi_ap_across_reboot_{interface}_check_manual
 category_id: wifi_ap
diff --git a/units/wireless/wireless-connection-manual.pxu b/units/wireless/wireless-connection-manual.pxu
index 99865782..13ff4650 100644
--- a/units/wireless/wireless-connection-manual.pxu
+++ b/units/wireless/wireless-connection-manual.pxu
@@ -1,6 +1,6 @@
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_open_ax_{interface}
 _summary: Connect to unencrypted 802.11ax Wi-Fi network on {interface}
@@ -21,7 +21,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_open_ac_{interface}
 _summary: Connect to unencrypted 802.11ac Wi-Fi network on {interface}
@@ -42,7 +42,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_open_bg_{interface}
 _summary: Connect to unencrypted 802.11b/g Wi-Fi network on {interface}
@@ -63,7 +63,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_open_n_{interface}
 _summary: Connect to unencrypted 802.11n Wi-Fi network on {interface}
@@ -84,7 +84,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_wpa_ax_{interface}
 _summary: Connect to WPA-encrypted 802.11ax Wi-Fi network on {interface}
@@ -105,7 +105,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_wpa_ac_{interface}
 _summary: Connect to WPA-encrypted 802.11ac Wi-Fi network on {interface}
@@ -126,7 +126,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_wpa_bg_{interface}
 _summary: Connect to WPA-encrypted 802.11b/g Wi-Fi network {interface}
@@ -147,7 +147,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-unit: job
 id: wireless/wireless_connection_wpa_n_{interface}
 _summary: Connect to WPA-encrypted 802.11n Wi-Fi network on {interface}
@@ -168,7 +168,7 @@ flags: preserve-locale also-after-suspend
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 plugin: shell
diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu
index 956f83d5..0483ac10 100644
--- a/units/wireless/wireless-connection-netplan.pxu
+++ b/units/wireless/wireless-connection-netplan.pxu
@@ -1,6 +1,6 @@
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_open_ax_np_{{ interface }}
@@ -24,7 +24,7 @@ requires:
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_open_ac_np_{{ interface }}
@@ -49,7 +49,7 @@ requires:
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_open_bg_np_{{ interface }}
@@ -72,7 +72,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_open_n_np_{{ interface }}
@@ -95,7 +95,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_wpa_ax_np_{{ interface }}
@@ -119,7 +119,7 @@ requires:
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_wpa_ac_np_{{ interface }}
@@ -143,7 +143,7 @@ requires:
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_wpa_bg_np_{{ interface }}
@@ -166,7 +166,7 @@ flags: preserve-locale also-after-suspend also-after-suspend-manual
 
 unit: template
 template-resource: device
-template-filter: device.category == 'WIRELESS'
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
 template-engine: jinja2
 template-unit: job
 id: wireless/wireless_connection_wpa_n_np_{{ interface }}