Merge pull request #13335 from rajkan01/netsocket_dir_restructure

Restructure netsocket directory

Author: 0xc0170

.travis.yml

@@ -138,7 +138,7 @@ matrix:
         - ./tools/test/travis-ci/doxy-spellchecker/spell.sh platform
         - ./tools/test/travis-ci/doxy-spellchecker/spell.sh events
         - ./tools/test/travis-ci/doxy-spellchecker/spell.sh rtos
-        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh features/netsocket
+        - ./tools/test/travis-ci/doxy-spellchecker/spell.sh connectivity/netsocket
 
     - <<: *docs-vm
       name: "doxygen"
@@ -249,7 +249,7 @@ matrix:
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
         - |
           rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
-            connectivity/libraries/ppp features/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
+            connectivity/libraries/ppp connectivity/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
             features/frameworks/utest features/frameworks/unity components BUILD
         - python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
         # Run local equeue tests

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"
@@ -131,6 +130,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"

UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake

@@ -16,7 +16,7 @@
  */
 
 #include <ctype.h>
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 #include "events/EventQueue.h"
 #include "ATHandler_stub.h"
 

UNITTESTS/stubs/ATHandler_stub.cpp

@@ -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"

UNITTESTS/stubs/ATHandler_stub.h

@@ -16,7 +16,7 @@
  */
 
 #include "AT_CellularInformation.h"
-#include "nsapi_types.h"
+#include "netsocket/nsapi_types.h"
 
 using namespace mbed;
 

UNITTESTS/stubs/AT_CellularInformation_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;

UNITTESTS/stubs/AT_CellularNetwork_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()
 {

UNITTESTS/stubs/CellularInterface_stub.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "ControlPlane_netif.h"
+#include "netsocket/ControlPlane_netif.h"
 #include <list>
 
 namespace mbed {

UNITTESTS/stubs/ControlPlane_netif_stub.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: