Merge ~teknoraver/snappy-hwe-snaps/+git/engineering-tests:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Matteo Croce]

Update test for new interfaces

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

FAILED: Continuous integration, rev:8faeea63966c604809d655dcf1ad101e7add1b68
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/577/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/485/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

This MR needs a description set above. One minor fix inline below.

review: Needs Fixing

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

FAILED: Continuous integration, rev:cbb498c9a3cbc50b08db28fd3a283d26f2de1784
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/579/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/487/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

Three minor things inline.

review: Needs Fixing

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

FAILED: Continuous integration, rev:5fd3d480b758cdad01431e05556c7119f402328f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/580/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/488/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/wifi-ap/units/wifi-ap.pxu b/wifi-ap/units/wifi-ap.pxu
index ae198ef..affa766 100644
--- a/wifi-ap/units/wifi-ap.pxu
+++ b/wifi-ap/units/wifi-ap.pxu
@@ -14,23 +14,22 @@ category_id: wifi_ap
 _description: Ensure that the wifi_ap interfaces are connected
 plugin: manual
 _steps:
-  1. Connect required wifi_ap slots/plugs
-     .
-     $ sudo snap connect wifi-ap:firewall-control ubuntu-core:firewall-control
-     $ sudo snap connect wifi-ap:network-control ubuntu-core:network-control
+  1. Network Manager setup
      .
      For snaps on Classic:
-     $ sudo snap connect wifi-ap:network-manager ubuntu-core:network-manager
+     NetworkManager is part of the base Ubuntu Desktop system
+     and does not need to be installed again.
      .
-     For full-snap based system (note that you need to install first
-     network-manager snap in this case):
+     For an Ubuntu Core system you have to install
+     the NetworkManager snap from the Ubuntu store.
      $ sudo snap install network-manager
-     $ sudo snap connect wifi-ap:network-manager network-manager:service
      .
 _verification:
   Verify that you see the following when running snap interfaces:
-  :network-bind            wifi-ap
+  :firewall-control        wifi-ap
   :network-control         wifi-ap
+  :network                 wifi-ap
+  :network-bind            wifi-ap
   .
   For snaps on Classic:
   :network-manager         wifi-ap