ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix issues coming from network default interface

pull/7745/head
Jarno Lamsa 2018-08-29 10:49:37 +03:00 committed by Olli-Pekka Puolitaival
parent b41d215597
commit 1209e73e0c
2 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TEST_APPS/device/socket_app/cmd_ifconfig.cpp
View File

@ -21,12 +21,13 @@
#include "ip4string.h" #include "ip4string.h"
#ifndef MBED_CONF_APP_CONNECT_STATEMENT #define WIFI 2
#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
#error [NOT_SUPPORTED] No network configuration found for this target. #error [NOT_SUPPORTED] No network configuration found for this target.
#endif #endif
#include <string.h> #include <string.h>
#include MBED_CONF_APP_HEADER_FILE
#define TRACE_GROUP "Aifc" #define TRACE_GROUP "Aifc"
@ -86,9 +87,9 @@ int cmd_ifconfig(int argc, char *argv[])
int cmd_ifup(int argc, char *argv[]) int cmd_ifup(int argc, char *argv[])
{ {
if (!net) { if (!net) {
net = MBED_CONF_APP_OBJECT_CONSTRUCTION; net = NetworkInterface::get_default_instance();
} }
int err = MBED_CONF_APP_CONNECT_STATEMENT; int err = net->connect();
if (err != NSAPI_ERROR_OK) { if (err != NSAPI_ERROR_OK) {
return CMDLINE_RETCODE_FAIL; return CMDLINE_RETCODE_FAIL;
} }

48
TEST_APPS/readme.md
View File

@ -22,6 +22,7 @@ You need Icetea and mbed-cli that supports Icetea, installed.
Depending on a device, there might be a default network interface type defined in the mbed-os/targets/targets.json, which is used to locate a test-config file by default. Depending on a device, there might be a default network interface type defined in the mbed-os/targets/targets.json, which is used to locate a test-config file by default.
If there is not, or you want to use a different interface than the default, you need to provide a relevant test-config -file to the mbed test with --test-config option. If there is not, or you want to use a different interface than the default, you need to provide a relevant test-config -file to the mbed test with --test-config option.
The test-config file contains the necessary information for the test application, there are some test-config files located under mbed-os/tools/test-configs. The test-config file contains the necessary information for the test application, there are some test-config files located under mbed-os/tools/test-configs.
Devices which have their network drivers residing inside mbed-os can use generic test-configs like HeapBlockDeviceAndEthernetInterface.json and HeapBlockDeviceAndWifiInterface.json. Otherwise you need to use a device specific test-config.
### Running the tests ### Running the tests
@ -41,49 +42,26 @@ Some devices may offer multiple network interfaces to operate with. For example,
The tests can be run for either one of those using already existing test-config -files. The tests can be run for either one of those using already existing test-config -files.
To run the tests with Wi-Fi interface: To run the tests with Wi-Fi interface:
`>mbed test -m UBLOX_EVK_ODIN_W2 -t <toolchain> --icetea --test-config tools/test-configs/OdinInterface.json` `>mbed test -m UBLOX_EVK_ODIN_W2 -t <toolchain> --icetea --test-config tools/test-configs/HeapBlockDeviceAndWifiInterface.json.json`
To run the tests with ethernet interface: To run the tests with ethernet interface:
`>mbed test -m UBLOX_EVK_ODIN_W2 -t <toolchain> --icetea --test-config tools/test-configs/Odin_EthernetInterface.json` `>mbed test -m UBLOX_EVK_ODIN_W2 -t <toolchain> --icetea --test-config tools/test-configs/HeapBlockDeviceAndEthernetInterface.json`
#### Providing Wi-Fi access point information #### Providing Wi-Fi access point information
If you are using Wi-Fi interface for running the tests, you need to provide also information about the used access point. If you are using Wi-Fi interface for running the tests, you need to provide also information about the used access point.
The information can be provided in the used test-config -file. Depending on the used interface you might need to provide ssid, password and security. The information can be provided in the used test-config -file.
You can either provide separate WIFI_SSID, WIFI_PASSWORD and WIFI_SECURITY macros, or provide the SSID, password and security in the connect statement provided in the test-config -file.
Example of separate macros: Example of access point information:
``` ```
"wifi-ssid": { "target_overrides": {
"help": "WiFi SSID", "*": {
"value": "\"ssid\"", "target.network-default-interface-type": "WIFI",
"macro_name": "WIFI_SSID" "nsapi.default-wifi-ssid": "\"ssid\"",
}, "nsapi.default-wifi-password": "\"password\"",
"wifi-password": { "nsapi.default-wifi-security": "WPA_WPA2"
"help": "WiFi Password", }
"value": "\"password\"", }
"macro_name": "WIFI_PASSWORD"
},
"wifi-security": {
"help": "WiFi Security, values from nsapi_security from features/netsocket/nsapi_types.h"
"value": "NSAPI_SECURITY_WPA_WPA2"
"macro_name": "WIFI_SECURITY"
```
Example of modifying the connect statement
Original:
```
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
},
```
Modified:
```
"connect-statement" : {
"help" : "Must use 'net' variable name",
"value" : "net->wifiInterface()->connect(\"ssid\", \"password\", NSAPI_SECURITY_WPA_WPA2)"
},
``` ```
### Test results ### Test results