Merge ~robertliu/snappy-hwe-snaps/+git/modme-manager:conditional-restart-service into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-22

[Robert Liu]

this implementation is inspired by the nextcloud snap[1][2].

Two additional variables are used to store the runtime settings and determine if the settings are changed and the service has to be started.

[1] https://github.com/nextcloud-snap/nextcloud-snap/blob/master/src/hooks/bin/configure
[2] https://github.com/nextcloud-snap/nextcloud-snap/blob/master/src/apache/utilities/apache-utilities

[Robert Liu (robertliu)]

ran simple tests to verify the implementation.

1. install/update the MM snap
{
 "debug": {
  "enable": false
 },
 "private": {
  "test": {
   "no-suspend-resume": false,
   "quick-suspend-resume": false
  }
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": false
 }
}

   6327 ? Dsl 0:00 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT

2. set test.quick-suspend-resume=false
{
 "debug": {
  "enable": false
 },
 "private": {
  "test": {
   "no-suspend-resume": false,
   "quick-suspend-resume": false
  }
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": false
 }
}

   6327 ? Ssl 0:00 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT

3. set test.quick-suspend-reume=true
{
 "debug": {
  "enable": false
 },
 "private": {
  "test": {
   "no-suspend-resume": false,
   "quick-suspend-resume": true
  }
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": true
 }
}

  6716 ? Dsl 0:00 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT --log-level=INFO --test-quick-suspend-resume

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 7085e2db755aca5fea2d7ba1051f0ab60fc992b0

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1577/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:7085e2db755aca5fea2d7ba1051f0ab60fc992b0
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/773/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/796
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/796
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/796
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/796
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1577
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1319
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1387/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/773/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Doing it this way is an option, but tbh I don't like too much adding those "private" properties, which are still seen by the user in the end. And we use a file in SNAP_DATA in network-manager snap [1] that does pretty much the same in a similar way, so for maintenability I prefer to do it the same way in all the system snaps.

[1] https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager/tree/snap/hooks/configure

97029b0... by Robert Liu on 2022-12-19

Restart service when any test options is changed

Signed-off-by: Robert Liu <email address hidden>

e21c758... by Robert Liu on 2022-12-20

docs: add a new page for test options

Signed-off-by: Robert Liu <email address hidden>

[Robert Liu (robertliu)]

re-write to use the same mechanism as Network-Manager

# after installation
$ sudo snap get -d modem-manager && ps ax|grep modem && cat /var/snap/modem-manager/current/current_snap_props
{
 "debug": {
  "enable": false
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": false
 }
}
 120290 ? Ssl 0:01 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT --log-level=INFO
 120650 pts/0 S+ 0:00 grep --color=auto modem
debug_enable=false
test_no_suspend_resume=false
test_quick_suspend_resume=false

# enable debug & test.no-suspend-resume
$ sudo snap set modem-manager debug.enable=true test.no-suspend-resume=true
$ sudo snap get -d modem-manager && ps ax|grep modem && cat /var/snap/modem-manager/current/current_snap_props
{
 "debug": {
  "enable": true
 },
 "test": {
  "no-suspend-resume": true,
  "quick-suspend-resume": false
 }
}
 121199 ? Ssl 0:01 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT --debug --log-level=DEBUG --test-no-suspend-resume
 121255 pts/0 S+ 0:00 grep --color=auto modem
debug_enable=true
test_no_suspend_resume=true
test_quick_suspend_resume=false

# disable debug and test.no-suspend-resume
$ sudo snap set modem-manager debug.enable! test.no-suspend-resume=false
$ sudo snap get -d modem-manager && ps ax|grep modem && cat /var/snap/modem-manager/current/current_snap_props
{
 "debug": {
  "enable": false
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": false
 }
}
 121338 ? Ssl 0:01 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT --log-level=INFO
 121394 pts/0 S+ 0:00 grep --color=auto modem
debug_enable=false
test_no_suspend_resume=false
test_quick_suspend_resume=false

# enable only test.quick-suspend-resume
$ sudo snap set modem-manager test.quick-suspend-resume=true
$ sudo snap get -d modem-manager && ps ax|grep modem && cat /var/snap/modem-manager/current/current_snap_props
{
 "debug": {
  "enable": false
 },
 "test": {
  "no-suspend-resume": false,
  "quick-suspend-resume": true
 }
}
 121575 ? Ssl 0:01 /snap/modem-manager/x1/usr/sbin/ModemManager --filter-policy=STRICT --log-level=INFO --test-quick-suspend-resume
 121652 pts/0 S+ 0:00 grep --color=auto modem
debug_enable=false
test_no_suspend_resume=false
test_quick_suspend_resume=true

[Robert Liu (robertliu)]

I also added a new page of docs to describe these new options.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: dd6edf4266022f72baf449af2fb4776456253e77

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1586/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:dd6edf4266022f72baf449af2fb4776456253e77
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/782/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/805/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/805
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/805
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/805
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1586
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1328
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1396/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/782/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: b2f92d7f61d750b6b5cc38b3ecdc7f6c2246f4fc

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1587/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:b2f92d7f61d750b6b5cc38b3ecdc7f6c2246f4fc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/783/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/806/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/806
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/806
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/806
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1587
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1329
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1397/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/783/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 714adfe9e7f0b69ddd3cf0ca05960399e7c9bd35

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1588/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:714adfe9e7f0b69ddd3cf0ca05960399e7c9bd35
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/784/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/807/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/807
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/807
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/807
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1588
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1330
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1398/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/784/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: ff4e4311c6d2820b5232db483a5cb76562c49425

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1589/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:ff4e4311c6d2820b5232db483a5cb76562c49425
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/785/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/808/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/808
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/808
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/808
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1589
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1331
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1399/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/785/rebuild

review: Needs Fixing (continuous-integration)

793ef40... by Robert Liu on 2022-12-20

t/m/network-manager-autoconn: fix track of network-manager

Signed-off-by: Robert Liu <email address hidden>

faa6d8e... by Robert Liu on 2022-12-20

tests: updates for new test options

Signed-off-by: Robert Liu <email address hidden>

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: f64ce75085653ede5c3b4c05beffa0896745b782

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1590/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:f64ce75085653ede5c3b4c05beffa0896745b782
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/786/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/809/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/809
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/809
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/809
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1590
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1332
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1400/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/786/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 4427abaaec844458886c58127e77903ecedab88f

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1591/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:4427abaaec844458886c58127e77903ecedab88f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/787/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/810/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/810
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/810
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/810
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1591
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1333
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1401/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/787/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 25a883477604fabfd7f4b1d2910402a539b174fc

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1592/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:25a883477604fabfd7f4b1d2910402a539b174fc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/788/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/811/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/811
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/811
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/811
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1592
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1334
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1402/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/788/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 7766faf94cfd81114beb16af20dde3da40dd685f

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1593/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:7766faf94cfd81114beb16af20dde3da40dd685f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/789/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/812/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/812
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/812
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/812
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1593
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1335
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1403/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/789/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 68459295468eac5678555b31a210ad158286ca14

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1594/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:68459295468eac5678555b31a210ad158286ca14
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/790/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/813/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/813
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/813
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/813
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1594
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1336
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1404/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/790/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 7ece5ecd530cea23a79f07ec9d8106b52f0ea120

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1595/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:7ece5ecd530cea23a79f07ec9d8106b52f0ea120
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/791/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/814/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/814
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/814
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/814
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1595
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1337
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1405/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/791/rebuild

review: Needs Fixing (continuous-integration)

8a9485b... by Robert Liu on 2022-12-21

t/l/utilities.sh: fix channel setting of mm

Signed-off-by: Robert Liu <email address hidden>

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: b057142a49aaee64061073559da00a10a6a9d2d1

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1596/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:b057142a49aaee64061073559da00a10a6a9d2d1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/792/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/815/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/815
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/815
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/815
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1596
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1338
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1406/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/792/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 78b25df1f7093d56bb8cfcfec867494dfe102ff2

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1597/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:78b25df1f7093d56bb8cfcfec867494dfe102ff2
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/793/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/816/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/816
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/816
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/816
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1597
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1339
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1407/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/793/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 58dd23698aafc1cc8eb91c370ebc0615b9a4cf70

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1598/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:58dd23698aafc1cc8eb91c370ebc0615b9a4cf70
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/794/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/817/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/817
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/817
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/817
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1598
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1340
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1408/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/794/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: ce44b30557636c68c23427441bcf23e113d267ed

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1599/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:ce44b30557636c68c23427441bcf23e113d267ed
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/795/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/818/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/818
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/818
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/818
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1599
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1341
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1409/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/795/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: adbbb53028cee16cbddf5c7bedabb69a2c5a0251

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1600/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:adbbb53028cee16cbddf5c7bedabb69a2c5a0251
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/796/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/819
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/819
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/819
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/819
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1600
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1342
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1410/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/796/rebuild

review: Approve (continuous-integration)

[Robert Liu (robertliu)]

I wasn't aware of the spread tests and spent some time on studying and updating the test cases. Now I've added two new cases for the test.* options.

Summary of this MP:
1. add current_snap_props to store snap settings and use it to restart service dynamically when a setting is changed.
  - remove .debg_enabled file. I think the props file would be enough for detection of setting changes.
2. add new page of docs for the new test.* options
3. specify 22/stable as the channel of NM and MM snaps
4. add new test cases

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: fc588db69872b786313c4c6c2defaf4c5add9f93

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1601/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:fc588db69872b786313c4c6c2defaf4c5add9f93
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/797/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/820/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/820
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/820
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/820
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1601
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1343
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1411/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/797/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 0292716139f8d2cf6432a4f8c774aefbb77519da

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1602/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:0292716139f8d2cf6432a4f8c774aefbb77519da
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/798/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/821
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/821
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/821
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/821
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1602
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1344
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1412/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/798/rebuild

review: Approve (continuous-integration)

[Robert Liu (robertliu)]

I have no idea why the CI validation failed in comment https://code.launchpad.net/~robertliu/snappy-hwe-snaps/+git/modme-manager/+merge/434168/comments/1154244
I didn't change any code, but only reword a comment message. I don't have permission to trigger the job, so I regenerated a commit id to make the bot re-run the job.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

It is failing when running:

snap set modem-manager test.quick-suspend-resume=true

See https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-test/3658/console

[Robert Liu (robertliu)]

It seems the "snap restart ..." in the configure hook cannot run right after the generation of props file. I was able to reproduce the failure easily with
  for i in $(seq 10); do echo ========== $i ==========; sudo snap set modem-manager test.quick-suspend-resume=true || break; sudo snap set modem-manager test.quick-suspend-resume=false || break; done

After adding a delay (sleep 1) between writing props file and restarting service, I cannot reproduce the issue in a 50-run test.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: faa6d8e096f8832f25df0598c2cdb7e04b6ecb00

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1606/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:faa6d8e096f8832f25df0598c2cdb7e04b6ecb00
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/802/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/825
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/825
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/825
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/825
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1606
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1348
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1416/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/802/rebuild

review: Approve (continuous-integration)

[Robert Liu (robertliu)]

re-trigger the above build and verify the fix via Jenkins

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: faa6d8e096f8832f25df0598c2cdb7e04b6ecb00

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1607/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:faa6d8e096f8832f25df0598c2cdb7e04b6ecb00
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/803/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/826
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/826
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/826
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/826
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1607
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1349
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1417/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/803/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Thanks, this looks really nice. However the "sleep 1" between writing the properties and restarting MM should not be really necessary, and I would be surprised if it is because of the file being written late. Note also that for the network-manager snap this sleep is not necessary.

Could you maybe find the service state and the journal when things fail? That would help us find the cause. Maybe the problem is too fast re-starts or similar.

Unmerged commits

faa6d8e... by Robert Liu on 2022-12-20

tests: updates for new test options

Signed-off-by: Robert Liu <email address hidden>

8a9485b... by Robert Liu on 2022-12-21

t/l/utilities.sh: fix channel setting of mm

Signed-off-by: Robert Liu <email address hidden>

793ef40... by Robert Liu on 2022-12-20

t/m/network-manager-autoconn: fix track of network-manager

Signed-off-by: Robert Liu <email address hidden>

e21c758... by Robert Liu on 2022-12-20

docs: add a new page for test options

Signed-off-by: Robert Liu <email address hidden>

97029b0... by Robert Liu on 2022-12-19

Restart service when any test options is changed

Signed-off-by: Robert Liu <email address hidden>

diff --git a/bin/modemmanager b/bin/modemmanager
index d8c22a6..73561f1 100755
--- a/bin/modemmanager
+++ b/bin/modemmanager
@@ -7,20 +7,28 @@ set -ex
 # loader happy and find the plugins at the right location
 export SNAP_APP_PATH=$SNAP
 
+. "$SNAP"/bin/snap-prop.sh
+. "$SNAP"/bin/snap-config.sh
+
+# Create default properties file if there is not one
+if [ ! -f "$props_file" ]; then
+	write_current_props_file
+fi
+
 LOG_LEVEL="INFO"
 DEBUG=""
-if [ -f "$SNAP_DATA"/.debug_enabled ]; then
+if [ "$(get_debug_enable)" = "true" ]; then
     LOG_LEVEL="DEBUG"
     DEBUG="--debug"
 fi
 
 TEST_NO_SUSPEND_RESUME=""
-if [ "$(snapctl get test.no-suspend-resume)" = "true" ]; then
+if [ "$(get_test_no_suspend_resume)" = "true" ]; then
 	TEST_NO_SUSPEND_RESUME="--test-no-suspend-resume"
 fi
 
 TEST_QUICK_SUSPEND_RESUME=""
-if [ "$(snapctl get test.quick-suspend-resume)" =  "true" ]; then
+if [ "$(get_test_quick_suspend_resume)" =  "true" ]; then
 	TEST_QUICK_SUSPEND_RESUME="--test-quick-suspend-resume"
 fi
 
diff --git a/bin/snap-config.sh b/bin/snap-config.sh
new file mode 100644
index 0000000..578efa3
--- /dev/null
+++ b/bin/snap-config.sh
@@ -0,0 +1,28 @@
+#!/bin/sh -ex
+# Copyright (C) 2022 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+props_file="$SNAP_DATA"/current_snap_props
+
+
+# Functions to apply snap settings
+
+write_props_content() {
+    echo "$1" > "$props_file"
+}
+
+write_current_props_file() {
+    write_props_content "$(get_all_props)"
+}
diff --git a/bin/snap-prop.sh b/bin/snap-prop.sh
new file mode 100644
index 0000000..d618bf3
--- /dev/null
+++ b/bin/snap-prop.sh
@@ -0,0 +1,47 @@
+#!/bin/sh -ex
+# Copyright (C) 2022 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Getters for snap properties. They write the current value to stdout.
+
+get_debug_enable() {
+    value=$(snapctl get debug.enable) || true
+    if [ -z "$value" ]; then
+        value=false
+    fi
+    echo "$value"
+}
+
+get_test_no_suspend_resume() {
+    value=$(snapctl get test.no-suspend-resume) || true
+    if [ -z "$value" ]; then
+        value=false
+    fi
+    echo "$value"
+}
+
+get_test_quick_suspend_resume() {
+    value=$(snapctl get test.quick-suspend-resume) || true
+    if [ -z "$value" ]; then
+        value=false
+    fi
+    echo "$value"
+}
+
+get_all_props() {
+    printf "debug_enable=$(get_debug_enable)\n"
+    printf "test_no_suspend_resume=$(get_test_no_suspend_resume)\n"
+    printf "test_quick_suspend_resume=$(get_test_quick_suspend_resume)\n"
+}
diff --git a/docs/installation.md b/docs/installation.md
index c74fda3..b6223a2 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -69,3 +69,4 @@ we use _sudo_ with them.
  * [Entering SIM Passwords](entering-sim-passwords.md)
  * [Configuring Cellular Connections](configuring-cellular-connections.md)
  * [Enable Debug Support](reference/snap-configuration/debug.md)
+ * [Enable Test Options](reference/snap-configuration/test-options.md)
diff --git a/docs/metadata.yaml b/docs/metadata.yaml
index dc2d961..fb8b5c1 100644
--- a/docs/metadata.yaml
+++ b/docs/metadata.yaml
@@ -21,6 +21,8 @@ navigation:
         children:
           - title: Debug
             location: reference/snap-configuration/debug.md
+          - title: Test Options
+            location: reference/snap-configuration/test-options.md
       - title: Available Commands
         location: reference/available-commands.md
       - title: DBUS API
