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

[Matteo Croce]

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

PASSED: Continuous integration, rev:fe50b0302035b8026d5f6f81ac6e00e30beae117
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1223/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/271
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1131/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/939

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Some changes needed, but otherwise looks very good.

review: Needs Fixing

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

PASSED: Continuous integration, rev:d12b394335369217e77145e4de3abc38d212210e
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1226/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/274
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1134/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/942

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/captive-redirect/manage.py b/captive-redirect/manage.py
new file mode 100755
index 0000000..56ea1c8
--- /dev/null
+++ b/captive-redirect/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-captive-redirect',
+    namespace='2017.com.canonical.captive-redirect',
+    version="1.0",
+    description=N_("Plainbox provider for the Captive Redirect snap"),
+    gettext_domain="2017_com_canonical_captive_redirect",
+)
diff --git a/captive-redirect/units/captive-redirect.pxu b/captive-redirect/units/captive-redirect.pxu
new file mode 100644
index 0000000..3f0ee75
--- /dev/null
+++ b/captive-redirect/units/captive-redirect.pxu
@@ -0,0 +1,102 @@
+# Copyright (C) 2017 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Matteo Croce <[e-mail]>
+
+unit: category
+id: captive_redirect
+_name: Captive portal redirect
+
+id: captive_redirect/setup/ensure_interface_connection_setup
+category_id: captive_redirect
+_description: Ensure that the captive-redirect interfaces are connected
+plugin: manual
+_steps:
+  1. Install the captive-redirect snap via
+    .
+      $ snap install captive-redirect
+    .
+_verification:
+  Verify that you see the following when running snap interfaces:
+  :firewall-control         captive-redirect
+
+id: captive_redirect/setup/default_disabled
+category_id: captive_redirect
+_description: Ensure that captive-redirect is disabled by default
+plugin: manual
+_steps:
+  1. Get the configuration with:
+  .
+    $ captive-redirect.config status
+  .
+  2. Ensure that there isn't any REDIRECT iptables chain:
+  .
+    $ sudo iptables-save |grep captive
+  .
+_verification:
+  1. Check that the redirect is disabled:
+  .
+    active: false
+  .
+  2. You shouldn't see any iptables rule
+
+id: captive_redirect/setup/iptables_rules_all_interfaces
+category_id: captive_redirect
+_description: Ensure that enabling captive-redirect sets up the correct iptables rules
+plugin: manual
+_steps:
+ 1. Enable captive-redirect with:
+ .
+   $ sudo snap set captive-redirect active=true port=9876
+ .
+ 2. Get the iptables rules with:
+ .
+   $ sudo iptables-save |grep captive
+ .
+_verification:
+  1. You should see iptables rules like:
+  .
+    :captive - [0:0]
+    -A PREROUTING -j captive
+    -A captive -p tcp -m multiport --dports 80,443 -j REDIRECT --to-ports 9876
+  .
+
+id: captive_redirect/setup/iptables_rules_all_interfaces
+category_id: captive_redirect
+_description: Ensure that enabling captive-redirect sets up iptables rules for a single interface
+plugin: manual
+_steps:
+ 1. Enable captive-redirect with:
+ .
+   $ sudo snap set captive-redirect active=true port=9999 interfaces=tun4
+ .
+ 2. Get the iptables rules with:
+ .
+   $ sudo iptables-save |grep captive
+ .
+_verification:
+  1. You should see iptables rules like:
+  .
+    :captive - [0:0]
+    -A PREROUTING -j captive
+    -A captive -i tun4 -p tcp -m multiport --dports 80,443 -j REDIRECT --to-ports 9999
+  .
+
+id: captive_redirect/functionality/redirect_works
+category_id: captive_redirect
+_description: Ensure that enabling captive-redirect really redirects the traffic
+plugin: manual
+_steps:
+  1. Install a sample web server with:
+  .
+    $ sudo snap install xkcd-webserver
+  .
+  2. Connect another device to the DUT (Device Under Test) and setup the DUT as default gateway
+  3. Enable the redirect with:
+  .
+    $ sudo snap set captive-redirect active=true port=80 interfaces=
+  .
+  4. Try to access an HTTP (avoid HTTPS, it will give a certificate error) web page from the device
+_verification:
+  1. You should see a blank page pointing to XKCD instead of the typed address