Merge ~morphis/snappy-hwe-snaps/+git/network-manager:feature/enable-ethernet-config-item into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Add configuration item to allow users to enable ethernet support

The current implementation requires to reboot the device two times which is not really what we want but not possible to change until we have a network-setup-control interface which would allow our hook to change the netplan configuration directly.

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

FAILED: Continuous integration, rev:4af26d215df2eed8e3fbb2c1075df661af928713
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/886/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/592/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/794/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af26d215df2eed8e3fbb2c1075df661af928713
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/888/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/594/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/796/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4af26d215df2eed8e3fbb2c1075df661af928713
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/890/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/596/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/798/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:22573bad9f6654c659007215ae7263034dd73f26
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/894/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/597/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/802/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:22573bad9f6654c659007215ae7263034dd73f26
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/895/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/598/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/803/console

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

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

Just a minor vocabulary change and it will be good.

review: Needs Fixing (code)

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

FAILED: Continuous integration, rev:22573bad9f6654c659007215ae7263034dd73f26
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/896/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/599/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/805/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:dcc8c8e5d1d571367a4f0e016785874ae4e98b00
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/898/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/600/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/806/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

Ok, we need to held this back until the interface network-setup-control is merged upstream. Otherwise we don't get this past our CI. Moving the card on trello to blocked and marking this MP as disapproved.

review: Disapprove

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

FAILED: Continuous integration, rev:0a01042b13523ef0ae88149ae4e93a6500534503
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1558/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1878/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1466/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2258/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1455/console

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

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

Seems network-setup-control is now merged to snapd, can the landing/story be unblocked? Is it still valid?

[Roberto Mier Escandon (rmescandon)]

What I've tried in my rpi3:

Steps:
- install network-manager
- connect interfaces
- snap set network-manager ethernet.enable=true
- verified that
    * 'network-manager.nmcli d' shows eth0 unmanaged
    * 'snap get network-manager ethernet.enable' returns true
    * content in /etc/netplan at this moment is 00-snapd-config.yaml
- reboot
- 'network-manager.nmcli d' shows eth0 connected with connection name as 'netplan-eth0'
- content in /etc/netplan is 00-default-nm-renderer.yaml and 00-snapd-config.yaml

I thinks this is the expected behaviour. My only concern is about leaving other yaml files in /etc/netplan not related with nm. Is that intended?

in this url [1] literally says:

"If you don't want any netplan configuration files being used by NetworkManager, delete all files from /etc/netplan. Any remaining files will be considered by NetworkManager and used to configure Ethernet and wireless network devices"

[1] https://docs.ubuntu.com/core/en/stacks/network/network-manager/docs/enable-ethernet-support

review: Needs Information

[Roberto Mier Escandon (rmescandon)]

There is one spread test that is always failing, though I'm not sure it is related with this MP.
That one is tests/main/wifi-no-wowlan-iface-removed

https://pastebin.canonical.com/192985/

review: Needs Fixing

[Roberto Mier Escandon (rmescandon)]

Tested locally merging trunk, resolving conflicts and fixing failures in spread tests specific for this change. All works fine.
Please apply this patch https://pastebin.canonical.com/194037/ to be approved

review: Needs Fixing

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

FAILED: Continuous integration, rev:4fec16040d182778a1b7974ff7f7d90791d6ed2e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1841/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2773/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1749/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3060/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2274/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:48c21e19b11117998a854d1ffc449b975da7d4ee
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1842/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2784/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1750/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3071/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2285/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:9da3f0f7f86ac4b1f4fe0f394d3d6aad34a755ff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1860/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2872/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1768/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3155/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2368/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:766bd02bd419c39bbc7d1e3f8e35a4591292ca16
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1882/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3034/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1790/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3312/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2515/console

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

