From 1209e73e0c4d25766e6b87e00ec16368dda53a8d Mon Sep 17 00:00:00 2001
From: Jarno Lamsa <jarno.lamsa@arm.com>
Date: Wed, 29 Aug 2018 10:49:37 +0300
Subject: [PATCH] Fix issues coming from network default interface

---
 TEST_APPS/device/socket_app/cmd_ifconfig.cpp |  9 ++--
 TEST_APPS/readme.md                          | 48 ++++++--------------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/TEST_APPS/device/socket_app/cmd_ifconfig.cpp b/TEST_APPS/device/socket_app/cmd_ifconfig.cpp
index 4973b3cbbb..cb55e3bedf 100644
--- a/TEST_APPS/device/socket_app/cmd_ifconfig.cpp
+++ b/TEST_APPS/device/socket_app/cmd_ifconfig.cpp
@@ -21,12 +21,13 @@
 
 #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.
 #endif
 
 #include <string.h>
-#include MBED_CONF_APP_HEADER_FILE
 
 #define TRACE_GROUP "Aifc"
 
@@ -86,9 +87,9 @@ int cmd_ifconfig(int argc, char *argv[])
 int cmd_ifup(int argc, char *argv[])
 {
     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) {
         return CMDLINE_RETCODE_FAIL;
     }
diff --git a/TEST_APPS/readme.md b/TEST_APPS/readme.md
index db68e4f8ac..9f37ef05c2 100644
--- a/TEST_APPS/readme.md
+++ b/TEST_APPS/readme.md
@@ -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. 
 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.
+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
 
@@ -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.
 
 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:
-`>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
 
 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.
-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.
+The information can be provided in the used test-config -file.
 
-Example of separate macros:
+Example of access point information:
 ```
-        "wifi-ssid": {
-            "help": "WiFi SSID",
-            "value": "\"ssid\"",
-			"macro_name": "WIFI_SSID"
-        },
-        "wifi-password": {
-            "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)"
-        },
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"ssid\"",
+            "nsapi.default-wifi-password": "\"password\"",
+            "nsapi.default-wifi-security": "WPA_WPA2"
+        }
+    }
 ```
 
 ### Test results