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

Add a manifest entry to check if a SIM card is inserted (New) #1500

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Add a manifest entry to check if a SIM card is inserted (New) #1500

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
6cefd0d
Add SIM card manifest entry
pieqq Sep 24, 2024
9227cd7
Add SIM card requirement on WWAN jobs needing it
pieqq Sep 24, 2024
427f80d
Align `requires` and `depends` fields in WWAN jobs
pieqq Sep 24, 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
22 changes: 15 additions & 7 deletions providers/base/units/wwan/jobs.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ imports: from com.canonical.plainbox import manifest
depends: wwan/check-sim-present-{manufacturer}-{model}-{hw_id}-auto
requires:
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
snap.name == 'modem-manager' or package.name == 'modemmanager'

unit: template
Expand All @@ -74,6 +75,7 @@ flags: preserve-locale also-after-suspend preserve-cwd
imports: from com.canonical.plainbox import manifest
requires:
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
snap.name == 'modem-manager' or package.name == 'modemmanager'

unit: template
Expand All @@ -100,6 +102,7 @@ flags: preserve-locale also-after-suspend preserve-cwd
imports: from com.canonical.plainbox import manifest
requires:
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
snap.name == 'modem-manager' or package.name == 'modemmanager'

unit: template
Expand All @@ -122,6 +125,7 @@ depends: wwan/check-sim-present-{manufacturer}-{model}-{hw_id}-auto
imports: from com.canonical.plainbox import manifest
requires:
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
snap.name == 'modem-manager' or package.name == 'modemmanager'

id: wwan/detect-manual
Expand All @@ -140,7 +144,8 @@ flags: also-after-suspend
imports: from com.canonical.plainbox import manifest
category_id: wwan
requires:
manifest.has_wwan_module == 'True'
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'

id: wwan/check-sim-present-manual
plugin: manual
Expand All @@ -158,9 +163,10 @@ flags: also-after-suspend
imports: from com.canonical.plainbox import manifest
category_id: wwan
requires:
manifest.has_wwan_module == 'True'
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
depends:
wwan/detect-manual
wwan/detect-manual

id: wwan/gsm-connection-manual
plugin: manual
Expand Down Expand Up @@ -190,9 +196,10 @@ flags: also-after-suspend
category_id: wwan
imports: from com.canonical.plainbox import manifest
requires:
manifest.has_wwan_module == 'True'
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
depends:
wwan/check-sim-present-manual
wwan/check-sim-present-manual

id: wwan/gsm-connection-interrupted-manual
plugin: manual
Expand Down Expand Up @@ -230,6 +237,7 @@ flags: also-after-suspend
category_id: wwan
imports: from com.canonical.plainbox import manifest
requires:
manifest.has_wwan_module == 'True'
manifest.has_wwan_module == 'True'
manifest.has_sim_card == 'True'
depends:
wwan/check-sim-present-manual
wwan/check-sim-present-manual
5 changes: 5 additions & 0 deletions providers/base/units/wwan/manifest.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ unit: manifest entry
id: has_wwan_module
_name: A WWAN Module
value-type: bool

unit: manifest entry
id: has_sim_card
_name: A working SIM card inserted
value-type: bool
Loading