Skip to content

Commit 044d0c9

Browse files
author
Cruz Monrreal
authored
Merge pull request #9778 from michalpasztamobica/add_missing_wifi_config_params
Add missing wifi parameters to test configs
2 parents 4532e41 + 42404be commit 044d0c9

File tree

6 files changed

+178
-43
lines changed

6 files changed

+178
-43
lines changed

‎TESTS/netsocket/tls/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#error [NOT_SUPPORTED] No network configuration found for this target.
2222
#endif
2323
#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
24-
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
24+
#error [NOT_SUPPORTED] Requires echo-server-discard-port parameter from mbed_app.json
2525
#endif
2626

2727
#include "mbed.h"

‎features/netsocket/mbed_lib.json‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,42 @@
22
"name": "nsapi",
33
"config": {
44
"present": 1,
5-
"default-stack": "LWIP",
6-
"default-wifi-ssid": null,
7-
"default-wifi-password": null,
8-
"default-wifi-security": "NONE",
9-
"default-cellular-plmn": null,
10-
"default-cellular-sim-pin": null,
11-
"default-cellular-apn": null,
12-
"default-cellular-username": null,
13-
"default-cellular-password": null,
5+
"default-stack": {
6+
"help" : "Default stack to be used, valid values: LWIP, NANOSTACK.",
7+
"value" : "LWIP"
8+
},
9+
"default-wifi-ssid" : {
10+
"help" : "Default Wi-Fi SSID.",
11+
"value": null
12+
},
13+
"default-wifi-password" : {
14+
"help" : "Password for the default Wi-Fi network.",
15+
"value": null
16+
},
17+
"default-wifi-security" : {
18+
"help" : "Wi-Fi security protocol, valid values are WEP, WPA, WPA2, WPA/WPA2.",
19+
"value" : "NONE"
20+
},
21+
"default-cellular-plmn" : {
22+
"help" : "Default Public Land Mobile Network for cellular connection.",
23+
"value": null
24+
},
25+
"default-cellular-sim-pin" : {
26+
"help" : "PIN for the default SIM card.",
27+
"value": null
28+
},
29+
"default-cellular-apn" : {
30+
"help" : "Default cellular Access Point Name.",
31+
"value": null
32+
},
33+
"default-cellular-username" : {
34+
"help" : "Username for the default cellular network.",
35+
"value": null
36+
},
37+
"default-cellular-password" : {
38+
"help" : "Password for the default cellular network.",
39+
"value": null
40+
},
1441
"default-mesh-type": {
1542
"help": "Configuration type for MeshInterface::get_default_instance(). [LOWPAN/THREAD]",
1643
"value": "THREAD"

‎tools/test_configs/ESP8266Interface.json‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
11
{
22
"config": {
3+
"wifi-secure-ssid": {
4+
"help": "Wi-Fi SSID for WPA2 secured network",
5+
"value": "\"WIFI_SSID_SECURED\""
6+
},
7+
"wifi-unsecure-ssid": {
8+
"help": "Wi-Fi SSID for unsecure netwrok",
9+
"value": "\"WIFI_SSID_UNSECURE\""
10+
},
11+
"wifi-password": {
12+
"help": "Wi-Fi Password",
13+
"value": "\"WIFI_PASSWORD\""
14+
},
15+
"wifi-secure-protocol": {
16+
"help": "Wi-Fi security protocol, valid values are WEP, WPA, WPA2, WPA_WPA2",
17+
"value": "\"WPA2\""
18+
},
19+
"wifi-ch-secure": {
20+
"help": "Channel number of secure SSID",
21+
"value": null
22+
},
23+
"wifi-ch-unsecure": {
24+
"help": "Channel number of unsecure SSID",
25+
"value": null
26+
},
27+
"ap-mac-secure": {
28+
"help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF",
29+
"value": "\"AA:AA:AA:AA:AA:AA\""
30+
},
31+
"ap-mac-unsecure": {
32+
"help": "BSSID of unsecure AP in form of \"AA:BB:CC:DD:EE:FF\"",
33+
"value": "\"BB:BB:BB:BB:BB:BB\""
34+
},
35+
"max-scan-size": {
36+
"help": "How many networks may appear in Wifi scan result",
37+
"value": 10
38+
},
339
"echo-server-addr" : {
440
"help" : "IP address of echo server",
541
"value" : "\"echo.mbedcloudtesting.com\""
@@ -26,7 +62,7 @@
2662
"target.network-default-interface-type": "WIFI",
2763
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
2864
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
29-
"nsapi.default-wifi-security": "WIFI_SECURITY",
65+
"nsapi.default-wifi-security": "WPA2",
3066
"esp8266.provide-default": true
3167
}
3268
}

‎tools/test_configs/HeapBlockDeviceAndWifiInterface.json‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
11
{
22
"config": {
3+
"wifi-secure-ssid": {
4+
"help": "Wi-Fi SSID for WPA2 secured network",
5+
"value": "\"WIFI_SSID_SECURED\""
6+
},
7+
"wifi-unsecure-ssid": {
8+
"help": "Wi-Fi SSID for unsecure netwrok",
9+
"value": "\"WIFI_SSID_UNSECURE\""
10+
},
11+
"wifi-password": {
12+
"help": "Wi-Fi Password",
13+
"value": "\"WIFI_PASSWORD\""
14+
},
15+
"wifi-secure-protocol": {
16+
"help": "Wi-Fi security protocol, valid values are WEP, WPA, WPA2, WPA_WPA2",
17+
"value": "\"WPA2\""
18+
},
19+
"wifi-ch-secure": {
20+
"help": "Channel number of secure SSID",
21+
"value": null
22+
},
23+
"wifi-ch-unsecure": {
24+
"help": "Channel number of unsecure SSID",
25+
"value": null
26+
},
27+
"ap-mac-secure": {
28+
"help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF",
29+
"value": "\"AA:AA:AA:AA:AA:AA\""
30+
},
31+
"ap-mac-unsecure": {
32+
"help": "BSSID of unsecure AP in form of \"AA:BB:CC:DD:EE:FF\"",
33+
"value": "\"BB:BB:BB:BB:BB:BB\""
34+
},
35+
"max-scan-size": {
36+
"help": "How many networks may appear in Wifi scan result",
37+
"value": 10
38+
},
339
"echo-server-addr" : {
440
"help" : "IP address of echo server",
541
"value" : "\"echo.mbedcloudtesting.com\""
@@ -31,7 +67,7 @@
3167
"target.network-default-interface-type": "WIFI",
3268
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
3369
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
34-
"nsapi.default-wifi-security": "WIFI_SECURITY"
70+
"nsapi.default-wifi-security": "WPA2"
3571
}
3672
}
3773
}

‎tools/test_configs/ISM43362Interface.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,28 @@
11
{
22
"config": {
3-
"echo-server-addr" : {
4-
"help" : "IP address of echo server",
5-
"value" : "\"echo.mbedcloudtesting.com\""
6-
},
7-
"echo-server-port" : {
8-
"help" : "Port of echo server",
9-
"value" : "7"
10-
},
11-
"echo-server-discard-port" : {
12-
"help" : "Discard port of echo server",
13-
"value" : "9"
14-
},
15-
"echo-server-port-tls" : {
16-
"help" : "Port of echo server for TLS",
17-
"value" : "2007"
18-
},
19-
"echo-server-discard-port-tls" : {
20-
"help" : "Discard port of echo server for TLS",
21-
"value" : "2009"
22-
},
233
"wifi-secure-ssid": {
24-
"help": "WiFi SSID for WPA2 secured network",
25-
"value": "\"SSID-SECURE\""
4+
"help": "Wi-Fi SSID for WPA2 secured network",
5+
"value": "\"WIFI_SSID_SECURE\""
266
},
277
"wifi-unsecure-ssid": {
28-
"help": "WiFi SSID for unsecure network",
29-
"value": "\"SSID-UNSECURE\""
8+
"help": "Wi-Fi SSID for unsecure netwrok",
9+
"value": "\"WIFI_SSID_UNSECURE\""
3010
},
3111
"wifi-password": {
32-
"help": "WiFi Password",
33-
"value": "\"PASSWORD\""
12+
"help": "Wi-Fi Password",
13+
"value": "\"WIFI_PASSWORD\""
3414
},
3515
"wifi-secure-protocol": {
36-
"help": "WiFi security protocol, valid values are WEP, WPA, WPA2, WPA/WPA2",
16+
"help": "Wi-Fi security protocol, valid values are WEP, WPA, WPA2, WPA_WPA2",
3717
"value": "\"WPA2\""
3818
},
3919
"wifi-ch-secure": {
4020
"help": "Channel number of secure SSID",
41-
"value": 1
21+
"value": null
4222
},
4323
"wifi-ch-unsecure": {
4424
"help": "Channel number of unsecure SSID",
45-
"value": 2
25+
"value": null
4626
},
4727
"ap-mac-secure": {
4828
"help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF",
@@ -55,6 +35,26 @@
5535
"max-scan-size": {
5636
"help": "How many networks may appear in Wifi scan result",
5737
"value": 10
38+
},
39+
"echo-server-addr" : {
40+
"help" : "IP address of echo server",
41+
"value" : "\"echo.mbedcloudtesting.com\""
42+
},
43+
"echo-server-port" : {
44+
"help" : "Port of echo server",
45+
"value" : "7"
46+
},
47+
"echo-server-discard-port" : {
48+
"help" : "Discard port of echo server",
49+
"value" : "9"
50+
},
51+
"echo-server-port-tls" : {
52+
"help" : "Port of echo server for TLS",
53+
"value" : "2007"
54+
},
55+
"echo-server-discard-port-tls" : {
56+
"help" : "Discard port of echo server for TLS",
57+
"value" : "2009"
5858
}
5959
},
6060
"target_overrides": {
@@ -63,7 +63,7 @@
6363
"target.network-default-interface-type": "WIFI",
6464
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
6565
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
66-
"nsapi.default-wifi-security": "WIFI_SECURITY",
66+
"nsapi.default-wifi-security": "WPA2",
6767
"ism43362.provide-default": true
6868
}
6969
}

‎tools/test_configs/SpwfSAInterface.json‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
11
{
22
"config": {
3+
"wifi-secure-ssid": {
4+
"help": "Wi-Fi SSID for WPA2 secured network",
5+
"value": "\"WIFI_SSID_SECURE\""
6+
},
7+
"wifi-unsecure-ssid": {
8+
"help": "Wi-Fi SSID for unsecure netwrok",
9+
"value": "\"WIFI_SSID_UNSECURE\""
10+
},
11+
"wifi-password": {
12+
"help": "Wi-Fi Password",
13+
"value": "\"WIFI_PASSWORD\""
14+
},
15+
"wifi-secure-protocol": {
16+
"help": "Wi-Fi security protocol, valid values are WEP, WPA, WPA2, WPA_WPA2",
17+
"value": "\"WPA2\""
18+
},
19+
"wifi-ch-secure": {
20+
"help": "Channel number of secure SSID",
21+
"value": null
22+
},
23+
"wifi-ch-unsecure": {
24+
"help": "Channel number of unsecure SSID",
25+
"value": null
26+
},
27+
"ap-mac-secure": {
28+
"help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF",
29+
"value": "\"AA:AA:AA:AA:AA:AA\""
30+
},
31+
"ap-mac-unsecure": {
32+
"help": "BSSID of unsecure AP in form of \"AA:BB:CC:DD:EE:FF\"",
33+
"value": "\"BB:BB:BB:BB:BB:BB\""
34+
},
35+
"max-scan-size": {
36+
"help": "How many networks may appear in Wifi scan result",
37+
"value": 10
38+
},
339
"echo-server-addr" : {
440
"help" : "IP address of echo server",
541
"value" : "\"echo.mbedcloudtesting.com\""
@@ -34,7 +70,7 @@
3470
"target.network-default-interface-type": "WIFI",
3571
"nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
3672
"nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
37-
"nsapi.default-wifi-security": "WIFI_SECURITY",
73+
"nsapi.default-wifi-security": "WPA2",
3874
"idw0xx1.provide-default": true
3975
}
4076
}

0 commit comments

Comments
 (0)