Remove DeviceNetworkProvisioningDelegate interface to force vendor to…

… use NetworkCommissioning interface… (project-chip#23391) * Remove intermediate CRTP layer from DeviceNetworkProvisioningDelegate * Remove DeviceNetworkProvisioningDelegate interface
tehampson · Mar 22, 2023 · c9f35b4 · c9f35b4
1 parent 44e677e
commit c9f35b4
Show file tree

Hide file tree

Showing 68 changed files with 3 additions and 2,165 deletions.
diff --git a/src/include/platform/internal/DeviceNetworkProvisioning.h b/src/include/platform/internal/DeviceNetworkProvisioning.h
diff --git a/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h b/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h
diff --git a/src/lib/shell/commands/WiFi.cpp b/src/lib/shell/commands/WiFi.cpp
@@ -22,13 +22,6 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/ConnectivityManager.h>
 
-// Include DeviceNetworkProvisioningDelegateImpl for WiFi provisioning.
-// TODO: Enable wifi network should be done by ConnectivityManager. (Or other platform neutral interfaces)
-#if defined(CHIP_DEVICE_LAYER_TARGET)
-#define DEVICENETWORKPROVISIONING_HEADER <platform/CHIP_DEVICE_LAYER_TARGET/DeviceNetworkProvisioningDelegateImpl.h>
-#include DEVICENETWORKPROVISIONING_HEADER
-#endif
-
 using chip::DeviceLayer::ConnectivityManager;
 using chip::DeviceLayer::ConnectivityMgr;
 
@@ -115,8 +108,9 @@ static CHIP_ERROR WiFiConnectHandler(int argc, char ** argv)
     {
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
-    DeviceLayer::DeviceNetworkProvisioningDelegateImpl deviceDelegate;
-    return deviceDelegate.ProvisionWiFi(argv[0], argv[1]);
+
+    // TODO:Provision WiFi using WirelessDriver
+    return CHIP_ERROR_NOT_IMPLEMENTED;
 }
 
 static CHIP_ERROR WiFiDispatch(int argc, char ** argv)

diff --git a/src/platform/Ameba/BUILD.gn b/src/platform/Ameba/BUILD.gn
@@ -33,8 +33,6 @@ static_library("Ameba") {
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.cpp",
     "ConnectivityManagerImpl.h",
-    "DeviceNetworkProvisioningDelegateImpl.cpp",
-    "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "FactoryDataProvider.cpp",

diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp
diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -343,7 +343,6 @@ if (chip_device_platform != "none") {
       "../include/platform/internal/BLEManager.h",
       "../include/platform/internal/CHIPDeviceLayerInternal.h",
       "../include/platform/internal/DeviceNetworkInfo.h",
-      "../include/platform/internal/DeviceNetworkProvisioning.h",
       "../include/platform/internal/EventLogging.h",
       "../include/platform/internal/GenericConfigurationManagerImpl.h",
       "../include/platform/internal/GenericConfigurationManagerImpl.ipp",

diff --git a/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h
diff --git a/src/platform/EFR32/BUILD.gn b/src/platform/EFR32/BUILD.gn
@@ -44,8 +44,6 @@ static_library("EFR32") {
     "ConfigurationManagerImpl.cpp",
     "ConfigurationManagerImpl.h",
     "ConnectivityManagerImpl.h",
-    "DeviceNetworkProvisioningDelegateImpl.cpp",
-    "DeviceNetworkProvisioningDelegateImpl.h",
     "DiagnosticDataProviderImpl.cpp",
     "DiagnosticDataProviderImpl.h",
     "EFR32Config.cpp",

diff --git a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp