Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:not-use-core-support into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Alfonso Sanchez-Beato]

Change debug activation to avoid having to re-start NM.
To be able to re-start NM the core-support plug was being used, which
would have never been accepted in the Ubuntu store, as that interface
is meant to be used by the core snap only. Instead, avoid having to
restart by using nmcli to dynamically activate/deactivate debug option.
For this we need to use the nmcli plug instead for the configure hook.

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

FAILED: Continuous integration, rev:93a39210ff03886337b780999f60572076ae04f8
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1862/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2894/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1770/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3177/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2389/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1862/rebuild

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

[Roberto Mier Escandon (rmescandon)]

I've tested this solution and works perfectly without needing to restart the service.
However it is needed to change the spread tests for not to search for log level in nm daemon start command.

Also, having the log level set in the bin/network-manager explicitly could be misleading, since if you set it to a different value of the one set at the beginning, the startup command in a ps would report other than the current. On the other hand, I'm not sure if it is possible setting the log level somehow at the beginning without having that as startup param...

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

PR re-pushed after addressing comments.

@rmescandon, yeah, having different command line logging option than the one is really being used can be misleading, agreed. Note however that the right way of getting the logging config is "nmcli g logging".

Anyway, this could be solved by changing NetworkManager.conf instead of using the command line argument. We can force a reload of that file without re-starting the daemon, which would solve that coherence problem. However, that should be something addressed in another PR.

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

FAILED: Continuous integration, rev:e584fed6bb7c42b948ccc27dbfc24dc8299adc41
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1865/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2937/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1773/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3218/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2429/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1865/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:e584fed6bb7c42b948ccc27dbfc24dc8299adc41
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1866/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2938/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1774/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3219/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2430/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1866/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:e584fed6bb7c42b948ccc27dbfc24dc8299adc41
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1867/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2939/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1775/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3220/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2431/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1867/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:58e9965d9fe017fbe3979b9f521366c1e5a91c37
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1868/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2940
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1776/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3221
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2432/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1868/rebuild

review: Approve (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

LGTM

review: Approve

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/bin/nmcli-internal b/bin/nmcli-internal
new file mode 100755
index 0000000..c4986b7
--- /dev/null
+++ b/bin/nmcli-internal
@@ -0,0 +1,7 @@
+#!/bin/sh
+# This file is for internal use from hooks only
+export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib:$SNAP/usr/lib/x86_64-linux-gnu"
+export LD_LIBRARY_PATH="$SNAP/usr/lib:$SNAP/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH
+exec "$SNAP/usr/bin/nmcli" "$@"
diff --git a/docs/reference/snap-configuration/debug.md b/docs/reference/snap-configuration/debug.md
index 321143a..e16d17c 100644
--- a/docs/reference/snap-configuration/debug.md
+++ b/docs/reference/snap-configuration/debug.md
@@ -25,8 +25,8 @@ The option takes a boolean value. The meaning of the possible values are:
  * **true:** Enable logging debug information
  * **false (default):** Disable logging debug information
 
-Changing the **debug** configuration option has an immediate
-effect as the network-manager service restarts just after setting the new value.
+Changing the **debug** configuration option has immediate effect and also
+affects future executions of the NM daemon.
 
 **Example:** Enable debug feature
 
diff --git a/hooks/configure b/hooks/configure
index 0b8dcab..fd39ee4 100755
--- a/hooks/configure
+++ b/hooks/configure
@@ -81,18 +81,19 @@ switch_wifi_wake_on_wlan() {
 switch_debug_enable() {
   DEBUG_FILE=$SNAP_DATA/.debug_enabled
   # $1 true/false for enabling/disabling debug log level in nm
+  # We create/remove the file for future executions and also change
+  # the logging level of the running daemon.
   if [ "$1" = "true" ]; then
     if [ ! -f "$DEBUG_FILE" ]; then
       touch "$DEBUG_FILE"
+      "$SNAP"/bin/nmcli-internal g log level DEBUG
     fi
   else
     if [ -f "$DEBUG_FILE" ]; then
       rm -f "$DEBUG_FILE"
+      "$SNAP"/bin/nmcli-internal g log level INFO
     fi
   fi
-
-  # restart service to apply debug flag enable/disable
-  systemctl restart snap.network-manager.networkmanager.service
 }
 
 value="`snapctl get wifi.powersave`"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c24ce46..2708a70 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -16,7 +16,7 @@ slots:
 
 hooks:
   configure:
-    plugs: [core-support]
+    plugs: [nmcli]
 
 plugs:
   nmcli: network-manager
@@ -56,6 +56,7 @@ parts:
     files:
       bin/networkmanager: bin/networkmanager
       bin/dhcp-lease-mover: bin/dhcp-lease-mover
+      bin/nmcli-internal: bin/nmcli-internal
       conf/NetworkManager.conf: etc/NetworkManager/NetworkManager.conf
       data/copyright: usr/share/doc/network-manager/copyright
       startup-hooks/99-wol-by-default.sh: startup-hooks/99-wol-by-default.sh
diff --git a/tests/main/debug-config-option/task.yaml b/tests/main/debug-config-option/task.yaml
index 435574f..cddab8c 100644
--- a/tests/main/debug-config-option/task.yaml
+++ b/tests/main/debug-config-option/task.yaml
@@ -2,26 +2,16 @@ summary: Test network-manager snap debug configuration
 
 execute: |
     . $TESTSLIB/utilities.sh
-    
+
     test "$(snap get network-manager debug.enable)" = "false"
-    ! journalctl --no-pager -u snap.network-manager.networkmanager.service | grep -Pzq "<debug>"
+    ! journalctl --no-pager -u snap.network-manager.networkmanager.service | MATCH "<debug>"
 
     snap set network-manager debug.enable=true
-    wait_for_network_manager
     test "$(snap get network-manager debug.enable)" = "true"
     test -e /var/snap/network-manager/current/.debug_enabled
-    ps -ef | grep -Pzq "NetworkManager.*\-\-log\-level=DEBUG"
-    journalctl --no-pager -u snap.network-manager.networkmanager.service | grep -Pzq "<debug>"
+    network-manager.nmcli g log | MATCH "^DEBUG"
 
     snap set network-manager debug.enable=false
-    wait_for_network_manager
-    
-    # Clean up logs. From now on there shouldn't be any new debug log for network manager
-    journalctl --rotate
-    sleep .1
-    journalctl --vacuum-time=1ms
-    dmesg -c > /dev/null
-
     test "$(snap get network-manager debug.enable)" = "false"
     test ! -e /var/snap/network-manager/current/.debug_enabled
-    ! journalctl --no-pager -u snap.network-manager.networkmanager.service | grep -Pzq "<debug>"
+    network-manager.nmcli g log | MATCH "^INFO"
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
index 2c7e605..bdaf48d 100644
--- a/tests/main/installation/task.yaml
+++ b/tests/main/installation/task.yaml
@@ -15,4 +15,3 @@ execute: |
     snap interfaces | grep -Pzq ":firewall-control +[a-z,-]*network-manager"
     snap interfaces | grep -Pzq ":network-setup-observe +[a-z,-]*network-manager"
     snap interfaces | grep -Pzq "network-manager:service +network-manager:nmcli"
-    snap interfaces | grep -Pzq ":core-support +[a-z,\-,:\,]*network-manager"