Merge ~morphis/snappy-hwe-snaps/+git/wpa-supplicant:f/add-connect-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/wpa-supplicant:master

[Simon Fels]

Add test cases to verify open/secured connections

[Matteo Croce (teknoraver)]

review: Approve

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

PASSED: Continuous integration, rev:37f220ae00c83c941f8c1349069cfac1337d87a4
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1367/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/636
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1275/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1268
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/286/console

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

review: Approve (continuous-integration)

diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index dcca1a5..eb4e2ea 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -29,3 +29,7 @@ install_snap_under_test() {
 		done
 	fi
 }
+
+is_snap_installed() {
+	snap list | grep -q $1
+}
diff --git a/tests/main/sta-connect-open/task.yaml b/tests/main/sta-connect-open/task.yaml
new file mode 100644
index 0000000..27e2778
--- /dev/null
+++ b/tests/main/sta-connect-open/task.yaml
@@ -0,0 +1,51 @@
+summary: Verify that a connection to an open WiFi network is possible
+
+environment:
+  WIFI_SSID: Ubuntu
+
+restore: |
+    if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+      rmmod mac80211_hwsim
+    fi
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+      # Get two connected wifi network interfaces wlan0 and wlan1 and
+      # give the system soem time to settle
+      modprobe mac80211_hwsim radios=2
+      sleep 1
+    fi
+
+    if ! is_snap_installed network-manager ; then
+      snap install --edge network-manager
+      snap connect network-manager:wpa wpa-supplicant:service
+      wait_for_systemd_service snap.network-manager.networkmanager
+    fi
+
+    if ! is_snap_installed wifi-ap ; then
+      snap install wifi-ap
+      # FIXME: until the wifi-ap utility is clever enough to retry
+      # connecting with the service we need to add a short sleep here
+      sleep 0.5
+    fi
+
+    # Setup the access point with no security
+    /snap/bin/wifi-ap.config set \
+      wifi.interface=$HW_WLAN0_NAME \
+      wifi.ssid=$WIFI_SSID \
+      disabled=false
+
+    # AP needs a bit to appear and be visible for NetworkManager
+    /snap/bin/nmcli d wifi rescan
+    while ! /snap/bin/nmcli d wifi | grep Ubuntu ; do
+        /snap/bin/nmcli d wifi rescan
+        sleep 1
+    done
+
+    /snap/bin/nmcli d wifi | grep $WIFI_SSID
+
+    # Connect to the AP and ensure the connection was established
+    /snap/bin/nmcli d wifi connect $WIFI_SSID
+    /snap/bin/nmcli d | grep "$HW_WLAN1_NAME.*connected"
diff --git a/tests/main/sta-connect-wpa2/task.yaml b/tests/main/sta-connect-wpa2/task.yaml
new file mode 100644
index 0000000..4a557ac
--- /dev/null
+++ b/tests/main/sta-connect-wpa2/task.yaml
@@ -0,0 +1,54 @@
+summary: Verify that a connection to an WPA2-PSK secured WiFi network is possible
+
+environment:
+  WIFI_SSID: Ubuntu
+  WIFI_PASSPHRASE: Test1234
+
+restore: |
+    if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+      rmmod mac80211_hwsim
+    fi
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    if [ "$SPREAD_SYSTEM" = "ubuntu-core-16" ]; then
+      # Get two connected wifi network interfaces wlan0 and wlan1 and
+      # give the system soem time to settle
+      modprobe mac80211_hwsim radios=2
+      sleep 1
+    fi
+
+    if ! is_snap_installed network-manager ; then
+      snap install --edge network-manager
+      snap connect network-manager:wpa wpa-supplicant:service
+      wait_for_systemd_service snap.network-manager.networkmanager
+    fi
+
+    if ! is_snap_installed wifi-ap ; then
+      snap install wifi-ap
+      # FIXME: until the wifi-ap utility is clever enough to retry
+      # connecting with the service we need to add a short sleep here
+      sleep 0.5
+    fi
+
+    # Setup the access point with no security
+    /snap/bin/wifi-ap.config set \
+        wifi.interface=$HW_WLAN0_NAME \
+        wifi.ssid=$WIFI_SSID \
+        wifi.security=wpa2 \
+        wifi.security-passphrase=$WIFI_PASSPHRASE \
+        disabled=false
+
+    # AP needs a bit to appear and be visible for NetworkManager
+    /snap/bin/nmcli d wifi rescan
+    while ! /snap/bin/nmcli d wifi | grep Ubuntu ; do
+        /snap/bin/nmcli d wifi rescan
+        sleep 1
+    done
+
+    /snap/bin/nmcli d wifi | grep $WIFI_SSID
+
+    # Connect to the AP and ensure the connection was established
+    /snap/bin/nmcli d wifi connect $WIFI_SSID password $WIFI_PASSPHRASE
+    /snap/bin/nmcli d | grep "$HW_WLAN1_NAME.*connected"