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

Proposed by Lukas Märdian
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 2144bc3d731412694e804679fe35a048d2e2f804
Merged at revision: dd5fde3b5a5e17f60612ed6f0fbb9438fcf42e85
Proposed branch: ~slyon/snappy-hwe-snaps/+git/network-manager:slyon/netplan-modify-connections
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20
Diff against target: 135 lines (+31/-16)
2 files modified
snap-patch/networkmanager/0002-nm-netplan-keyfile.patch (+29/-16)
tests/full/immutable-netplan-config/task.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+415913@code.staging.launchpad.net

Commit message

Update netplan integration patch

If existing connections are being modified via 'nmcli' netplan does not know
about the existing netdef_id, as the path to the keyfile is not in the format
'run/NetworkManager/system-connections/netplan-*.nmconnection'

If there is an previous existing netplan connection, make sure to pass the new
keyfile, but at the location/path of the old connection profile, so that
netplan is able to derive the original netdef_id.

Also, make the full:immutable-netplan-config a bit more robust, by avoiding the volatile connection profile generated by NM. And avoid deleting non-netplan (e.g. volatile) connections via libnetplan.

Description of the change

Update netplan integration patch

If existing connections are being modified via 'nmcli' netplan does not know
about the existing netdef_id, as the path to the keyfile is not in the format
'run/NetworkManager/system-connections/netplan-*.nmconnection'

If there is an previous existing netplan connection, make sure to pass the new
keyfile, but at the location/path of the old connection profile, so that
netplan is able to derive the original netdef_id.

Also, make the full:immutable-netplan-config a bit more robust, by avoiding the volatile connection profile generated by NM. And avoid deleting non-netplan (e.g. volatile) connections via libnetplan.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM,thanks

review: Approve
Revision history for this message
Lukas Märdian (slyon) wrote :

Thank you for the approval! I think we should be releasing this soon.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches