Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Netplan support network manager 2404 PC Desktop Test case/plan (New) #1313

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Netplan support network manager 2404 PC Desktop Test case/plan (New) #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e500e99
Allow netplan test case run in 24.04 for both networkd and NetworkMan…
seankingyang Jun 24, 2024
2e11d89
Make sure the wireless (nm,np) test case order is correct
seankingyang Jun 25, 2024
d709a5b
Merge branch 'main' into Netplan_support_NetworkManager_2404
seankingyang Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 77 additions & 36 deletions providers/base/units/wireless/test-plan.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ include:
wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker
wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker
wireless/wireless_connection_open_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The preferred way to do this now is using the template id ("wireless/wireless_connection_wpa_XX_nm_interface") to create the test plan instead of the regex pattern. Instead of changing this back to it's original state, please change the rest of the tests to use the template ID if you want to keep the previous order.

wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker
wireless/wireless_connection_open_be_nm_.* certification-status=blocker
wireless/nm_connection_restore_.*
wireless/check_iwlwifi_microcode_crash_.*

Expand All @@ -65,12 +65,53 @@ include:
after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker
wireless/wireless_connection_open_be_nm_interface certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_be_nm_.* certification-status=blocker
after-suspend-wireless/nm_connection_restore_.*
after-suspend-wireless/check_iwlwifi_microcode_crash_.*

id: wireless-netplan-cert-automated
unit: test plan
_name: Wireless netplan tests
_description: Wireless connection tests via netplan
bootstrap_include:
device
include:
wireless/detect
wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker
wireless/wireless_connection_open_bg_np_.* certification-status=blocker
wireless/wireless_connection_wpa_n_np_.* certification-status=blocker
wireless/wireless_connection_open_n_np_.* certification-status=blocker
wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker
wireless/wireless_connection_open_ac_np_.* certification-status=blocker
wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker
wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker
wireless/wireless_connection_open_ax_np_.* certification-status=blocker
wireless/wireless_connection_wpa_be_np_.* certification-status=blocker
wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker
wireless/wireless_connection_open_be_np_.* certification-status=blocker

id: after-suspend-wireless-netplan-cert-automated
unit: test plan
_name: Wireless netplan tests (after suspend, automated)
_description: Wireless connection tests via netplan (after suspend, automated)
bootstrap_include:
device
include:
after-suspend-wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_bg_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_n_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_n_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_ac_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_ax_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_be_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_be_np_.* certification-status=blocker

id: wireless-cert-blockers
unit: test plan
_name: Wireless tests (certification blockers only)
Expand All @@ -89,9 +130,9 @@ include:
wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker
wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker
wireless/wireless_connection_open_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker
wireless/wireless_connection_open_be_nm_.* certification-status=blocker
wireless/nm_connection_restore_.*

id: after-suspend-wireless-cert-blockers
Expand All @@ -112,9 +153,9 @@ include:
after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker
wireless/wireless_connection_open_be_nm_interface certification-status=blocker
after-suspend-wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker
after-suspend-wireless/wireless_connection_open_be_nm_.* certification-status=blocker
after-suspend-wireless/nm_connection_restore_.*

