Update netsocket header and source reference in other libraries

rajkan01 · rajkan01 · commit 44dc633d5ada · 2020-07-22T07:05:52.000-07:00
diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
@@ -112,7 +112,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/stubs"
   "${PROJECT_SOURCE_DIR}/.."
   "${PROJECT_SOURCE_DIR}/../features"
-  "${PROJECT_SOURCE_DIR}/../features/netsocket"
   "${PROJECT_SOURCE_DIR}/../platform"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
@@ -128,6 +127,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
+  "${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/fat"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/fat/ChaN"
   "${PROJECT_SOURCE_DIR}/../features/filesystem/bd"
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/cellular/framework/device
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellulardevice/unittest.cmake
@@ -12,7 +12,7 @@ set(unittest-includes ${unittest-includes}
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
   ../drivers
   ../hal
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp
@@ -24,7 +24,7 @@
 #include "FileHandle_stub.h"
 #include "CellularLog.h"
 #include "ATHandler_stub.h"
-#include "SocketAddress.h"
+#include "netsocket/SocketAddress.h"
 #include "CellularDevice_stub.h"
 #include "AT_CellularDevice_stub.h"
 #include "myCellularDevice.h"
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
@@ -20,7 +20,7 @@ set(unittest-sources
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
   ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
-  ../features/netsocket/SocketAddress.cpp
+  ../connectivity/netsocket/source/SocketAddress.cpp
 )
 
 # Test files
diff --git a/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake
@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
     /features/cellular/framework/device/cellulardevice
   ../features/cellular/framework/device
   ../features/cellular/framework/common
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
@@ -19,7 +19,7 @@ set(unittest-sources
   ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
   ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
   ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
-  ../features/netsocket/SocketAddress.cpp
+  ../connectivity/netsocket/source/SocketAddress.cpp
 )
 
 # Test files
diff --git a/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
     /features/cellular/framework/device/cellulardevice
   ../features/cellular/framework/device
   ../features/cellular/framework/common
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/features/cellular/framework/device/cellularstatemachine/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellularstatemachine/unittest.cmake
@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
     /features/cellular/framework/device/cellularstatemachine
   ../features/cellular/framework/device
   ../features/cellular/framework/common
-  ../features/netsocket/cellular
+  ../features/cellular
 )
 
 # Source files
diff --git a/UNITTESTS/stubs/ATHandler_stub.cpp b/UNITTESTS/stubs/ATHandler_stub.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <ctype.h>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 #include "events/EventQueue.h"
 #include "ATHandler_stub.h"
 
diff --git a/UNITTESTS/stubs/ATHandler_stub.h b/UNITTESTS/stubs/ATHandler_stub.h
@@ -18,7 +18,7 @@
 #include "stdint.h"
 #include "stdbool.h"
 #include <cstddef>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 #include "ATHandler.h"
 #include "FileHandle_stub.h"
 #include "Callback.h"
diff --git a/UNITTESTS/stubs/AT_CellularInformation_stub.cpp b/UNITTESTS/stubs/AT_CellularInformation_stub.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "AT_CellularInformation.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 using namespace mbed;
 
diff --git a/UNITTESTS/stubs/AT_CellularNetwork_stub.cpp b/UNITTESTS/stubs/AT_CellularNetwork_stub.cpp
@@ -20,7 +20,7 @@
 #include "CellularUtil.h"
 #include "CellularLog.h"
 #include "FileHandle.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 using namespace mbed;
 using namespace mbed_cellular_util;
diff --git a/UNITTESTS/stubs/CellularInterface_stub.cpp b/UNITTESTS/stubs/CellularInterface_stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "CellularInterface.h"
+#include "netsocket/CellularInterface.h"
 
 MBED_WEAK CellularInterface *CellularInterface::get_target_default_instance()
 {
diff --git a/UNITTESTS/stubs/ControlPlane_netif_stub.h b/UNITTESTS/stubs/ControlPlane_netif_stub.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "ControlPlane_netif.h"
+#include "netsocket/ControlPlane_netif.h"
 #include <list>
 
 namespace mbed {
diff --git a/UNITTESTS/stubs/EMAC_mock.h b/UNITTESTS/stubs/EMAC_mock.h
@@ -20,7 +20,7 @@
 
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "features/netsocket/EMAC.h"
+#include "netsocket/EMAC.h"
 
 class MockEMAC : public EMAC {
 public:
diff --git a/UNITTESTS/stubs/MeshInterface_stub.cpp b/UNITTESTS/stubs/MeshInterface_stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "MeshInterface.h"
+#include "netsocket/MeshInterface.h"
 
 MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
 {
diff --git a/UNITTESTS/stubs/NetworkInterfaceDefaults_stub.cpp b/UNITTESTS/stubs/NetworkInterfaceDefaults_stub.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 #include "netsocket/NetworkInterface.h"
-#include "WiFiInterface.h"
-#include "CellularInterface.h"
-#include "MeshInterface.h"
+#include "netsocket/WiFiInterface.h"
+#include "netsocket/CellularInterface.h"
+#include "netsocket/MeshInterface.h"
 
 MBED_WEAK WiFiInterface *WiFiInterface::get_default_instance()
 {
diff --git a/UNITTESTS/stubs/NetworkStack_stub.cpp b/UNITTESTS/stubs/NetworkStack_stub.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include "NetworkStack.h"
-#include "nsapi_dns.h"
+#include "netsocket/NetworkStack.h"
+#include "netsocket/nsapi_dns.h"
 #include "mbed.h"
 #include "stddef.h"
 #include <new>
diff --git a/UNITTESTS/stubs/SocketAddress_stub.cpp b/UNITTESTS/stubs/SocketAddress_stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "SocketAddress.h"
+#include "netsocket/SocketAddress.h"
 
 
 SocketAddress::SocketAddress(const nsapi_addr_t &addr, uint16_t port)
diff --git a/UNITTESTS/stubs/SocketStats_Stub.cpp b/UNITTESTS/stubs/SocketStats_Stub.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "SocketStats.h"
+#include "netsocket/SocketStats.h"
 
 #if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
 int SocketStats::get_entry_position(const Socket *const reference_id)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}`
`9`	`9`	`../features/cellular/framework/common`
`10`	`10`	`../features/cellular/framework/AT`
`11`	`11`	`../features/cellular/framework/device`
`12`		`- ../features/netsocket/cellular`
	`12`	`+ ../features/cellular`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`# Source files`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ set(unittest-includes ${unittest-includes}`
`12`	`12`	`../features/frameworks/mbed-client-randlib/mbed-client-randlib`
`13`	`13`	`../drivers`
`14`	`14`	`../hal`
`15`		`- ../features/netsocket/cellular`
	`15`	`+ ../features/cellular`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`# Source files`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}`
`8`	`8`	`/features/cellular/framework/device/cellulardevice`
`9`	`9`	`../features/cellular/framework/device`
`10`	`10`	`../features/cellular/framework/common`
`11`		`- ../features/netsocket/cellular`
	`11`	`+ ../features/cellular`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`# Source files`