review: Needs Fixing (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

Please, apply this patch to solve spread failures https://pastebin.canonical.com/196067/

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

FAILED: Continuous integration, rev:ccda0e30cd2c9fe572fb4c8cbd5df1a0cb0d2c56
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1888/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3070/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1796/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3341/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/2546/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: 6aa9fd07140d511a21a7cc422440a663c2160e8a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/776/

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

PASSED: Successfully build documentation, rev: 6aa9fd07140d511a21a7cc422440a663c2160e8a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/777/

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

PASSED: Successfully build documentation, rev: 6aa9fd07140d511a21a7cc422440a663c2160e8a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/781/

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

PASSED: Successfully build documentation, rev: 6aa9fd07140d511a21a7cc422440a663c2160e8a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/784/

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

PASSED: Continuous integration, rev:6aa9fd07140d511a21a7cc422440a663c2160e8a
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/50/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/50
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/50
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/50
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/50

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

review: Approve (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

review: Approve

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

PASSED: Successfully build documentation, rev: 0a5242cc51050c15fb754dcaf9ebd6b00d93d73e

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/829/

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

PASSED: Successfully build documentation, rev: 0a5242cc51050c15fb754dcaf9ebd6b00d93d73e

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/830/

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

PASSED: Successfully build documentation, rev: 0a5242cc51050c15fb754dcaf9ebd6b00d93d73e

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/831/

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

PASSED: Successfully build documentation, rev: 0a5242cc51050c15fb754dcaf9ebd6b00d93d73e

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/828/

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

FAILED: Continuous integration, rev:0a5242cc51050c15fb754dcaf9ebd6b00d93d73e
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/60/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/60/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/60/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/60/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/60/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: 3b7d25311ff11621ea77499a5707f934f869a47d

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/865/

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

FAILED: Continuous integration, rev:3b7d25311ff11621ea77499a5707f934f869a47d
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/70/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/70
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/70
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/70
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/865
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/613
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/628/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: b2844cf8d184d9d31b0f7002095fdc5c68aa5aff

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/866/

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

FAILED: Continuous integration, rev:b2844cf8d184d9d31b0f7002095fdc5c68aa5aff
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/71/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/71
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/71
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/71
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/866
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/614
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/629/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: bf5c94e7e97d913a195c7cb1eb7201695cfeb876

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/868/

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

FAILED: Continuous integration, rev:bf5c94e7e97d913a195c7cb1eb7201695cfeb876
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/72/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/72
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/72
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/72
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/868
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/616
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/631/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: 2ba7ef87e2579e8fb55b535beadfc822b08ee127

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/869/

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

FAILED: Continuous integration, rev:2ba7ef87e2579e8fb55b535beadfc822b08ee127
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/19/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/74/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/74
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/74
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/74
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/869
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/617
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/632/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: 742ee696683b570c6553cdab706dea4c068ff699

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/870/

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

PASSED: Continuous integration, rev:742ee696683b570c6553cdab706dea4c068ff699
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/20/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/75
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/75
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/75
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/75
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/870
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/618
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/634/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Approve

diff --git a/docs/metadata.yaml b/docs/metadata.yaml
index 4fabdd1..82bf35f 100644
--- a/docs/metadata.yaml
+++ b/docs/metadata.yaml
@@ -27,6 +27,8 @@ navigation:
     children:
       - title: Snap Configuration
         children:
+          - title: Ethernet Support
+            location: reference/configuration/ethernet_support.md
           - title: Debug
             location: reference/snap-configuration/debug.md
           - title: Wake on WLAN
diff --git a/docs/reference/configuration/ethernet_support.md b/docs/reference/configuration/ethernet_support.md
new file mode 100644
index 0000000..fbc5929
--- /dev/null
+++ b/docs/reference/configuration/ethernet_support.md
@@ -0,0 +1,47 @@
+---
+title: Ethernet Support
+table_of_contents: true
+---
+
+# Ethernet Support
+
+*Available since:* 1.2.2-12
+
+The NetworkManager snap provides a configuration option to adjust
+if it should manage ethernet network connections.
+
+By default the NetworkManager snap **does not** manage ethernet network
+devices as it would conflict with the default network management in
+Ubuntu Core which is handled by [netplan](https://launchpad.net/netplan) and
+[networkd](https://www.freedesktop.org/software/systemd/man/systemd-networkd.service.html).
+
+## Enable Ethernet Support
+
+To enable management of ethernet network devices the snap provides the
+*ethernet.enable* configuration option.
+
+This configuration option accepts the following values
+
+ * **false (default):** Ethernet support is disabled. All network
+ devices matching the expression 'en*' or 'eth*' will be ignored.
+ * **true:** All ethernet devices available on the system will be
+ managed by NetworkManager. networkd will not manage any of these
+ anymore.
+
+Changing the *ethernet* configuration option needs a reboot of the
+device it's running on.
+
+After the device has rebooted ethernet support is enabled NetworkManager will
+take over management of all available ethernet network devices on the device.
+
+NetworkManager will reuse existing configurations files from */etc/netplan*
+when ethernet support is enabled. Those will marked as immutable inside
+NetworkManager and any changes need to be written manually into the relevant
+files in */etc/netplan*.
+
+Example:
+
+```
+ $ snap set network-manager ethernet.enable=true
+ $ sudo reboot
+```
diff --git a/docs/reference/snap-configuration/wowlan.md b/docs/reference/snap-configuration/wowlan.md
index d245062..2ae0791 100644
--- a/docs/reference/snap-configuration/wowlan.md
+++ b/docs/reference/snap-configuration/wowlan.md
@@ -5,6 +5,8 @@ table_of_contents: True
 
 # Wake on WLAN
 
+*Available since:* 1.2.2-11
+
 Wake on WLAN (called WoWLAN in the following) is a feature which allows a device
 to be woken up from standby power states to faciliate device management. It is based
 on the well well-established standard for Wake on LAN. The functionality is not entirely
diff --git a/hooks/configure b/hooks/configure
index fd39ee4..386528a 100755
--- a/hooks/configure
+++ b/hooks/configure
@@ -78,6 +78,23 @@ switch_wifi_wake_on_wlan() {
   fi
 }
 
+switch_ethernet() {
+  case "$1" in
+    true)
+      cat <<EOF > /etc/netplan/00-default-nm-renderer.yaml
+network:
+  renderer: NetworkManager
+EOF
+      ;;
+    false)
+      rm -f /etc/netplan/00-default-nm-renderer.yaml
+      ;;
+    *)
+      echo "ERROR: Invalid value provided for ethernet"
+      exit 1
+  esac
+}
+
 switch_debug_enable() {
   DEBUG_FILE=$SNAP_DATA/.debug_enabled
   # $1 true/false for enabling/disabling debug log level in nm
@@ -115,6 +132,18 @@ else
   switch_wifi_wake_on_wlan disabled ""
 fi
 
+value=`snapctl get ethernet.enable`
+if [ -n "$value" ]; then
+  switch_ethernet $value
+else
+  if [ -e /etc/netplan/00-default-nm-renderer.yaml ]; then
+    value=true
+  else
+    value=false
+  fi
+  snapctl set ethernet.enable=$value
+fi
+
 value=$(snapctl get debug.enable)
 if [ -n "$value" ]; then
   switch_debug_enable $value
diff --git a/run-tests.sh b/run-tests.sh
index 4f18f03..f069bfb 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -66,5 +66,11 @@ else
 	clone_tests_extras
 fi
 
+# Any project-specific options for test-runner should be specified in
+# .tests_config under EXTRA_ARGS
+if [ -e ".tests_config" ]; then
+    . .tests_config
+fi
+
 echo "INFO: Executing tests runner"
-cd $TESTS_EXTRAS_PATH && ./tests-runner.sh "$@"
+cd $TESTS_EXTRAS_PATH && ./tests-runner.sh "$@" "$EXTRA_ARGS"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index a7c2ea9..38a7895 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,10 +14,6 @@ grade: stable
 slots:
   service: network-manager
 
-hooks:
-  configure:
-    plugs: [nmcli]
-
 plugs:
   nmcli: network-manager
   wpa:
@@ -25,6 +21,12 @@ plugs:
     bus: system
     name: fi.w1.wpa_supplicant1
 
+hooks:
+  configure:
+    plugs:
+      - nmcli
+      - network-setup-control
+
 apps:
   nmcli:
     command: usr/bin/nmcli
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index ffdd477..33886eb 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -28,8 +28,9 @@ rm -f /home/network-manager/nm-state.tar.gz
 
 snap_install network-manager
 # FIXME: Until the store snap-declaration is updated we need to connect
-# this plug manually.
+# this plugs manually.
 snap connect network-manager:firewall-control
+snap connect network-manager:network-setup-control
 
 # Snapshot of the current snapd state for a later restore
 systemctl stop snapd.service snapd.socket
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index b82593a..10a955a 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -20,10 +20,15 @@ switch_netplan_to_network_manager() {
 		return 0
 	fi
 
-	cat <<-EOF > /etc/netplan/00-default-nm-renderer.yaml
+	# set ethernet.enable in case the snap is already installed
+	if snap list | grep -q network-manager ; then
+		snap set network-manager ethernet.enable=true
+	else
+		cat << EOF > /etc/netplan/00-default-nm-renderer.yaml
 network:
   renderer: NetworkManager
-	EOF
+EOF
+	fi
 }
 
 switch_netplan_to_networkd() {
@@ -31,7 +36,12 @@ switch_netplan_to_networkd() {
 		return 0
 	fi
 
-	rm /etc/netplan/00-default-nm-renderer.yaml
+	# unset ethernet.enable in case the snap is already installed
+	if snap list | grep -q network-manager ; then
+		snap set network-manager ethernet.enable=false
+	else
+		rm /etc/netplan/00-default-nm-renderer.yaml
+	fi
 }
 
 # waits for a service to be active. Besides that, waits enough
@@ -75,7 +85,7 @@ wait_for_network_manager() {
 }
 
 stop_after_first_reboot() {
-	if [ $SPREAD_REBOOT -eq 1 ] ; then
+	if [ $SPREAD_REBOOT -gt 0 ] ; then
 		exit 0
 	fi
 }
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
index f3fd040..1ae0e05 100644
--- a/tests/main/aliases/task.yaml
+++ b/tests/main/aliases/task.yaml
@@ -5,12 +5,7 @@ execute: |
     # have them approved from the store in our snap-declaration assertion.
     test ! -e /snap/bin/nmcli
 
-    snapd_version=$(snap version | awk '/^snapd / {print $2; exit}')
-    target=$SNAP_NAME.nmcli
-    if dpkg --compare-versions $snapd_version lt 2.25 ; then
-        target=$SNAP_NAME
-    fi
-    snap alias $target nmcli
+    snap alias $SNAP_NAME.nmcli nmcli
 
     test -e /snap/bin/nmcli
 
diff --git a/tests/main/conf-ethernet-support/task.yaml b/tests/main/conf-ethernet-support/task.yaml
new file mode 100644
index 0000000..5816a2b
--- /dev/null
+++ b/tests/main/conf-ethernet-support/task.yaml
@@ -0,0 +1,55 @@
+summary: Verify ethernet support can be enabled via configuration option
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    # We need to have the network-setup-control interface available as
+    # otherwise the hook can't do its job
+    snap interfaces | grep network-setup-control
+
+    case "$SPREAD_REBOOT" in
+        0)
+            # We should now have the interface available
+            snap interfaces | grep network-setup-control
+
+            # In the default setup NetworkManager doesn't take over ethernet
+            wait_for_network_manager
+
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
+
+            # By default ethernet is disabled
+            test "`snap get network-manager ethernet.enable`" = "false"
+
+            # Enable ethernet support requires us to reboot two times to get
+            # things into a right state.
+            snap set network-manager ethernet.enable=true
+            test "`snap get network-manager ethernet.enable`" = "true"
+
+            REBOOT
+            ;;
+        1)
+            wait_for_network_manager
+
+            # NetworkManager now controls eth0 and networkd does not
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*connected'
+            # ... and we're running with the netplan configuration
+            /snap/bin/network-manager.nmcli d | grep 'netplan-eth0'
+            networkctl status eth0 | grep 'State: routable'
+
+            # Now lets switch back to network by using the configuration
+            # item again and doing another reboot.
+            snap set network-manager ethernet.enable=false
+            test "`snap get network-manager ethernet.enable`" = "false"
+            REBOOT
+            ;;
+        2)
+            wait_for_network_manager
+
+            # networkd manages eth0 and NetworkManager does not
+            networkctl | grep 'eth0.*routable'
+            /snap/bin/network-manager.nmcli d | grep 'eth0.*unmanaged'
+            ;;
+        *)
+            exit 1
+            ;;
+    esac
diff --git a/tests/main/set-hostname/task.yaml b/tests/main/set-hostname/task.yaml
index ddcabd9..69b27c8 100644
--- a/tests/main/set-hostname/task.yaml
+++ b/tests/main/set-hostname/task.yaml
@@ -1,6 +1,10 @@
 summary: Verify we can modify the hostname of the system
 
 execute: |
+    . "$TESTSLIB/utilities.sh"
+
+    wait_for_network_manager
+
     # Print out current hostname for nm and hostnamed to have a reference
     # for debugging later.
     /snap/bin/network-manager.nmcli general hostname