Merge #362872 from ~jocave/plainbox-provider-checkbox:wireless-nm-conn-backup

2 files changed, 48 insertions, 0 deletions

diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 52b2b01..9c25c71 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -442,3 +442,31 @@ command:
 estimated_duration: 330.0
 _description:
 Tests the performance of a system's wireless connection through the iperf tool, using UDP packets.
+
+
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
+id: wireless/nm_connection_save_{category}
+category_id: com.canonical.plainbox::wireless
+_summary: Save any NetworkManager 802.11 configurations prior to testing
+plugin: shell
+user: root
+command:
+ wifi_nmcli_backup.py save
+estimated_duration: 2.0
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
+id: wireless/nm_connection_restore_{category}
+category_id: com.canonical.plainbox::wireless
+_summary: Restore any NetworkManager 802.11 configurations after testing
+plugin: shell
+user: root
+command:
+ wifi_nmcli_backup.py restore
+estimated_duration: 2.0
+depends: wireless/nm_connection_save_{category}
+flags: preserve-locale also-after-suspend also-after-suspend-manual \ No newline at end of file
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index 74bf271..8b4aafe 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -30,7 +30,10 @@ id: wireless-cert-automated
 unit: test plan
 _name: Wireless tests
 _description: Wireless connection tests
+bootstrap_include:
+ device
 include:
+ wireless/nm_connection_save_.*
 wireless/wireless_scanning_.* certification-status=blocker
 wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
 wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
@@ -38,36 +41,48 @@ include:
 wireless/wireless_connection_open_n_nm_.* certification-status=blocker
 wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ wireless/nm_connection_restore_.*
 
 id: after-suspend-wireless-cert-automated
 unit: test plan
 _name: Wireless tests (after suspend, automated)
 _description: Wireless connection tests (after suspend, automated)
+bootstrap_include:
+ device
 include:
+ after-suspend-wireless/nm_connection_save_.*
 after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ after-suspend-wireless/nm_connection_restore_.*
 
 id: after-suspend-manual-wireless-cert-automated
 unit: test plan
 _name: Wireless tests (after manual suspend, automated)
 _description: Wireless connection tests (after manual suspend, automated)
+bootstrap_include:
+ device
 include:
+ after-suspend-manual-wireless/nm_connection_save_.*
 after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/nm_connection_restore_.*
 
 id: wireless-cert-blockers
 unit: test plan
 _name: Wireless tests (certification blockers only)
 _description: Wireless connection tests (certification blockers only)
+bootstrap_include:
+ device
 include:
+ wireless/nm_connection_save_.*
 wireless/wireless_scanning_.* certification-status=blocker
 wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
 wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
@@ -75,16 +90,21 @@ include:
 wireless/wireless_connection_open_n_nm_.* certification-status=blocker
 wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ wireless/nm_connection_restore_.*
 
 id: after-suspend-wireless-cert-blockers
 unit: test plan
 _name: Wireless tests (after manual suspend, certification blockers only)
 _description:
 Wireless connection tests (after manual suspend, certification blockers only)
+bootstrap_include:
+ device
 include:
+ after-suspend-manual-wireless/nm_connection_save_.*
 after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/nm_connection_restore_.*