id: wireless-full
Expand Down Expand Up @@ -142,27 +183,27 @@ _description:
include:
wireless/detect certification-status=blocker
wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface certification-status=blocker
wireless/wireless_connection_open_be_nm_.* certification-status=blocker
wireless/wireless_connection_open_ax_nm_.* certification-status=blocker
wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
wireless/wireless_connection_open_n_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker
wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker
wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
wireless/wireless_connection_open_be_np_interface certification-status=blocker
wireless/wireless_connection_open_be_np_.* certification-status=blocker
wireless/wireless_connection_open_ax_np_.* certification-status=blocker
wireless/wireless_connection_open_ac_np_.* certification-status=blocker
wireless/wireless_connection_open_bg_np_.* certification-status=blocker
wireless/wireless_connection_open_n_np_.* certification-status=blocker
wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker
wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker
wireless/wireless_connection_wpa_be_np_interface certification-status=blocker
wireless/wireless_connection_wpa3_be_np_interface certification-status=blocker
wireless/wireless_connection_wpa_be_np_.* certification-status=blocker
wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker
wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker
wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker
wireless/wireless_connection_wpa_n_np_.* certification-status=blocker
Expand All @@ -179,27 +220,27 @@ _description:
include:
wireless/detect
wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
wireless/wireless_connection_open_be_nm_.*
wireless/wireless_connection_open_ax_nm_.*
wireless/wireless_connection_open_ac_nm_.*
wireless/wireless_connection_open_bg_nm_.*
wireless/wireless_connection_open_n_nm_.*
wireless/wireless_connection_wpa_be_nm_interface
wireless/wireless_connection_wpa3_be_nm_interface
wireless/wireless_connection_wpa_be_nm_.*
wireless/wireless_connection_wpa3_be_nm_.*
wireless/wireless_connection_wpa_ax_nm_.*
wireless/wireless_connection_wpa3_ax_nm_.*
wireless/wireless_connection_wpa_ac_nm_.*
wireless/wireless_connection_wpa_bg_nm_.*
wireless/wireless_connection_wpa_n_nm_.*
wireless/wireless_connection_open_be_np_interface
wireless/wireless_connection_open_be_np_.*
wireless/wireless_connection_open_ax_np_.*
wireless/wireless_connection_open_ac_np_.*
wireless/wireless_connection_open_bg_np_.*
wireless/wireless_connection_open_n_np_.*
wireless/wireless_connection_wpa_ax_np_.*
wireless/wireless_connection_wpa3_ax_np_.*
wireless/wireless_connection_wpa_be_np_interface
wireless/wireless_connection_wpa3_be_np_interface
wireless/wireless_connection_wpa_be_np_.*
wireless/wireless_connection_wpa3_be_np_.*
wireless/wireless_connection_wpa_ac_np_.*
wireless/wireless_connection_wpa_bg_np_.*
wireless/wireless_connection_wpa_n_np_.*
Expand Down Expand Up @@ -356,27 +397,27 @@ _description:
, be networks.
include:
after-suspend-wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
after-suspend-wireless/wireless_connection_open_be_nm_.*
after-suspend-wireless/wireless_connection_open_ax_nm_.*
after-suspend-wireless/wireless_connection_open_ac_nm_.*
after-suspend-wireless/wireless_connection_open_bg_nm_.*
after-suspend-wireless/wireless_connection_open_n_nm_.*
wireless/wireless_connection_wpa_be_nm_interface
wireless/wireless_connection_wpa3_be_nm_interface
after-suspend-wireless/wireless_connection_wpa_be_nm_.*
after-suspend-wireless/wireless_connection_wpa3_be_nm_.*
after-suspend-wireless/wireless_connection_wpa_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa_ac_nm_.*
after-suspend-wireless/wireless_connection_wpa_bg_nm_.*
after-suspend-wireless/wireless_connection_wpa_n_nm_.*
wireless/wireless_connection_open_be_np_interface
after-suspend-wireless/wireless_connection_open_be_np_.*
after-suspend-wireless/wireless_connection_open_ax_np_.*
after-suspend-wireless/wireless_connection_open_ac_np_.*
after-suspend-wireless/wireless_connection_open_bg_np_.*
after-suspend-wireless/wireless_connection_open_n_np_.*
after-suspend-wireless/wireless_connection_wpa_ax_np_.*
after-suspend-wireless/wireless_connection_wpa3_ax_np_.*
wireless/wireless_connection_wpa_be_np_interface
wireless/wireless_connection_wpa3_be_np_interface
after-suspend-wireless/wireless_connection_wpa_be_np_.*
after-suspend-wireless/wireless_connection_wpa3_be_np_.*
after-suspend-wireless/wireless_connection_wpa_ac_np_.*
after-suspend-wireless/wireless_connection_wpa_bg_np_.*
after-suspend-wireless/wireless_connection_wpa_n_np_.*
Expand All @@ -392,27 +433,27 @@ _description:
, be networks using netplan.
include:
after-suspend-wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
after-suspend-wireless/wireless_connection_open_be_nm_.*
after-suspend-wireless/wireless_connection_open_ax_nm_.*
after-suspend-wireless/wireless_connection_open_ac_nm_.*
after-suspend-wireless/wireless_connection_open_bg_nm_.*
after-suspend-wireless/wireless_connection_open_n_nm_.*
wireless/wireless_connection_wpa_be_nm_interface
wireless/wireless_connection_wpa3_be_nm_interface
after-suspend-wireless/wireless_connection_wpa_be_nm_.*
after-suspend-wireless/wireless_connection_wpa3_be_nm_.*
after-suspend-wireless/wireless_connection_wpa_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa_ac_nm_.*
after-suspend-wireless/wireless_connection_wpa_bg_nm_.*
after-suspend-wireless/wireless_connection_wpa_n_nm_.*
wireless/wireless_connection_open_be_np_interface
after-suspend-wireless/wireless_connection_open_be_np_.*
after-suspend-wireless/wireless_connection_open_ax_np_.*
after-suspend-wireless/wireless_connection_open_ac_np_.*
after-suspend-wireless/wireless_connection_open_bg_np_.*
after-suspend-wireless/wireless_connection_open_n_np_.*
after-suspend-wireless/wireless_connection_wpa_ax_np_.*
after-suspend-wireless/wireless_connection_wpa3_ax_np_.*
wireless/wireless_connection_wpa_be_np_interface
wireless/wireless_connection_wpa3_be_np_interface
after-suspend-wireless/wireless_connection_wpa_be_np_.*
after-suspend-wireless/wireless_connection_wpa3_be_np_.*
after-suspend-wireless/wireless_connection_wpa_ac_np_.*
after-suspend-wireless/wireless_connection_wpa_bg_np_.*
after-suspend-wireless/wireless_connection_wpa_n_np_.*
Expand Down
24 changes: 12 additions & 12 deletions providers/base/units/wireless/wireless-connection-netplan.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -44,7 +44,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_ax == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -68,7 +68,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_ac == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -91,7 +91,7 @@ category_id: com.canonical.plainbox::wireless
estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -114,7 +114,7 @@ category_id: com.canonical.plainbox::wireless
estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -138,7 +138,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -162,7 +162,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_ax == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -186,7 +186,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -210,7 +210,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_ax == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -234,7 +234,7 @@ estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_ac == 'supported'
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -257,7 +257,7 @@ category_id: com.canonical.plainbox::wireless
estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"

unit: template
template-resource: device
Expand All @@ -280,4 +280,4 @@ category_id: com.canonical.plainbox::wireless
estimated_duration: 15
flags: preserve-locale also-after-suspend
requires:
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
(net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24"
2 changes: 2 additions & 0 deletions providers/certification-client/units/client-cert-desktop-24-04.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ nested_part:
usb-cert-automated
usb-automated
wireless-cert-automated
wireless-netplan-cert-automated
# start of suspend related tests
before-suspend-reference-cert-full
# suspend point
Expand All @@ -133,6 +134,7 @@ nested_part:
after-suspend-usb-cert-automated
after-suspend-usb-automated
after-suspend-wireless-cert-automated
after-suspend-wireless-netplan-cert-automated
after-suspend-bluetooth-cert-automated
after-suspend-camera-cert-automated
# The following tests should run BEFORE the automated tests. The reboot and
Expand Down
Loading