Merge #400446 from ~jocave/plainbox-provider-checkbox:select-master-mode-testssnap-2021-04-26T1358

3 files changed, 39 insertions, 29 deletions

diff --git a/units/wireless/nm-hotspot.pxu b/units/wireless/nm-hotspot.pxu
index ca62c7a..fbef4bc 100644
--- a/units/wireless/nm-hotspot.pxu
+++ b/units/wireless/nm-hotspot.pxu
@@ -14,6 +14,8 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 10
 flags: preserve-locale also-after-suspend
 requires:
+ wifi_interface_mode.{{ interface }}_AP == 'supported'
+ net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'NetworkManager'
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
 {%- else %}
@@ -35,6 +37,8 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 10
 flags: preserve-locale also-after-suspend
 requires:
+ wifi_interface_mode.{{ interface }}_AP == 'supported'
+ net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'NetworkManager'
 {%- if __on_ubuntucore__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
 {%- else %}
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index 6b2b8c1..b7448cb 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -229,6 +229,7 @@ _name: Automated tests for wifi master mode
 _description:
 Automated tests for using System as Access Point
 include:
+ # wifi-ap set (see net-if-management resource)
 wireless/wifi_ap_open_b_no_sta_.*_auto
 wireless/wifi_ap_open_g_no_sta_.*_auto
 wireless/wifi_ap_wpa_b_no_sta_.*_auto
@@ -236,6 +237,8 @@ include:
 wireless/wifi_ap_wpa_b_with_sta_.*_auto
 wireless/wifi_ap_wpa_g_with_sta_.*_auto
 wireless/wifi_ap_setup_wizard_.*_auto
+ # NetworkManager set (see net-if-management resource)
+ wireless/nmcli_wifi_ap_.*
 bootstrap_include:
 device
 wifi_interface_mode
@@ -273,6 +276,7 @@ _name: QA tests for wifi master mode (after suspend)
 _description:
 System as Access Point tests
 include:
+ # wifi-ap set (see net-if-management resource)
 after-suspend-wireless/wifi_ap_open_b_no_sta_.*_auto
 after-suspend-wireless/wifi_ap_open_g_no_sta_.*_auto
 after-suspend-wireless/wifi_ap_wpa_b_no_sta_.*_auto
@@ -280,6 +284,8 @@ include:
 after-suspend-wireless/wifi_ap_wpa_b_with_sta_.*_auto
 after-suspend-wireless/wifi_ap_wpa_g_with_sta_.*_auto
 after-suspend-wireless/wifi_ap_setup_wizard_.*_auto
+ # NetworkManager set (see net-if-management resource)
+ after-suspend-wireless/nmcli_wifi_ap_.*
 bootstrap_include:
 device
 wifi_interface_mode
diff --git a/units/wireless/wifi-ap.pxu b/units/wireless/wifi-ap.pxu
index 622d70f..ad5dfae 100644
--- a/units/wireless/wifi-ap.pxu
+++ b/units/wireless/wifi-ap.pxu
@@ -8,7 +8,7 @@ _summary: Create open 802.11a Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create an open 802.11a Access Point without any STA connection
@@ -64,7 +64,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -79,7 +79,7 @@ _summary: Create open 802.11b Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create an open 802.11b Access Point without any STA connection
@@ -135,7 +135,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -150,7 +150,7 @@ _summary: Create open 802.11g Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create an open 802.11g Access Point without any STA connection
@@ -206,7 +206,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -221,7 +221,7 @@ _summary: Create open 802.11ad Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create an open 802.11ad Access Point without any STA connection
@@ -277,7 +277,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -292,7 +292,7 @@ _summary: Create WPA2 802.11a Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create a WPA2 802.11a Access Point without any STA connection
@@ -350,7 +350,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -365,7 +365,7 @@ _summary: Create WPA2 802.11b Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{{ interface }}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create a WPA2 802.11b Access Point without any STA connection
@@ -423,7 +423,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -438,7 +438,7 @@ _summary: Create WPA2 802.11g Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create a WPA2 802.11g Access Point without any STA connection
@@ -496,7 +496,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -511,7 +511,7 @@ _summary: Create WPA2 802.11ad Wi-Fi AP on {interface} with no STA (Manual)
 plugin: manual
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 _purpose:
 Check that the system can create a WPA2 802.11ad Access Point without any STA connection
@@ -569,7 +569,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale also-after-suspend
@@ -584,7 +584,7 @@ _summary: Create WPA2 802.11a Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
 command:
@@ -622,7 +622,7 @@ _summary: Create WPA2 802.11a Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
 command:
@@ -670,7 +670,7 @@ _summary: Create WPA2 802.11b Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
 command:
@@ -708,7 +708,7 @@ _summary: Create WPA2 802.11b Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
 command:
@@ -756,7 +756,7 @@ _summary: Create WPA2 802.11g Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
 command:
@@ -794,7 +794,7 @@ _summary: Create WPA2 802.11g Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
 command:
@@ -842,7 +842,7 @@ _summary: Create WPA2 802.11ad Wi-Fi AP on {interface} with active STA (Manual)
 plugin: user-interact-verify
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID
 command:
@@ -880,7 +880,7 @@ _summary: Create WPA2 802.11ad Wi-Fi Access Point on {interface} with active STA
 plugin: shell
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: LD_LIBRARY_PATH OPEN_BG_SSID WIFI_AP_SETUPTIME
 command:
@@ -928,7 +928,7 @@ _summary: Create Access Point on {interface} using wifi-ap.setup-wizard
 plugin: shell
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 20.0
 user: root
 command:
@@ -976,7 +976,7 @@ command:
 reboot
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale noreturn autorestart
@@ -1010,7 +1010,7 @@ command:
 reboot
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
 flags: preserve-locale noreturn
@@ -1041,7 +1041,7 @@ command:
 fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 depends: wireless/wifi_ap_across_reboot_{interface}_setup
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME
@@ -1066,7 +1066,7 @@ command:
 if [ "$RES" -eq 2 ]; then exit 0; else exit 1; fi
 requires:
 wifi_interface_mode.{interface}_AP == 'supported'
- snap.name == 'wifi-ap'
+ net_if_management.device == '{interface}' and net_if_management.master_mode_managed_by == 'wifi-ap'
 depends: wireless/wifi_ap_across_reboot_{interface}_setup_manual
 estimated_duration: 120.0
 environ: WIFI_AP_SETUPTIME