Merge ~teknoraver/snappy-hwe-snaps/+git/wifi-ap:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Matteo Croce]

Bugfixes in ap.sh and improvements in hostapd configuration.

spawn hostapd in foreground instead to start it in background and wait for its pid

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

PASSED: Continuous integration, rev:1e006a4c9441b0c44098b9d2ebf9f8128b9690cf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/229/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/131/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

PASSED: Continuous integration, rev:df228f9d631e974fc26df0e57b1d158cb7a3d9c7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/232/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/134/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

Also discussed with Matteo that he will add spread tests to verify both the UTF-8 SSID's and the WMM settings.

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

PASSED: Continuous integration, rev:d97cb7d48058a13fa721f2c8d583e7a28006787c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/265/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/167/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:c7aed98884e904386f0258a44e9ad13c69e83282
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/268/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/170/console

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

review: Approve (continuous-integration)

[Matteo Croce (teknoraver)]

review: Approve

[Simon Fels (morphis)]

Small comments inline otherwise LGTM

review: Needs Fixing

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

PASSED: Continuous integration, rev:4e6e06470c9dece16a06193618d728e0e32bc59b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/269/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/171/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Approve

diff --git a/bin/ap.sh b/bin/ap.sh
index 3dcb93d..1e91822 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -39,7 +39,7 @@ if ! ifconfig $WIFI_INTERFACE ; then
 fi
 
 cleanup_on_exit() {
-	DNSMASQ_PID=$(cat $SNAP_DATA/dnsmasq.pid)
+	read DNSMASQ_PID <$SNAP_DATA/dnsmasq.pid
 	# If dnsmasq is already gone don't error out here
 	kill -TERM $DNSMASQ_PID || true
 	wait $DNSMASQ_PID
@@ -60,7 +60,7 @@ cleanup_on_exit() {
 		$SNAP/bin/iw dev $iface del
 	fi
 
-	if [ is_nm_running ] ; then
+	if is_nm_running ; then
 		# Hand interface back to network-manager. This will also trigger the
 		# auto connection process inside network-manager to get connected
 		# with the previous network.
@@ -100,7 +100,7 @@ if [ "$WIFI_INTERFACE_MODE" = "direct" ] ; then
 fi
 
 
-if [ is_nm_running ] ; then
+if is_nm_running ; then
 	# Prevent network-manager from touching the interface we want to use. If
 	# network-manager was configured to use the interface its nothing we want
 	# to prevent here as this is how the user configured the system.
@@ -117,7 +117,7 @@ if [ $? -ne 0 ] ; then
 		$SNAP/bin/iw dev $iface del
 	fi
 
-	if [ is_nm_running ] ; then
+	if is_nm_running ; then
 		# Hand interface back to network-manager. This will also trigger the
 		# auto connection process inside network-manager to get connected
 		# with the previous network.
@@ -153,21 +153,45 @@ driver=$driver
 channel=$WIFI_CHANNEL
 macaddr_acl=0
 ignore_broadcast_ssid=0
-wmm_enabled=1
 ieee80211n=1
 ssid=$WIFI_SSID
+auth_algs=1
+utf8_ssid=1
 hw_mode=$WIFI_OPERATION_MODE
+
+# The wmm_* options are needed to enable AMPDU
+# and get decent 802.11n throughput
+wmm_enabled=1
+wmm_enabled=1
+wmm_ac_bk_cwmin=4
+wmm_ac_bk_cwmax=10
+wmm_ac_bk_aifs=7
+wmm_ac_bk_txop_limit=0
+wmm_ac_bk_acm=0
+wmm_ac_be_aifs=3
+wmm_ac_be_cwmin=4
+wmm_ac_be_cwmax=10
+wmm_ac_be_txop_limit=0
+wmm_ac_be_acm=0
+wmm_ac_vi_aifs=2
+wmm_ac_vi_cwmin=3
+wmm_ac_vi_cwmax=4
+wmm_ac_vi_txop_limit=94
+wmm_ac_vi_acm=0
+wmm_ac_vo_aifs=2
+wmm_ac_vo_cwmin=2
+wmm_ac_vo_cwmax=3
+wmm_ac_vo_txop_limit=47
+wmm_ac_vo_acm=0
 EOF
 
 case "$WIFI_SECURITY" in
 	open)
 		cat <<-EOF >> $SNAP_DATA/hostapd.conf
-		auth_algs=1
 		EOF
 		;;
 	wpa2)
 		cat <<-EOF >> $SNAP_DATA/hostapd.conf
-		auth_algs=3
 		wpa=2
 		wpa_key_mgmt=WPA-PSK
 		wpa_passphrase=$WIFI_SECURITY_PASSPHRASE
