Merge ~morphis/snappy-hwe-snaps/+git/engineering-tests:bug/remove-unneeded-service-restart into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Simon Fels]

Small fixes

 * wifi-ap: drop restart of not existing backend service
 * wifi-ap: switch to key=value syntax for the config command

[Matteo Croce (teknoraver)]

review: Approve

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

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

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

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

[Simon Fels (morphis)]

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:079f4f5e920cf8700c52cb7f52dff7481d7ac60d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/950/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/856/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Top-approving although not being a maintainer as per Simon's request.

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

FAILED: Continuous integration, rev:14a73e436aa6138b880ac638e6f93aeb962156d7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/956/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/864/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Approve (continuous-integration)

diff --git a/wifi-ap/units/wifi-ap.pxu b/wifi-ap/units/wifi-ap.pxu
index f367cfe..503197a 100644
--- a/wifi-ap/units/wifi-ap.pxu
+++ b/wifi-ap/units/wifi-ap.pxu
@@ -14,6 +14,10 @@ category_id: wifi_ap
 _description: Ensure that the wifi_ap interfaces are connected
 plugin: manual
 _steps:
+  0. If the wifi-ap snap is already installed remove it via
+     .
+     $ snap remove wifi-ap
+     .
   1. Network Manager setup
      .
      For snaps on Classic:
@@ -22,7 +26,11 @@ _steps:
      .
      For an Ubuntu Core system you have to install
      the NetworkManager snap from the Ubuntu store.
-     $ sudo snap install network-manager
+     $ snap install network-manager
+     .
+  2. Install now the wifi-ap snap via
+     .
+     $ snap install wifi-ap
      .
 _verification:
   Verify that you see the following when running snap interfaces:
@@ -68,7 +76,7 @@ _steps:
   .
   2. Set a new value for the same configuration item
   .
-     $ sudo /snap/bin/wifi-ap.config set wifi.interface wlan1
+     $ sudo /snap/bin/wifi-ap.config set wifi.interface=wlan1
   .
   3. Retrieve the current value of the same configuration item
      for comparison.
@@ -87,25 +95,29 @@ _summary: Enabling the AP succeeds
 _purpose:
    Check to make sure the AP can be enabled. 
 _steps:
+  0. If the AP is already enabled as on some devices where the
+     automated wizard was able to find a good configuration
+     automatically you can skip the following steps. You can
+     verify if the AP is active by calling
+  .
+     $ /snap/bin/wifi-ap.status
+     ap.active: true
+  .
   1. Look up and set the wifi interface to the proper name
      e.g. from default wlan0 to enp0s3
   .
      $ ifconfig
-     $ /snap/bin/wifi-ap.config set wifi.interface <interface_name>
+     $ /snap/bin/wifi-ap.config set wifi.interface=<interface_name>
   .
   2. Enable the AP with the default configuration for other key values
   .
-     $ sudo /snap/bin/wifi-ap.config set disabled 0
-  .
-  3. Restart the wifi-ap systemd service to complete the enabling
-  .
-     $ sudo systemctl restart snap.wifi-ap.backend
+     $ sudo /snap/bin/wifi-ap.config set disabled=false
   .
-  4. Verify that the AP is enabled by looking at the key/value pair
+  3. Verify that the AP is enabled by looking at the key/value pair
   .
      $ /snap/bin/wifi-ap.config get disabled
 _verification:
-  Verify that the new value for the disabled is set to 0. Also verify that a
+  Verify that the new value for the disabled is set to false. Also verify that a
   different machine such as a phone or a laptop can connect to the AP using
   SSID of "Ubuntu" and no security type.