Merge pull request #7812 from mikaleppanen/greentea_def_interf

Update greentea tests to use default interface

Author: Cruz Monrreal

TESTS/netsocket/dns/main.cpp

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-#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
 
@@ -27,8 +29,6 @@
 #include "EventQueue.h"
 #include "dns_tests.h"
 
-#include MBED_CONF_APP_HEADER_FILE
-
 using namespace utest::v1;
 
 namespace {
@@ -116,12 +116,10 @@ static void net_bringup()
 {
     MBED_ASSERT(MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_NSAPI_DNS_CACHE_SIZE && MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_APP_DNS_SIMULT_QUERIES + 1);
 
-    net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
-    int err =  MBED_CONF_APP_CONNECT_STATEMENT;
-    TEST_ASSERT_EQUAL(0, err);
-
-    printf("MBED: Connected to network\n");
-    printf("MBED: IP Address: %s\n", net->get_ip_address());
+    net = NetworkInterface::get_default_instance();
+    nsapi_error_t err = net->connect();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
+    printf("MBED: IP address is '%s'\n", net->get_ip_address());
 }
 
 // Test setup

TESTS/netsocket/tcp/main.cpp

@@ -15,12 +15,16 @@
  * limitations under the License.
  */
 
-#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
+#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
+#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
+#endif
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest.h"
@@ -57,8 +61,8 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
 
 static void _ifup()
 {
-    net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
-    nsapi_error_t err = MBED_CONF_APP_CONNECT_STATEMENT;
+    net = NetworkInterface::get_default_instance();
+    nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     printf("MBED: TCPClient IP address is '%s'\n", net->get_ip_address());
 }

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "tcp_tests.h"
 #include "TCPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_open_limit.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "tcp_tests.h"
 #include "TCPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/main.cpp

@@ -15,12 +15,16 @@
  * limitations under the License.
  */
 
-#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
+#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
+#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
+#endif
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest.h"
@@ -40,8 +44,8 @@ NetworkInterface *get_interface()
 
 static void _ifup()
 {
-    net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
-    nsapi_error_t err = MBED_CONF_APP_CONNECT_STATEMENT;
+    net = NetworkInterface::get_default_instance();
+    nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     printf("MBED: UDPClient IP address is '%s'\n", net->get_ip_address());
 }

TESTS/netsocket/udp/udpsocket_echotest.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_echotest_burst.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "udp_tests.h"
 #include "UDPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_open_limit.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "udp_tests.h"
 #include "UDPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_recv_timeout.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_invalid.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_timeout.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "UDPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/network/emac/README.md

@@ -8,7 +8,34 @@ To configure a device to be a CTP echo server, you need to enable the `echo-serv
 
 ## Other configuration options
 
-Default configuration files included with tests are configured for ethernet. For Wi-Fi, set `test-ethernet` to 0 and `test-wifi` to 1. You also need to configure Wi-Fi SSID and security options to the configuration file. 
+Targets with connectivity set the target.network-default-interface-type configuration variable appropriately, either to their only interface or their most-commonly-used one. For targets that provide more than one type of connectivity, you may choose the default by overriding the target.network-default-interface-type configuration variable.
+
+For Ethernet, if you want to overrride the default, set the `json` configuration to:
+
+```
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "ETHERNET",
+            "nsapi.default-stack": "TEST"
+        }
+    }
+```
+
+For Wi-Fi set the `json` configuration to:
+
+```
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
+            "nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
+            "nsapi.default-wifi-security": "WIFI_SECURITY",
+            "nsapi.default-stack": "TEST"
+        }
+    }
+```
+
+For Wi-Fi you also need to configure Wi-Fi SSID and security options to the configuration file. 
 
 ## Example commands
 

TESTS/network/emac/emac_TestMemoryManager.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if MBED_CONF_APP_TEST_WIFI || MBED_CONF_APP_TEST_ETHERNET
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
@@ -556,4 +554,3 @@ EmacTestMemoryManager &EmacTestMemoryManager::get_instance()
     return test_memory_manager;
 }
 
-#endif

TESTS/network/emac/emac_TestMemoryManager.h

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if MBED_CONF_APP_TEST_WIFI || MBED_CONF_APP_TEST_ETHERNET
-
 #ifndef EMAC_TEST_MEMORY_MANAGER_H
 #define EMAC_TEST_MEMORY_MANAGER_H
 
@@ -115,7 +113,7 @@ class EmacTestMemoryManager : public EMACMemoryManager {
      * If memory buffer is chained must point to the start of the chain. Frees all buffers
      * from the chained list.
      *
-     * @param mem      Memory buffer chain to be freed.
+     * @param buf      Memory buffer chain to be freed.
      */
     virtual void free(emac_mem_buf_t *buf);
 
@@ -124,7 +122,7 @@ class EmacTestMemoryManager : public EMACMemoryManager {
      *
      * Returns a total length of this buffer and any following buffers in the chain.
      *
-     * @param mem      Memory buffer chain
+     * @param buf      Memory buffer chain
      * @return         Total length in bytes
      */
     virtual uint32_t get_total_len(const emac_mem_buf_t *buf) const;
@@ -157,23 +155,23 @@ class EmacTestMemoryManager : public EMACMemoryManager {
      *
      * Returns the next buffer from the memory buffer chain.
      *
-     * @param mem      Memory buffer
+     * @param buf      Memory buffer
      * @return         The next memory buffer, or NULL if last
      */
     virtual emac_mem_buf_t *get_next(const emac_mem_buf_t *buf) const;
 
     /**
      * Return pointer to the payload of the buffer
      *
-     * @param mem      Memory buffer
+     * @param buf      Memory buffer
      * @return         Pointer to the payload
      */
     virtual void *get_ptr(const emac_mem_buf_t *buf) const;
 
     /**
      * Return payload size of the buffer
      *
-     * @param mem      Memory buffer
+     * @param buf      Memory buffer
      * @return         Size in bytes
      */
     virtual uint32_t get_len(const emac_mem_buf_t *buf) const;
@@ -184,7 +182,7 @@ class EmacTestMemoryManager : public EMACMemoryManager {
      * The allocated payload size will not change. It is not permitted
      * to change the length of a buffer that is not the first (or only) in a chain.
      *
-     * @param mem      Memory buffer
+     * @param buf      Memory buffer
      * @param len      Payload size, must be less or equal allocated size
      */
     virtual void set_len(emac_mem_buf_t *buf, uint32_t len);
@@ -229,4 +227,3 @@ class EmacTestMemoryManager : public EMACMemoryManager {
 };
 
 #endif /* EMAC_TEST_MEMORY_MANAGER_H */
-#endif

TESTS/network/emac/emac_TestNetworkStack.cpp

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#if MBED_CONF_APP_TEST_WIFI || MBED_CONF_APP_TEST_ETHERNET
-
 #include "unity.h"
 
 #include "EMACMemoryManager.h"
@@ -205,5 +203,3 @@ OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
     return EmacTestNetworkStack::get_instance();
 }
 #endif
-
-#endif