@@ -196,18 +220,6 @@ case "$WIFI_HOSTAPD_DRIVER" in
 esac
 
 # Startup hostapd with the configuration we've put in place
-$hostapd $EXTRA_ARGS $SNAP_DATA/hostapd.conf &
-HOSTAPD_PID=$!
-
-trap exit_handler EXIT
-function exit_handler() {
-	kill -TERM $HOSTAPD_PID
-	# Wait until hostapd is correctly terminated before we continue
-	# doing anything
-	wait $HOSTAPD_PID
-	cleanup_on_exit
-	exit 0
-}
-
-wait $HOSTAPD_PID
+$hostapd $EXTRA_ARGS $SNAP_DATA/hostapd.conf
 cleanup_on_exit
+exit 0
diff --git a/tests/main/default-conf-brings-up-ap/task.yaml b/tests/main/default-conf-brings-up-ap/task.yaml
index 349e7f4..d787a39 100644
--- a/tests/main/default-conf-brings-up-ap/task.yaml
+++ b/tests/main/default-conf-brings-up-ap/task.yaml
@@ -17,8 +17,6 @@ execute: |
     done
 
     snap install wireless-tools
-    # FIXME: Can be dropped once we have a snap-declaration for this in place
-    snap connect wireless-tools:network-control core:network-control
 
     # Scan for existing WiFi networks and ensure our 'Ubuntu' one is part
     # of the result
@@ -26,11 +24,11 @@ execute: |
     wireless-tools.iw dev wlan1 scan | grep 'SSID: Ubuntu'
     wireless-tools.iw dev wlan1 scan | grep 'primary channel: 6'
     # There should be only a single network
-    network_count=`wireless-tools.iw dev wlan1 scan | grep 'SSID: Ubuntu' | wc -l`
+    network_count=`wireless-tools.iw dev wlan1 scan | grep -c 'SSID: Ubuntu'`
     test $network_count -eq 1
     # The AP should not be secured by default
-    test ! `wireless-tools.iw dev wlan1 scan | grep 'WPA:'`
-    test ! `wireless-tools.iw dev wlan1 scan | grep 'RSN:'`
+    ! wireless-tools.iw dev wlan1 scan | grep 'WPA:'
+    ! wireless-tools.iw dev wlan1 scan | grep 'RSN:'
 
     # Verify we can associate with the AP
     wireless-tools.iw wlan1 connect Ubuntu
@@ -39,6 +37,6 @@ execute: |
     # And we should get an IP address assigned over DHCP
     dhclient wlan1
     # IP Address and routing needs to be correct
-    ifconfig wlan1 | grep 'inet addr:10.0.60'
-    ip route | grep '10.0.60.0/24 dev wlan1'
-    ip route | grep 'default via 10.0.60.1 dev wlan1'
+    ifconfig wlan1 | fgrep 'inet addr:10.0.60.1'
+    ip route | fgrep '10.0.60.0/24 dev wlan1'
+    ip route | fgrep 'default via 10.0.60.1 dev wlan1'
diff --git a/tests/main/utf8-ssid/task.yaml b/tests/main/utf8-ssid/task.yaml
new file mode 100644
index 0000000..b1ae11b
--- /dev/null
+++ b/tests/main/utf8-ssid/task.yaml
@@ -0,0 +1,34 @@
+summary: Verify that the AP can accept an UTF8 SSID
+
+prepare: |
+    # Simulate two WiFi radio network interfaces
+    modprobe mac80211_hwsim radios=2
+
+restore: |
+    rmmod mac80211_hwsim
+
+execute: |
+    # Default configuration will use wlan0 which we just created
+    wifi-ap.config set disabled 0
+    wifi-ap.config set wifi.ssid 'Ubuntu👍'
+
+    systemctl restart snap.wifi-ap.backend
+    while ! systemctl status snap.wifi-ap.backend ; do
+        sleep 1
+    done
+
+    snap install wireless-tools
+
+    # Scan for existing WiFi networks and ensure our 'Ubuntu' one is part
+    # of the result
+    ifconfig wlan1 up
+    wireless-tools.iw dev wlan1 scan | fgrep 'SSID: Ubuntu\xf0\x9f\x91\x8d'
+
+    # There should be only a single network
+    network_count=`wireless-tools.iw dev wlan1 scan | fgrep -c 'SSID: Ubuntu\xf0\x9f\x91\x8d'`
+    test $network_count -eq 1
+
+    # Verify we can associate with the AP
+    wireless-tools.iw wlan1 connect 'Ubuntu👍'
+    wireless-tools.iw dev wlan1 link | fgrep 'SSID: Ubuntu\xf0\x9f\x91\x8d'
+