Thread: commissioning over Thread MeshCoP

.github/workflows/tests.yaml

@@ -282,6 +282,7 @@ jobs:
                         --target linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
                         --target linux-x64-all-clusters-${BUILD_VARIANT} \
                         --target linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT} \
+                        --target linux-x64-all-clusters-no-wifi-no-ble-openthread-endpoint-${BUILD_VARIANT} \
                         --target linux-x64-ota-requestor-${BUILD_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         --pw-command-launcher=ccache \
@@ -365,9 +366,29 @@ jobs:
                      --iterations 1 \
                      --test-timeout-seconds 120 \
                      --tool-path chip-tool:./objdir-clone/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
-                     --all-clusters-app ./objdir-clone/linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --app-path all-clusters:./objdir-clone/linux-x64-all-clusters-no-wifi-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
                      --commissioning-method ble-thread \
                   "
+                  rm -rf tmp/
+
+            - name: Run Thread-MeshCoP commissioning test
+              env:
+                TSAN_OPTIONS: report_bugs=0
+              run: |
+                  PATH=$PWD/objdir-clone:$PATH ./scripts/run_in_build_env.sh \
+                  "./scripts/tests/run_test_suite.py \
+                     --find-path $PWD/objdir-clone \
+                     --find-path $PWD/scripts \
+                     --runner chip_tool_python \
+                     --target TestOperationalState \
+                     run \
+                     --iterations 1 \
+                     --test-timeout-seconds 120 \
+                     --tool-path chip-tool:./objdir-clone/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
+                     --app-path all-clusters:./objdir-clone/linux-x64-all-clusters-no-wifi-no-ble-openthread-endpoint-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --commissioning-method thread-meshcop \
+                  "
+                  rm -rf tmp/
 
             - name: Run Tests using the python parser sending commands to chip-tool
               run: |

examples/all-clusters-app/linux/args.gni

@@ -33,6 +33,11 @@ chip_enable_software_diagnostics_trigger = true
 chip_enable_wifi_diagnostics_trigger = true
 chip_minmdns_high_verbosity = true
 
+_openthread_config_file =
+    rebase_path(
+        get_path_info("${chip_root}/third_party/openthread/openthread-config.h",
+                      "abspath"))
+openthread_config_file = "\"$_openthread_config_file\""
 openthread_config_ecdsa_enable = true
 openthread_config_ip6_slaac_enable = true
 openthread_config_full_logs = true

examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h

@@ -27,6 +27,11 @@
 
 #pragma once
 
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD_MESHCOP && !CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
+#define CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION 0
+#define CONFIG_RENDEZVOUS_MODE (1 << 5) // Thread MeshCoP
+#endif
+
 // include the CHIPProjectConfig from config/standalone
 #include <CHIPProjectConfig.h>
 

examples/chip-tool/BUILD.gn

@@ -28,6 +28,10 @@ import("${chip_root}/src/crypto/crypto.gni")
 
 assert(chip_build_tools)
 
+# Thread Commissioner is using newer version of mbedtls
+_enable_thread_meshcop = chip_device_platform == "linux" &&
+                         chip_enable_ot_commissioner && chip_crypto != "mbedtls"
+
 config("config") {
   include_dirs = [
     ".",
@@ -51,6 +55,12 @@ config("config") {
     defines += [ "CONFIG_ENABLE_HTTPS_REQUESTS" ]
   }
 
+  if (_enable_thread_meshcop) {
+    defines += [ "CHIP_ENABLE_OT_COMMISSIONER=1" ]
+  } else {
+    defines += [ "CHIP_ENABLE_OT_COMMISSIONER=0" ]
+  }
+
   cflags = [ "-Wconversion" ]
 }
 
@@ -145,8 +155,9 @@ static_library("chip-tool-utils") {
         [ "${chip_root}/examples/common/tracing:trace_handlers_decoder" ]
   }
 
-  if (chip_device_platform == "linux" && chip_enable_ot_commissioner) {
-    deps += [ "${chip_root}/third_party/ot-commissioner" ]
+  if (_enable_thread_meshcop) {
+    sources += [ "commands/pairing/CommissionProxy.cpp" ]
+    public_deps += [ "${chip_root}/third_party/ot-commissioner" ]
   }
 
   output_dir = root_out_dir