Merge ~morphis/snappy-hwe-snaps/+git/network-manager:feature/aliases into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

[Simon Fels]

Add alias for nmcli

This enables us to get the nmcli application coming from the snap as a first class program into the system. It will be available as /snap/bin/nmcli and as /snap/bin is high up in your $PATH it will be used over an existing nmcli coming from /usr/bin.

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

FAILED: Continuous integration, rev:844fd9cf729d7cebeb1f5bccbe9fea5ad392d53f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/599/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/507/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:0fcdac8f2922885735b8cb25801e27dba87bdb36
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/600/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/326
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/508/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:0fcdac8f2922885735b8cb25801e27dba87bdb36
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/601/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/327/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/509/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Just a question inline below. Very nice work experimenting with this!

review: Needs Information

[Simon Fels (morphis)]

CI failed with some checksum failures of the core snap. Triggered a new run.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

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

FAILED: Continuous integration, rev:0fcdac8f2922885735b8cb25801e27dba87bdb36
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/606/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/330/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/514/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:0fcdac8f2922885735b8cb25801e27dba87bdb36
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/619/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/341
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/527/console

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

review: Approve (continuous-integration)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index f1c9e00..06f3218 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,11 +21,22 @@ apps:
   nmcli:
     command: usr/bin/nmcli
     plugs: [nmcli]
+    aliases:
+      - nmcli
   networkmanager:
     command: bin/networkmanager
     daemon: simple
     slots: [service]
     plugs: [modem-manager, ppp, network-setup-observe]
+    # FIXME: This will create currently a symlink inside /snap/bin
+    # which points nowhere as the service isn't exposed as application
+    # for the user. Instead snapd needs to gain support to handle
+    # aliases for services differently by adding the Alias= option
+    # within the systemd unit file instead for example. Until this
+    # is implemented we keep the alias disabled.
+    #
+    # aliases:
+    #   - NetworkManager
 
 parts:
   networkmanager-common:
diff --git a/tests/main/aliases/task.yaml b/tests/main/aliases/task.yaml
new file mode 100644
index 0000000..e2eff9d
--- /dev/null
+++ b/tests/main/aliases/task.yaml
@@ -0,0 +1,13 @@
+summary: Verify aliases provided by the snap are correctly enabled
+
+execute: |
+    # FIXME: Aliases should be not in place automatically unless we
+    # have them approved from the store in our snap-declaration assertion.
+    test ! -e /snap/bin/nmcli
+
+    snap alias network-manager nmcli
+
+    test -e /snap/bin/nmcli
+
+    # Verify the alias works without any problems
+    /snap/bin/nmcli g