1
diff --git a/snapcraft.yaml b/snapcraft.yaml
2
index fc22731..9e0dcc3 100644
3
--- a/snapcraft.yaml
4
+++ b/snapcraft.yaml
5
@@ -31,7 +31,7 @@ apps:
6
31
    command: bin/networkmanager
31
    command: bin/networkmanager
7
32
    daemon: simple
32
    daemon: simple
8
33
    slots: [service]
33
    slots: [service]
10
34
    plugs: [modem-manager, ppp, network-setup-observe, wpa]
34
    plugs: [modem-manager, ppp, network-setup-observe, wpa, firewall-control]
11
35
    # FIXME: This will create currently a symlink inside /snap/bin
35
    # FIXME: This will create currently a symlink inside /snap/bin
12
36
    # which points nowhere as the service isn't exposed as application
36
    # which points nowhere as the service isn't exposed as application
13
37
    # for the user. Instead snapd needs to gain support to handle
37
    # for the user. Instead snapd needs to gain support to handle
14
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
15
index 57d24b5..12a76da 100644
16
--- a/tests/lib/prepare.sh
17
+++ b/tests/lib/prepare.sh
18
@@ -27,6 +27,9 @@ rm -f /home/network-manager/snapd-state.tar.gz
19
27
rm -f /home/network-manager/nm-state.tar.gz
27
rm -f /home/network-manager/nm-state.tar.gz
20
28
28
21
29
snap_install network-manager
29
snap_install network-manager
22
30
# FIXME: Until the store snap-declaration is updated we need to connect
23
31
# this plug manually.
24
32
snap connect network-manager:firewall-control
25
30
33
26
31
# Snapshot of the current snapd state for a later restore
34
# Snapshot of the current snapd state for a later restore
27
32
systemctl stop snapd.service snapd.socket
35
systemctl stop snapd.service snapd.socket
28
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
29
index 8ca1418..14dbebb 100644
30
--- a/tests/lib/utilities.sh
31
+++ b/tests/lib/utilities.sh
32
@@ -59,4 +59,4 @@ mac_to_ipv6() {
33
59
  mac=${mac#*:*:}
59
  mac=${mac#*:*:}
34
60
  ipv6_address=$ipv6_address${mac%:*}${mac##*:}
60
  ipv6_address=$ipv6_address${mac%:*}${mac##*:}
35
61
  echo $ipv6_address
61
  echo $ipv6_address
36
62
}
37
63
\ No newline at end of file
62
\ No newline at end of file
38
63
}
39
diff --git a/tests/main/can-exec-iptables/task.yaml b/tests/main/can-exec-iptables/task.yaml
40
64
new file mode 100644
64
new file mode 100644
41
index 0000000..878df5d
42
--- /dev/null
43
+++ b/tests/main/can-exec-iptables/task.yaml
44
@@ -0,0 +1,10 @@
45
1
summary: Verify the NetworkManager snap is allowed to modify the iptables firewall configuration
46
2
47
3
execute: |
48
4
    # Running a simple command in the runtime environment of our service
49
5
    # binary will tell us if we're allowed to execute the iptables binary
50
6
    # from the core snap or not.
51
7
    snap run --shell network-manager.networkmanager <<EOF
52
8
    set -ex
53
9
    /sbin/iptables -L
54
10
    EOF
55
diff --git a/tests/main/installation/task.yaml b/tests/main/installation/task.yaml
56
index 2f1fe97..0dc8cf8 100644
57
--- a/tests/main/installation/task.yaml
58
+++ b/tests/main/installation/task.yaml
59
@@ -12,4 +12,6 @@ execute: |
60
12
    # Ensure all necessary plugs/slots are connected
12
    # Ensure all necessary plugs/slots are connected
61
13
    snap interfaces | grep -Pzq ":network-setup-observe +network-manager"
13
    snap interfaces | grep -Pzq ":network-setup-observe +network-manager"
62
14
    snap interfaces | grep -Pzq ":ppp +network-manager"
14
    snap interfaces | grep -Pzq ":ppp +network-manager"
63
15
    snap interfaces | grep -Pzq ":firewall-control +network-manager"
64
16
    snap interfaces | grep -Pzq ":network-setup-observe +network-manager"
65
15
    snap interfaces | grep -Pzq "network-manager:service +network-manager:nmcli"
17
    snap interfaces | grep -Pzq "network-manager:service +network-manager:nmcli"
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2017-03-16
Approved revision:	1b168b391c2b34cc67c7dd66772736107f4bbce4
Merged at revision:	7b1a6ace4f57913689b21832919bbea75bb34bf5
Proposed branch:	~morphis/snappy-hwe-snaps/+git/network-manager:f/add-firewall-control-iface
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	65 lines (+17/-2) 5 files modified snapcraft.yaml (+1/-1) tests/lib/prepare.sh (+3/-0) tests/lib/utilities.sh (+1/-1) tests/main/can-exec-iptables/task.yaml (+10/-0) tests/main/installation/task.yaml (+2/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2017-03-16	Approve on 2017-03-16
Alfonso Sanchez-Beato			Approve on 2017-03-16
Review via email: mp+320021@code.launchpad.net