Merge ~morphis/snappy-hwe-snaps/+git/network-manager:further-networking-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Implement more test cases for extended features

Things we now cover in our testing:

* static IP configuration
* immutable netplan configuration files (as in: verify that we can't change them)
* IPv6 static address assignment
* IPv6 router advertisements
* DNS setup for connections

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

PASSED: Continuous integration, rev:ab941471b8e187c3d45921369f70aad38676ec82
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/279/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/181/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:ab941471b8e187c3d45921369f70aad38676ec82
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/280/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/182/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:e72fd5c6e589306fe88028b6f204f4b630d8e5d1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/285/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/187/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:e72fd5c6e589306fe88028b6f204f4b630d8e5d1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/286/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/188/console

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

lgtm

review: Approve (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

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

PASSED: Continuous integration, rev:66c565b3b325fdc0a753a5ad6e68df9bbd50b1ff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/298/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/200/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:66c565b3b325fdc0a753a5ad6e68df9bbd50b1ff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/299/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/201/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:c1c5b6c3e90ed3c9c250833926d0313e232f94bd
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/320/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/222/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:c1c5b6c3e90ed3c9c250833926d0313e232f94bd
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/321/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/223/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:0e6c3608847931186b623347874defe958a80378
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/322/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/224/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:0e6c3608847931186b623347874defe958a80378
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/323/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/225/console

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

Looks good to me.

There are a few sleeps that could probably be handled more gracefully, but let's leave as is for now...

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

FAILED: Continuous integration, rev:c1c5b6c3e90ed3c9c250833926d0313e232f94bd
https://jenkins.canonical.com/system-enablement/job/generic-build-snap-test-copy/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/83/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/241/console

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

review: Needs Fixing (continuous-integration)

diff --git a/README.md b/README.md
index dbaf69f..a8fec2f 100644
--- a/README.md
+++ b/README.md
@@ -79,3 +79,21 @@ And if you want to run an entire suite
 ```
  $ spread tests/main/
 ```
+
+## Available test suites
+
+Currently we have two test suites
+
+ * main
+ * full
+
+The 'main' suite covers testing of network-manager when its installed on
+any Ubuntu Core device from the store without configuring the system
+further to allow NetworkManager to control also all ethernet connections.
+
+The 'full' suite configures netplan in the prepare part to use NetworkManager
+as default backend so that it becomes the only network connection
+management service in the system.
+
+Depending on the nature of a test case the right test suite should be
+picked.
diff --git a/tests/full/correct-dns-setup/task.yaml b/tests/full/correct-dns-setup/task.yaml
new file mode 100644
index 0000000..9b6dfe0
--- /dev/null
+++ b/tests/full/correct-dns-setup/task.yaml
@@ -0,0 +1,47 @@
+summary: Verify correct DNS setup
+
+execute: |
+    . $TESTSLIB/utilities.sh
+    case $SPREAD_REBOOT in
+        0)
+            # For correct timing if the device has just booted
+            wait_for_network_manager
+
+            # Precondition is a existing network connection
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
+
+            # We get a default nameserver from the gateway
+            if [ "$SPREAD_BACKEND" = "qemu" ] ; then
+                cat /etc/resolv.conf | grep 'nameserver 10.0.2.3'
+            fi
+
+            # Ensure we can resolve a hostname correctly; must give a
+            # valid IP address
+            address=`python3 -c 'import socket; print(socket.gethostbyname("ubuntu.com"))'  2> /dev/null || echo "invalid"`
+            [ "$address" != "invalid" ] && [[ $address =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]
+
+            # Now lets switch to a system where we have a configuration
+            # for ethernet we can change
+            rm /etc/netplan/00-snapd-config.yaml
+            REBOOT
+            ;;
+        1)
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
+            /snap/bin/network-manager.nmcli d | grep -v netplan
+
+            connection=$(/snap/bin/network-manager.nmcli -m multiline -f UUID c show --active | awk '{print$2;exit}')
+            /snap/bin/network-manager.nmcli c modify $connection ipv4.dns 8.8.8.8
+            # We need to bring up the connection again here to get the DNS
+            # server really applied to the system.
+            /snap/bin/network-manager.nmcli c up $connection
+
+            # Give system a moment to settle
+            sleep 1
+
+            grep 'nameserver 8.8.8.8' /etc/resolv.conf
+            address=`python3 -c 'import socket; print(socket.gethostbyname("ubuntu.com"))'  2> /dev/null || echo "invalid"`
+            [ "$address" != "invalid" ] && [[ $address =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]
+            ;;
+        *)
+            ;;
+    esac
diff --git a/tests/full/dhcp-leases-are-moved/task.yaml b/tests/full/dhcp-leases-are-moved/task.yaml
index 97aa644..1dc1914 100644
--- a/tests/full/dhcp-leases-are-moved/task.yaml
+++ b/tests/full/dhcp-leases-are-moved/task.yaml
@@ -1,7 +1,11 @@
 summary: Verify that the DHCP leases are moved to the correct location
 
 execute: |
-    # Now we have network-manager also with ethernet support
+    . $TESTSLIB/utilities.sh
+
+    wait_for_network_manager
+
+    # We should have a single lease for eth0 at this point
     test -e /run/NetworkManager/dhcp
     test -e /var/snap/network-manager/current/state/dhcp
 
diff --git a/tests/full/immutable-netplan-config/task.yaml b/tests/full/immutable-netplan-config/task.yaml
new file mode 100644
index 0000000..52c2d61
--- /dev/null
+++ b/tests/full/immutable-netplan-config/task.yaml
@@ -0,0 +1,9 @@
+summary: Verify that netplan configuration files are immutable
+
+execute: |
+    # Ensure we're using a configuration generated from netplan
+    test -e /etc/netplan/00-snapd-config.yaml
+    test -e /run/NetworkManager/system-connections/netplan-eth0
+    /snap/bin/network-manager.nmcli c | grep 'netplan.eth0.*eth0'
+    # Try to change the DNS server used on this connection
+    test ! `/snap/bin/network-manager.nmcli c modify netplan-eth0 ipv4.dns 8.8.8.8`
\ No newline at end of file
diff --git a/tests/full/ipv6-address-assignment/task.yaml b/tests/full/ipv6-address-assignment/task.yaml
new file mode 100644
index 0000000..e36ef00
--- /dev/null
+++ b/tests/full/ipv6-address-assignment/task.yaml
@@ -0,0 +1,27 @@
+summary: Verify NetworkManager can assign a static IPv6 address to an interface
+
+restore: |
+    # Ensure that the created virtual network interfaces are removed
+    # in any case when we're done
+    if [ -e /sys/class/net/veth0 ] ; then
+        ip link delete veth0
+    fi
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    # Ensure that we have IPv6 support enabled in the kernel
+    test -e /proc/net/if_inet6
+
+    ip link add dev veth0 type veth peer name veth1
+
+    wait_for_network_manager
+
+    connection=veth-ipv6
+    /snap/bin/network-manager.nmcli c add con-name $connection ifname veth0 type ethernet \
+        ip6 abbe::cafe
+    /snap/bin/network-manager.nmcli c up $connection
+
+    # Verify that NetworkManager assigned the correct IPv6 address
+    # to the interface
+    ifconfig veth0 | grep 'abbe::cafe/128'
diff --git a/tests/full/ipv6-router-advertisements/task.yaml b/tests/full/ipv6-router-advertisements/task.yaml
new file mode 100644
index 0000000..4af402b
--- /dev/null
+++ b/tests/full/ipv6-router-advertisements/task.yaml
@@ -0,0 +1,70 @@
+summary: Test IPv6 address assignment via router advertisements
+
+restore: |
+    # Ensure that the created virtual network interfaces are removed
+    # in any case when we're done
+    if [ -e /sys/class/net/veth0 ] ; then
+        ip link delete veth0
+    fi
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    # Ensure that we have IPv6 support enabled in the kernel
+    test -e /proc/net/if_inet6
+
+    snap install --devmode se-test-tools
+    snap connect se-test-tools:home core
+    snap connect se-test-tools:network-control core
+
+    # Create virtual ethernet interface pair
+    sudo ip link add dev veth0 type veth peer name veth1
+
+    # As the virtual ethernet devices don't get IPv6 setup
+    # correctly by default we have to do this
+    sudo sysctl -w net.ipv6.conf.veth0.disable_ipv6=0
+    sudo sysctl -w net.ipv6.conf.veth1.disable_ipv6=0
+    veth0_lla=$(mac_to_ipv6 `cat /sys/class/net/veth0/address`)
+    veth1_lla=$(mac_to_ipv6 `cat /sys/class/net/veth1/address`)
+
+    # The radvd daemon will send out router advertisements on veth1
+    # so that we can receive them on veth0 end
+    cat <<-EOF > /home/test/radvd.conf
+    interface veth1 {
+        AdvSendAdvert on;
+        prefix 2001:db8:1:2::/64 {};
+    };
+    EOF
+
+    # To ensure that nobody touches veth1 we tell NetworkManager
+    # explicitly to do that.
+    /snap/bin/network-manager.nmcli d set veth1 managed no
+
+    # Assign our link-local addresses
+    if ! ip addr show dev veth0 | grep 'inet6.*scope link.*' ; then
+        sudo ip addr add dev veth0 scope link $veth0_lla
+    fi
+    if ! ip addr show dev veth1 | grep 'inet6.*scope link.*' ; then
+        sudo ip addr add dev veth1 scope link $veth1_lla
+    fi
+
+    # This will get our router advertisement daemon started and we
+    # now configure NetworkManager
+    sudo se-test-tools.radvd -C /home/test/radvd.conf -n -d 5 -m stderr -p /home/test/radvd.pid &
+
+    # Give things a bit more time to settle
+    sleep 10
+    ip addr show dev veth0
+
+    # At this point veth0 should have now a global IPv6 address
+    # assigned via router advertisements
+    ip addr show dev veth0 | grep 'inet6 2001:db8:1:2:.*/64 scope global'
+    # but veth1 should not have any
+    ip addr show dev veth1 | grep -v 'inet6.*scope global'
+
+    # NetworkManager should report the same addresses for IPv6
+    /snap/bin/network-manager.nmcli d show veth0 | grep 'GENERAL.STATE.*connected'
+    /snap/bin/network-manager.nmcli d show veth0 | grep 'IP6.ADDRESS.*2001:db8:1:2.*/64'
+
+    # Stop the radvd daemon
+    kill -TERM `cat /home/test/radvd.pid`
diff --git a/tests/full/no-netplan-default-config/task.yaml b/tests/full/no-netplan-default-config/task.yaml
index 7603969..c0d6934 100644
--- a/tests/full/no-netplan-default-config/task.yaml
+++ b/tests/full/no-netplan-default-config/task.yaml
@@ -23,17 +23,17 @@ execute: |
             # We should be automatically connected now and not via a configuration
             # generated from netplan
             wait_for_network_manager
-            network-manager.nmcli d | grep 'eth0.*connected'
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
             networkctl status eth0 | grep 'State: n/a'
-            network-manager.nmcli c show --active | grep eth0 | grep -v netplan
+            /snap/bin/network-manager.nmcli c show --active | grep eth0 | grep -v netplan
 
             # We should only have a single active configuration
-            test `network-manager.nmcli -m multiline -f UUID c show --active | wc -l` -eq 1
+            test `/snap/bin/network-manager.nmcli -m multiline -f UUID c show --active | wc -l` -eq 1
 
             # Verify that we can modify the automatically created connection
-            connection=$(network-manager.nmcli -m multiline -f UUID c show --active | xargs | cut -d' ' -f 2)
-            network-manager.nmcli c modify $connection 802-3-ethernet.wake-on-lan magic
-            wol_value=$(network-manager.nmcli -f 802-3-ethernet.wake-on-lan c show $connection | xargs | cut -d':' -f 2)
+            connection=$(/snap/bin/network-manager.nmcli -m multiline -f UUID c show --active | awk '{print$2;exit}')
+            /snap/bin/network-manager.nmcli c modify $connection 802-3-ethernet.wake-on-lan magic
+            wol_value=$(/snap/bin/network-manager.nmcli -f 802-3-ethernet.wake-on-lan c show $connection | xargs | cut -d':' -f 2)
             test "$wol_value" = " 64 (magic)"
             ;;
         *)