diff --git a/docs/reference/snap-configuration/test-options.md b/docs/reference/snap-configuration/test-options.md
new file mode 100644
index 0000000..f3ffd43
--- /dev/null
+++ b/docs/reference/snap-configuration/test-options.md
@@ -0,0 +1,55 @@
+---
+title: Test Options
+table_of_contents: True
+---
+
+# Test Options
+
+The test options enable testing features of modem-manager. Currently 
+modem-manager snap only supports:
+ * `--test-no-suspend-resume`
+ * `--test-quick-suspend-resume`
+
+It is disabled by default and has to be explicitly turned on for usage. The
+snap configuration options are under the `test` catalog.
+
+## No Suspend Resume
+
+This feature is controlled by the `test.no-suspend-resume` option. Switching 
+this on means **disable** suspend/resume support at runtime. This is useful 
+for modems which are never turned off or suspended when the host suspends.
+
+The option takes a boolean value. The meaning of the possible values are:
+
+ * **true:** No suspend/resume support
+ * **false (default):** Support suspend/resume
+
+## Quick Suspend Resume
+
+This feature is controlled by the `test.quick-suspend-resume` option. 
+Switching this on means use quick suspend/resume method for synchronizing 
+the interfaces when resuming. Some WWAN modules may need this if they
+don't support suspend/resume correctly.
+
+The option takes a boolean value. The meaning of the possible values are:
+
+ * **true:** Use quick suspend/resume method
+ * **false (default):** Use default suspend/resume method
+
+# Set Test Options
+Changing the configuration option has immediate effect and also affects 
+future executions of the MM daemon.
+
+**Example:** Enable no-suspend-resume feature
+
+```
+$ snap set modem-manager test.no-suspend-resume=true
+```
+
+<br/>
+**Example:** Disable quick-suspend-resume feature.
+
+```
+$ snap set modem-manager test.quick-suspend-resume=false
+```
+
diff --git a/hooks/configure b/hooks/configure
index a8d980c..fcdfcb4 100755
--- a/hooks/configure
+++ b/hooks/configure
@@ -2,37 +2,43 @@
 
 set -ex
 
