Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-netplan-write-generated into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-22

[Alfonso Sanchez-Beato]

snap-patch/netplan: do not write external or generated connections

See
https://developer-old.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMSettingsConnectionFlags

snap-patch/netplan: do not write external or generated connections

See
https://developer-old.gnome.org/NetworkManager/stable/nm-dbus-types.html#NMSettingsConnectionFlags

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

PASSED: Continuous integration, rev:c6b44b327bcf1fb6886ac3841133a8f9d3ca7bdc
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/807/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/830
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/830
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/830
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/830
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1611
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1353
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1421/console

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

diff --git a/snap-patch/networkmanager/0002-netplan-make-use-of-libnetplan-for-YAML-backend.patch b/snap-patch/networkmanager/0002-netplan-make-use-of-libnetplan-for-YAML-backend.patch
index 0b94441..47d45f1 100644
--- a/snap-patch/networkmanager/0002-netplan-make-use-of-libnetplan-for-YAML-backend.patch
+++ b/snap-patch/networkmanager/0002-netplan-make-use-of-libnetplan-for-YAML-backend.patch
@@ -278,8 +278,8 @@ index ad6f277ce..0af209f64 100644
      if (existing_path && !existing_path_read_only && !nm_streq(path, existing_path))
          unlink(existing_path);
  
-+    /* NETPLAN: write only non-volatile files to /etc/netplan/... */
-+    if (!is_volatile) {
++    /* NETPLAN: write only non-temporary files to /etc/netplan/... */
++    if (!is_volatile && !is_nm_generated && !is_external) {
 +        g_autofree gchar* ssid = g_key_file_get_string(kf_file, "wifi", "ssid", NULL);
 +        g_autofree gchar* escaped_ssid = ssid ?
 +                                         g_uri_escape_string(ssid, NULL, TRUE) : NULL;
diff --git a/tests/vpn/openvpn/task.yaml b/tests/vpn/openvpn/task.yaml
index 651b0df..5d233e4 100644
--- a/tests/vpn/openvpn/task.yaml
+++ b/tests/vpn/openvpn/task.yaml
@@ -25,11 +25,21 @@ execute: |
   # tun2 device active (0 and 1 belong to easy-openvpn-server)
   network-manager.nmcli c show --active | grep tun2
 
-  # Ping other end of the tunnel
-  peer_ip=$(ip -4 a show dev tun1 primary | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
-  sudo sysctl net.ipv4.conf.tun1.accept_local=1
+  # Ping other end of the tunnel. Note that
+  # we could have connected to either tun0 or tun1.
   sudo sysctl net.ipv4.conf.tun2.accept_local=1
-  ping -I tun2 -c 1 "$peer_ip"
+  pingOk=no
+  for i in {0..1}; do
+      sudo sysctl net.ipv4.conf.tun"$i".accept_local=1
+      peer_ip=$(ip -4 a show dev tun"$i" primary | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+      if ping -I tun2 -c 1 "$peer_ip"; then
+          pingOk=yes
+      fi
+  done
+  if [ "$pingOk" != yes ]; then
+      printf "Cannot ping other end of the tunnel\n"
+      exit 1
+  fi
 
   network-manager.nmcli c down default
   network-manager.nmcli c del default