Merge ~slyon/snappy-hwe-snaps/+git/network-manager:slyon/netplan-0104-compat into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20

[Lukas Märdian]

Update netplan integration for v0.104 compatibility

netplan_clear_netdefs() is being called to early, therefore netdef_id is
undefined/garbage and can not be used to calculate a path.

This did work in netplan <= 0.103 as there was a memory leak and netdef_id
was not actually cleared, starting with 0.104 the memory leak is fixed and
we need to adopt the NetworkManager integration accordingly.

This change is compatible with old and new versions of libnetplan.

Update netplan integration for v0.104 compatibility

netplan_clear_netdefs() is being called to early, therefore netdef_id is
undefined/garbage and can not be used to calculate a path.

This did work in netplan <= 0.103 as there was a memory leak and netdef_id
was not actually cleared, starting with 0.104 the memory leak is fixed and
we need to adopt the NetworkManager integration accordingly.

This change is compatible with old and new versions of libnetplan.

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

FAILED: Continuous integration, rev:e8ed6a5822a90e6b8f241552df601285b8532f6f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/664/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1277/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM, thanks! Let's way for the CI tests now, I have retriggered them.

review: Approve

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

FAILED: Continuous integration, rev:e8ed6a5822a90e6b8f241552df601285b8532f6f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/665/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1278/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:e8ed6a5822a90e6b8f241552df601285b8532f6f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/666/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/693
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/693
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/693
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/693
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1474
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1216
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1279/console

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

review: Approve (continuous-integration)

diff --git a/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch b/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
index 6dbaf2a..ad89e95 100644
--- a/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
+++ b/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
@@ -1,4 +1,4 @@
-From 58fd964ae79bfb635928b839f5788e1face8ddfb Mon Sep 17 00:00:00 2001
+From 5ffe6c36ed2e9a5effc07d706f0b8dc34c7515ab Mon Sep 17 00:00:00 2001
 From: Lukas Märdian <[e-mail]>
 Date: Tue, 2 Feb 2021 15:52:05 +0100
 Subject: [PATCH] netplan: make use of libnetplan for YAML backend
@@ -249,7 +249,7 @@ index f943d65ca6834efd2bc243397d122243d906712e..4803135d3f60cdfae4a23640cefcbe6d
 +
  #endif /* __NMS_KEYFILE_UTILS_H__ */
 diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
-index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..53d8f929921181adbe2b0349ee80d1b93939e829 100644
+index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..627c72d7a0ff76e9b00e0a5d6c19111583ba3d66 100644
 --- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
 +++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
 @@ -11,6 +11,10 @@
@@ -294,7 +294,6 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..53d8f929921181adbe2b0349ee80d1b9
 +		g_hash_table_iter_init (&iter, netdefs);
 +		g_hash_table_iter_next (&iter, &netdef_id, &netplan_connection); // get first (and only) netdef from map
 +		write_netplan_conf(netplan_connection, rootdir); // write netdef to YAML
-+		netplan_clear_netdefs();
 +
 +		/* Delete same connection-profile provided by legacy netplan plugin */
 +		g_autofree gchar* legacy_path = NULL;
@@ -338,6 +337,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..53d8f929921181adbe2b0349ee80d1b9
 +					                       rootdir ?: "", (char *)netdef_id);
 +			}
 +		}
++		netplan_clear_netdefs();
 +
 +		/* re-read again: this time the connection profile newly generated by netplan in /run/... */
 +		if (   out_reread