-# $1 true/false for enabling/disabling debug log level in MM
-# We create/remove the file for future executions and also change
-# the logging level of the running daemon.
-switch_debug_enable() {
-    DEBUG_FILE=$SNAP_DATA/.debug_enabled
-    # Note that on installation MM will not be running, so we make sure
-    # that the call to mmcli does not fail.
-    if [ "$1" = "true" ]; then
-        "$SNAP"/bin/mmcli-internal --set-logging=DEBUG || true
-        touch "$DEBUG_FILE"
-    else
-        "$SNAP"/bin/mmcli-internal --set-logging=INFO || true
-        rm -f "$DEBUG_FILE"
-    fi
+# Configure hook has two missions:
+# 1. Set properties defaults on installation, so users can see them
+# 2. Re-start daemon if a property has changed
+
+. "$SNAP"/bin/snap-prop.sh
+. "$SNAP"/bin/snap-config.sh
+
+_create_props_content() {
+    printf "debug_enable=%s\n" "$debug_enable"
+    printf "test_no_suspend_resume=%s\n" "$test_no_suspend_resume"
+    printf "test_quick_suspend_resume=%s\n" "$test_quick_suspend_resume"
 }
 
-value=$(snapctl get debug.enable)
-if [ -z "$value" ]; then
-    value="false"
-    snapctl set debug.enable="$value"
-fi
-switch_debug_enable "$value"
+debug_enable=$(get_debug_enable)
+test_no_suspend_resume=$(get_test_no_suspend_resume)
+test_quick_suspend_resume=$(get_test_quick_suspend_resume)
 
-value=$(snapctl get test.no-suspend-resume)
-if [ -z "$value" ]; then
-    value="false"
-    snapctl set test.no-suspend-resume="$value"
+# Store always, so we show defaults when properties are set to empty strings
+snapctl set debug.enable="$debug_enable"
+snapctl set test.no-suspend-resume="$test_no_suspend_resume"
+snapctl set test.quick-suspend-resume="$test_quick_suspend_resume"
+
+content=$(_create_props_content)
+
+if [ ! -e "$props_file" ]; then
+    # Installation or refresh from old snap. Assign defaults.
+    write_props_content "$content"
+    exit 0
 fi
 
-value=$(snapctl get test.quick-suspend-resume)
-if [ -z "$value" ]; then
-    value="false"
-    snapctl set test.quick-suspend-resume="$value"
+old_content=$(cat "$props_file")
+if [ "$content" = "$old_content" ]; then
+    # No change in properties, this must be a snap refresh
+    exit 0
 fi
+
+# Some property changed, store new values and re-start daemon to apply changes
+write_props_content "$content"
+sleep 1 # wait a bit for props file to be written
+snapctl restart "$SNAP_NAME"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 604ff7f..cc82a3a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -66,6 +66,8 @@ parts:
       modemmanager: bin/modemmanager
       mmcli: bin/mmcli
       mmcli-internal: bin/mmcli-internal
+      snap-config.sh: bin/snap-config.sh
+      snap-prop.sh: bin/snap-prop.sh
 
   changelog:
     plugin: nil
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index f0aa6d7..a69a827 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -19,11 +19,11 @@ install_snap_under_test() {
 	if [ -n "$SNAP_CHANNEL" ] ; then
 		# Don't reinstall if we have it installed already
 		if ! snap list | grep "$SNAP_NAME"; then
-			snap install --"$SNAP_CHANNEL" "$SNAP_NAME"
+			snap install --channel "$SNAP_CHANNEL" "$SNAP_NAME"
 		fi
 	else
 		# Install first from store to avoid error when performing the connection
-		snap install "$SNAP_NAME"
+		snap install --channel 22/stable "$SNAP_NAME"
 		# Install prebuilt snap
 		snap install --dangerous "$PROJECT_PATH"/"$SNAP_NAME"_*_"$SNAP_ARCH".snap
 		if [ -n "$SNAP_AUTO_ALIASES" ]; then
@@ -38,3 +38,28 @@ install_snap_under_test() {
 		fi
 	fi
 }
+
+# $1 instruction to execute repeatedly until complete or max times
+# $2 sleep time between retries. Default 1sec
+# $3 max_iterations. Default 20
+repeat_until_done() {
+	timeout=1
+	if [ $# -ge 2 ]; then
+		timeout=$2
+	fi
+
+	max_iterations=20
+	if [ $# -ge 3 ]; then
+		max_iterations=$3
+	fi
+
+	i=0
+	while [ $i -lt $max_iterations ] ; do
+		if $(eval $1) ; then
+			break
+		fi
+		sleep $timeout
+		let i=i+1
+	done
+	test $i -lt $max_iterations
+}
diff --git a/tests/main/debug-config-option/task.yaml b/tests/main/debug-config-option/task.yaml
index 3d54557..822cd6c 100644
--- a/tests/main/debug-config-option/task.yaml
+++ b/tests/main/debug-config-option/task.yaml
@@ -4,17 +4,27 @@ execute: |
     . $TESTSLIB/utilities.sh
 
     test "$(snap get modem-manager debug.enable)" = "false"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c debug_enable=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
 
     journalctl --rotate; journalctl --vacuum-time=1ms
     snap set modem-manager debug.enable=true
     test "$(snap get modem-manager debug.enable)" = "true"
-    test -e /var/snap/modem-manager/current/.debug_enabled
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c debug_enable=true /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
     journalctl --no-pager -u snap.modem-manager.modemmanager.service |
-        MATCH "logging: level 'DEBUG'"
+        grep "\/sbin\/ModemManager" |
+        grep -c -e "--debug --log-level=DEBUG" |
+        MATCH "1"
 
     journalctl --rotate; journalctl --vacuum-time=1ms
     snap set modem-manager debug.enable=false
     test "$(snap get modem-manager debug.enable)" = "false"
-    test ! -e /var/snap/modem-manager/current/.debug_enabled
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c debug_enable=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
     journalctl --no-pager -u snap.modem-manager.modemmanager.service |
-        MATCH "logging: level 'INFO'"
+        grep -c -e "--debug --log-level=DEBUG" |
+        MATCH "0"
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
index 9cb5aa6..d6b43ac 100644
--- a/tests/main/installation/task.yaml
+++ b/tests/main/installation/task.yaml
@@ -19,3 +19,19 @@ execute: |
     if sudo journalctl --unit=snap.modem-manager.modemmanager.service | MATCH "<debug>"; then
         exit 1
     fi
+
+    # Make sure test-no-suspend-resume is disabled
+    if sudo journalctl --unit=snap.modem-manager.modemmanager.service |
+      grep "\/sbin\/ModemManager" | MATCH "--test-no-suspend-resume"; then
+        exit 1
+    fi
+
+    # Make sure test-quick-suspend-resume is disabled
+    if sudo journalctl --unit=snap.modem-manager.modemmanager.service |
+      grep "\/sbin\/ModemManager" | MATCH "--test-quick-suspend-resume"; then
+        exit 1
+    fi
+
+    # For debugging dump all snaps and connected slots/plugs
+    snap list
+    snap connections --all
diff --git a/tests/main/network-manager-autoconn/task.yaml b/tests/main/network-manager-autoconn/task.yaml
index 9add642..30b458d 100644
--- a/tests/main/network-manager-autoconn/task.yaml
+++ b/tests/main/network-manager-autoconn/task.yaml
@@ -6,7 +6,7 @@ execute: |
     # Service should be up an running
     wait_for_modem_manager
 
-    snap install --channel=20/stable network-manager
+    snap install --channel=22/stable network-manager
     sleep 5
 
     # Ensure all necessary plugs/slots are connected
diff --git a/tests/main/test-no-suspend-resume-option/task.yaml b/tests/main/test-no-suspend-resume-option/task.yaml
new file mode 100644
index 0000000..b366d06
--- /dev/null
+++ b/tests/main/test-no-suspend-resume-option/task.yaml
@@ -0,0 +1,31 @@
+summary: Test modem-manager snap test.no-suspend-resume configuration
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    test "$(snap get modem-manager test.no-suspend-resume)" = "false"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_no_suspend_resume=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+
+    journalctl --rotate; journalctl --vacuum-time=1ms
+    snap set modem-manager test.no-suspend-resume=true
+    test "$(snap get modem-manager test.no-suspend-resume)" = "true"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_no_suspend_resume=true /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+    journalctl --no-pager -u snap.modem-manager.modemmanager.service |
+        grep "\/sbin\/ModemManager" |
+        grep -c -e "--test-no-suspend-resume" |
+        MATCH "1"
+
+    journalctl --rotate; journalctl --vacuum-time=1ms
+    snap set modem-manager test.no-suspend-resume=false
+    test "$(snap get modem-manager test.no-suspend-resume)" = "false"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_no_suspend_resume=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+    journalctl --no-pager -u snap.modem-manager.modemmanager.service |
+        grep "\/sbin\/ModemManager" |
+        grep -c -e "--test-no-suspend-resume" |
+        MATCH "0"
diff --git a/tests/main/test-quick-suspend-resume-option/task.yaml b/tests/main/test-quick-suspend-resume-option/task.yaml
new file mode 100644
index 0000000..70da4f9
--- /dev/null
+++ b/tests/main/test-quick-suspend-resume-option/task.yaml
@@ -0,0 +1,31 @@
+summary: Test modem-manager snap test.quick-suspend-resume configuration
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    test "$(snap get modem-manager test.quick-suspend-resume)" = "false"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_quick_suspend_resume=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+
+    journalctl --rotate; journalctl --vacuum-time=1ms
+    snap set modem-manager test.quick-suspend-resume=true
+    test "$(snap get modem-manager test.quick-suspend-resume)" = "true"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_quick_suspend_resume=true /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+    journalctl --no-pager -u snap.modem-manager.modemmanager.service |
+        grep "\/sbin\/ModemManager" |
+        grep -c -e "--test-quick-suspend-resume" |
+        MATCH "1"
+
+    journalctl --rotate; journalctl --vacuum-time=1ms
+    snap set modem-manager test.quick-suspend-resume=false
+    test "$(snap get modem-manager test.quick-suspend-resume)" = "false"
+    # MM will create the file after being configured, wait a bit
+    repeat_until_done "test '$(grep -c test_quick_suspend_resume=false /var/snap/modem-manager/current/current_snap_props)' -eq 1" 5
+    sleep 2
+    journalctl --no-pager -u snap.modem-manager.modemmanager.service |
+        grep "\/sbin\/ModemManager" |
+        grep -c -e "--test-quick-suspend-resume" |
+        MATCH "0"