Modify the wwan related test cases.

GabrielChenCC · GabrielChenCC · commit 64ea1665f9d0 · 2023-11-08T22:14:02.000+08:00
The mobilebroadband-cert-automated test case is only
part of the wwan test plan. We hope to replace
mobilebroadband-cert-automated with wwan-automated.

The relevant test plans we currently use include:
client-cert-desktop-22-04-automated
client-cert-desktop-20-04-automated
client-cert-desktop-18-04-automated

I have replaced mobilebroadband-cert-automated in them
with wwan-automated, and added after-sudpend-wwan-
automated to ensure that wwan is tested before and after
suspend.

In addition, for mobilebroadband-cert-manual in the Manual
test plan, when the SIM is inserted into the prototype in the
desktop, the system should automatically recognize wwan and
SIM card, and we do not need to perform manual testing. So I
deleted mobilebroadband-cert-manual in the relevant test
plans. At the same time, since wwan-automated already
contains wwan-manual cases, I deleted the wwan-manual in
these test plans:
client-cert-desktop-22-04-manual
client-cert-desktop-20-04-manual
client-cert-desktop-18-04-manual
diff --git a/providers/base/units/wwan/jobs.pxu b/providers/base/units/wwan/jobs.pxu
@@ -116,58 +116,6 @@ category_id: wwan
 requires:
     manifest.has_wwan_module == 'True'
 
-id: wwan/check-sim-present-manual
-plugin: manual
-_summary: Check if a SIM card is present in a slot connected to the modem
-_purpose:
- Check if a SIM card is present in a slot connected to the modem
-_steps:
- 1. Open another terminal on SUT (or press ctrl+z to suspend Checkbox)
- 2. Run `sudo mmcli -m 0 |grep SIM
- 3. Run `fg` to jump back to checkbox (if you're running in the same terminal)
-_verification:
- Check the output. Was the SIM information printed?
-estimated_duration: 60s
-flags:  also-after-suspend
-imports: from com.canonical.plainbox import manifest
-category_id: wwan
-requires:
-    manifest.has_wwan_module == 'True'
-depends:
-    wwan/detect-manual
-
-id: wwan/gsm-connection-manual
-plugin: manual
-template-engine: jinja2
-_summary: Verify a GSM broadband modem can create a data connection
-_purpose:
- Ensure that the data connection can be made
-_steps:
- 1. Open another terminal on SUT (or press ctrl+z to suspend Checkbox)
- 2. Run `sudo nmcli c add type gsm ifname {{ __checkbox_env__.get("WWAN_CONTROL_IF", "<device name>") }} con-name GSM apn {{ __checkbox_env__.get("WWAN_APN", "<your.carrier.com>") }}`
- {%- if "WWAN_CONTROL_IF" not in __checkbox_env__ %}
-    Replacing the <your.carrier.com> with appropriate APN name,
-    and <device name> with appropriate device (device can be found by
-    running sudo nmcli d)
- {%- endif %}
- {%- if "WWAN_NET_IF" not in __checkbox_env__ %}
- 3. Ping Google (Run: `ping -I <ifname> 8.8.8.8 -c 5`)
- {%- else %}
- 3. Ping Google (Run: `ping -I {{ __checkbox_env__.get("WWAN_NET_IF") }} 8.8.8.8 -c 5`)
- {%- endif %}
- 4. Disconnect from the network (Run: `sudo nmcli c delete GSM`)
- 5. Run `fg` to jump back to checkbox (if you're running in the same terminal)
-_verification:
- Did the ping came back?
-estimated_duration: 120s
-flags:  also-after-suspend
-category_id: wwan
-imports: from com.canonical.plainbox import manifest
-requires:
-    manifest.has_wwan_module == 'True'
-depends:
-    wwan/check-sim-present-manual
-
 id: wwan/scan-networks-manual
 plugin: manual
 _summary: Verify that modem can scan for available networks
diff --git a/providers/base/units/wwan/test-plan.pxu b/providers/base/units/wwan/test-plan.pxu
@@ -39,25 +39,3 @@ include:
     after-suspend-wwan/gsm-connection-.*-auto
 bootstrap_include:
     wwan_resource
-
-id: wwan-manual
-unit: test plan
-_name: Manual wwan tests
-_description: Manual wwan tests for Snappy Ubuntu Core devices
-include:
-    wwan/detect-manual
-    wwan/gsm-connection-manual
-    wwan/check-sim-present-manual
-    wwan/scan-networks-manual
-    wwan/gsm-connection-interrupted-manual
-
-id: after-suspend-wwan-manual
-unit: test plan
-_name: Manual wwan tests (after suspend)
-_description: Manual wwan tests for Snappy Ubuntu Core devices
-include:
-    after-suspend-wwan/detect-manual
-    after-suspend-wwan/gsm-connection-manual
-    after-suspend-wwan/check-sim-present-manual
-    after-suspend-wwan/scan-networks-manual
-    after-suspend-wwan/gsm-connection-interrupted-manual
diff --git a/providers/certification-client/units/client-cert-desktop-18-04.pxu b/providers/certification-client/units/client-cert-desktop-18-04.pxu
@@ -34,7 +34,6 @@ nested_part:
     misc-client-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -104,7 +103,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -129,6 +128,7 @@ nested_part:
     after-suspend-touchscreen-cert-automated
     after-suspend-wireless-cert-automated
     after-suspend-bluetooth-cert-automated
+    after-suspend-wwan-automated
     # The following tests should run BEFORE the automated tests. The reboot and
     # power off tests will also give us a clean system to start the stress run
     # with.
diff --git a/providers/certification-client/units/client-cert-desktop-20-04.pxu b/providers/certification-client/units/client-cert-desktop-20-04.pxu
@@ -37,7 +37,6 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -107,7 +106,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -132,6 +131,7 @@ nested_part:
     after-suspend-touchscreen-cert-automated
     after-suspend-wireless-cert-automated
     after-suspend-bluetooth-cert-automated
+    after-suspend-wwan-automated
     # The following tests should run BEFORE the automated tests. The reboot and
     # power off tests will also give us a clean system to start the stress run
     # with.
diff --git a/providers/certification-client/units/client-cert-desktop-22-04.pxu b/providers/certification-client/units/client-cert-desktop-22-04.pxu
@@ -37,7 +37,6 @@ nested_part:
     led-cert-manual
     mediacard-cert-manual
     memory-manual
-    mobilebroadband-cert-manual
     ethernet-cert-manual
     networking-cert-manual
     optical-cert-manual
@@ -112,7 +111,7 @@ nested_part:
     mediacard-cert-automated
     mediacard-automated
     memory-automated
-    mobilebroadband-cert-automated
+    wwan-automated
     ethernet-cert-automated
     networking-cert-automated
     optical-cert-automated
@@ -137,7 +136,7 @@ nested_part:
     after-suspend-cpu-cert-automated
     after-suspend-input-cert-automated
     after-suspend-disk-cert-automated
-    after-suspend-mobilebroadband-cert-automated
+    after-suspend-wwan-automated
     after-suspend-ethernet-cert-automated
     after-suspend-networking-cert-automated
     after-suspend-optical-cert-automated