diff --git a/tests/full/system-network-is-active/task.yaml b/tests/full/system-network-is-active/task.yaml
index f3b38d2..ee29ef0 100644
--- a/tests/full/system-network-is-active/task.yaml
+++ b/tests/full/system-network-is-active/task.yaml
@@ -5,5 +5,5 @@ execute: |
     # Verify NetworManager handles ethernet and marks it as connected
     test -e /etc/netplan/00-default-nm-renderer.yaml
     wait_for_network_manager
-    network-manager.nmcli d | grep 'eth0.*connected'
+    /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
     networkctl status eth0 | grep 'State: n/a'
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 8fc1435..000ef74 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -18,15 +18,29 @@ switch_netplan_to_networkd() {
 	rm /etc/netplan/00-default-nm-renderer.yaml
 }
 
-wait_for_network_manager() {
-	while ! systemctl status snap.network-manager.networkmanager ; do
+wait_for_systemd_service() {
+	while ! systemctl status $1 ; do
 		sleep 1
 	done
 	sleep 1
 }
 
+wait_for_network_manager() {
+	wait_for_systemd_service snap.network-manager.networkmanager
+}
+
 stop_after_first_reboot() {
 	if [ $SPREAD_REBOOT -eq 1 ] ; then
 		exit 0
 	fi
 }
+
+mac_to_ipv6() {
+  mac=$1
+  ipv6_address=fe80::$(printf %02x $((0x${mac%%:*} ^ 2)))
+  mac=${mac#*:}
+  ipv6_address=$ipv6_address${mac%:*:*:*}ff:fe
+  mac=${mac#*:*:}
+  ipv6_address=$ipv6_address${mac%:*}${mac##*:}
+  echo $ipv6_address
+}
\ No newline at end of file
diff --git a/tests/main/ethernet-managed-by-networkd/task.yaml b/tests/main/ethernet-managed-by-networkd/task.yaml
index 22f2bf9..80e75cb 100644
--- a/tests/main/ethernet-managed-by-networkd/task.yaml
+++ b/tests/main/ethernet-managed-by-networkd/task.yaml
@@ -4,4 +4,4 @@ execute: |
     . $TESTSLIB/utilities.sh
     networkctl | grep 'eth0.*routable'
     wait_for_network_manager
-    network-manager.nmcli d | grep 'eth0.*unmanaged'
+    /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
index 686b513..2f1fe97 100644
--- a/tests/main/installation/task.yaml
+++ b/tests/main/installation/task.yaml
@@ -7,7 +7,7 @@ execute: |
     wait_for_network_manager
 
     # .. and nmcli should be able to reach NetworkManager
-    network-manager.nmcli g
+    /snap/bin/network-manager.nmcli g
 
     # Ensure all necessary plugs/slots are connected
     snap interfaces | grep -Pzq ":network-setup-observe +network-manager"
diff --git a/tests/main/set-hostname/task.yaml b/tests/main/set-hostname/task.yaml
new file mode 100644
index 0000000..ddcabd9
--- /dev/null
+++ b/tests/main/set-hostname/task.yaml
@@ -0,0 +1,13 @@
+summary: Verify we can modify the hostname of the system
+
+execute: |
+    # Print out current hostname for nm and hostnamed to have a reference
+    # for debugging later.
+    /snap/bin/network-manager.nmcli general hostname
+    hostnamectl
+
+    expected_hostname=foobar
+    /snap/bin/network-manager.nmcli general hostname $expected_hostname
+    test "`/snap/bin/network-manager.nmcli general hostname`" = "$expected_hostname"
+    test "`hostnamectl status | grep Static`" = "   Static hostname: $expected_hostname"
+    test "`hostname`" = "$expected_hostname"
diff --git a/tests/main/static-ip-configuration/task.yaml b/tests/main/static-ip-configuration/task.yaml
new file mode 100644
index 0000000..00031fc
--- /dev/null
+++ b/tests/main/static-ip-configuration/task.yaml
@@ -0,0 +1,49 @@
+summary: Test static IP configuration
+
+restore: |
+    # Ensure that the created virtual network interfaces are removed
+    # in any case when we're done
+    if [ -e /sys/class/net/veth0 ] ; then
+        ip link delete veth0
+    fi
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    ip link add dev veth0 type veth peer name veth1
+
+    wait_for_network_manager
+    # NetworkManager should ignore the other side of our pipe so
+    # that we can configure it statically.
+    /snap/bin/network-manager.nmcli d set veth1 managed no
+    ip addr add 10.0.1.1/24 dev veth1
+
+    connection=veth0-static
+    /snap/bin/network-manager.nmcli c add con-name $connection type ethernet ifname veth0 \
+        ip4 10.0.1.2/24
+    /snap/bin/network-manager.nmcli c up $connection
+    /snap/bin/network-manager.nmcli d | grep 'veth0.*connected'
+
+    # Address should be correctly applied now
+    expected_veth0_address="10.0.1.2/24"
+    /snap/bin/network-manager.nmcli -m multiline -f IP4.ADDRESS c show veth0-static | grep $expected_veth0_address
+    ip addr show dev veth0 | grep 'UP'
+    ip addr show dev veth0 | grep $expected_veth0_address
+
+    # Routing needs to be in place as well
+    expected_veth0_route="10.0.1.0/24 dev veth0  proto kernel  scope link  src 10.0.1.2  metric 100"
+    ip route | grep "$expected_veth0_route"
+
+    # Disable connection and ensure IP configuration is removed
+    /snap/bin/network-manager.nmcli c down $connection
+    ip addr show dev veth0 | grep -v $expected_veth0_address
+    ip route | grep -v "$expected_veth0_route"
+
+    # Enabling network connection again and removing it should remove
+    # the IP configuration too
+    /snap/bin/network-manager.nmcli c up $connection
+    ip addr show dev veth0 | grep $expected_veth0_address
+    ip route | grep "$expected_veth0_route"
+    /snap/bin/network-manager.nmcli c delete $connection
+    ip addr show dev veth0 | grep -v $expected_veth0_address
+    ip route | grep -v "$expected_veth0_route"
\ No newline at end of file
diff --git a/tests/main/switch-netplan-renderer/task.yaml b/tests/main/switch-netplan-renderer/task.yaml
index ad7d605..1c05b68 100644
--- a/tests/main/switch-netplan-renderer/task.yaml
+++ b/tests/main/switch-netplan-renderer/task.yaml
@@ -6,7 +6,7 @@ execute: |
         0)
             # networkd manages eth0 and NetworkManager does not
             networkctl | grep 'eth0.*routable'
-            network-manager.nmcli d | grep 'eth0.*unmanaged'
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
 
             # Now we switch back to the NetworkManager backend for netplan
             switch_netplan_to_network_manager
@@ -19,7 +19,7 @@ execute: |
             wait_for_network_manager
 
             # NetworkManager now controls eth0 and networkd does not
-            network-manager.nmcli d | grep 'eth0.*connected'
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
             networkctl status eth0 | grep 'State: n/a'
 
             # And switch back to networkd
@@ -31,7 +31,7 @@ execute: |
 
             # networkd manages eth0 and NetworkManager does not
             networkctl | grep 'eth0.*routable'
-            network-manager.nmcli d | grep 'eth0.*unmanaged'
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
             ;;
         *)
             ;;
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
index 74394f9..036f8de 100644
--- a/tests/main/wifi-connect-secured-ap/task.yaml
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
@@ -18,14 +18,14 @@ execute: |
     wifi-ap.config set disabled 0
     systemctl restart snap.wifi-ap.backend
     # AP needs a bit to appear and be visible for NetworkManager
-    network-manager.nmcli d wifi rescan
-    while ! network-manager.nmcli d wifi | grep Ubuntu ; do
-        network-manager.nmcli d wifi rescan
+    /snap/bin/network-manager.nmcli d wifi rescan
+    while ! /snap/bin/network-manager.nmcli d wifi | grep Ubuntu ; do
+        /snap/bin/network-manager.nmcli d wifi rescan
         sleep 1
     done
 
-    network-manager.nmcli d wifi | grep $WIFI_SSID
+    /snap/bin/network-manager.nmcli d wifi | grep $WIFI_SSID
 
     # Connect to the AP and ensure the connection was established
-    network-manager.nmcli d wifi connect $WIFI_SSID password $WIFI_PASSPHRASE
-    network-manager.nmcli d | grep 'wlan0.*connected'
+    /snap/bin/network-manager.nmcli d wifi connect $WIFI_SSID password $WIFI_PASSPHRASE
+    /snap/bin/network-manager.nmcli d | grep 'wlan0.*connected'