Actually remove IP cluster flags. (project-chip#10148)

* Actually remove IP cluster flags. It looks like something went dodgy with the PR / Revert / unrevert and the only part that made it into the build was the changed file. This adds back the flag removal from 9892. * Fix mobile device test from Song * Remove extra update in chip tool. Now all on-network resolves automatically and the additional call to update is racing with the commissioning complete call that causes chip tool to abort all the connections. * Return Commissioning complete call Where did this call disappear to? No idea. But it's back for its triumphant return. * Don't re-resolve address in darwin tests This is now done automatically on ip commissioning. * Some more flags creeped in. * Wait for commissioning complete on python. * Use new device proxies.
agners · Nov 12, 2021 · 3a46649 · 3a46649
1 parent 2aae643
commit 3a46649
Show file tree

Hide file tree

Showing 21 changed files with 89 additions and 121 deletions.
diff --git a/config/ameba/args.gni b/config/ameba/args.gni
@@ -31,7 +31,5 @@ chip_inet_config_enable_udp_endpoint = true
 
 chip_bypass_rendezvous = false
 chip_config_network_layer_ble = true
-chip_ip_commissioning = true
-chip_use_clusters_for_ip_commissioning = true
 
 custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"
diff --git a/docs/guides/ip_commissioning.md b/docs/guides/ip_commissioning.md
@@ -40,7 +40,7 @@ device into commissioning mode.
 ### linux builds with an ethernet connection
 
 ```bash
-gn gen out/debug --args='chip_ip_commissioning=true'
+gn gen out/debug
 ninja -C out/debug
 ```
 

diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
@@ -66,8 +66,6 @@ There are three commissioning modes supported by Ameba platform:
 1. In "connectedhomeip/config/ameba/args.gni"
 
     - set `chip_bypass_rendezvous = true`
-    - Set `chip_ip_commissioning = false`
-    - Set `chip_use_clusters_for_ip_commissioning = false`
     - Set `chip_config_network_layer_ble = false`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -87,8 +85,6 @@ There are three commissioning modes supported by Ameba platform:
 1. In "connectedhomeip/config/ameba/args.gni"
 
     - set `chip_bypass_rendezvous = false`
-    - Set `chip_ip_commissioning = false`
-    - Set `chip_use_clusters_for_ip_commissioning = false`
     - Set `chip_config_network_layer_ble = true`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"
@@ -107,8 +103,6 @@ There are three commissioning modes supported by Ameba platform:
 1. In "connectedhomeip/config/ameba/args.gni"
 
     - set `chip_bypass_rendezvous = false`
-    - Set `chip_ip_commissioning = true`
-    - Set `chip_use_clusters_for_ip_commissioning = true`
     - Set `chip_config_network_layer_ble = false`
 
 2. In "connectedhomeip/src/platform/Ameba/CHIPDevicePlatformConfig.h"

diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -248,10 +248,7 @@ CHIP_ERROR PairingCommand::SetupNetwork()
     {
     case PairingNetworkType::None:
     case PairingNetworkType::Ethernet:
-        // Nothing to do other than to resolve the device's operational address.
-        err = UpdateNetworkAddress();
-        VerifyOrExit(err == CHIP_NO_ERROR,
-                     ChipLogError(chipTool, "Setup failure! Error calling UpdateNetworkAddress: %s", ErrorStr(err)));
+        // Nothing to do here - device address has been resolved as part of the commissioning process.
         break;
     case PairingNetworkType::WiFi:
     case PairingNetworkType::Thread:

diff --git a/examples/platform/linux/BUILD.gn b/examples/platform/linux/BUILD.gn
@@ -39,10 +39,6 @@ source_set("app-main") {
   if (chip_enable_pw_rpc) {
     defines += [ "PW_RPC_ENABLED" ]
   }
-  if (chip_ip_commissioning) {
-    # BLE and on-network. Code defaults to BLE if this is not set.
-    defines += [ "CONFIG_RENDEZVOUS_MODE=6" ]
-  }
   if (chip_build_libshell) {
     defines += [ "ENABLE_CHIP_SHELL" ]
   }

diff --git a/examples/tv-app/linux/args.gni b/examples/tv-app/linux/args.gni
@@ -25,4 +25,3 @@ chip_project_config_include_dirs =
 chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]
 
 chip_build_libshell = true
-chip_use_clusters_for_ip_commissioning = true
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
@@ -143,7 +143,6 @@ def generate(self):
             gn_args['target_cpu'] = self.board.TargetCpuName()
             gn_args['android_ndk_root'] = os.environ['ANDROID_NDK_HOME']
             gn_args['android_sdk_root'] = os.environ['ANDROID_HOME']
-            gn_args['chip_use_clusters_for_ip_commissioning'] = True
             gn_args.update(self.app.AppGnArgs())
 
             args_str = ""

diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
@@ -11,7 +11,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-androidstudio-arm-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm-chip-tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm-chip-tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -23,7 +23,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-androidstudio-arm64-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -35,7 +35,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-androidstudio-x64-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-androidstudio-x64-chip-tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args {out}/android-androidstudio-x64-chip-tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -47,7 +47,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-androidstudio-x86-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-androidstudio-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args {out}/android-androidstudio-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" ' --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -59,7 +59,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-arm-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-arm-chip-tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true '
+gn gen --check --fail-on-unused-args {out}/android-arm-chip-tool '--args=target_os="android" target_cpu="arm" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -71,7 +71,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-arm64-chip-test
-gn gen --check --fail-on-unused-args {out}/android-arm64-chip-test '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true '
+gn gen --check --fail-on-unused-args {out}/android-arm64-chip-test '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -83,7 +83,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-arm64-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true '
+gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -95,7 +95,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-arm64-chip-tvserver
-gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tvserver '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true chip_config_network_layer_ble=false '
+gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tvserver '--args=target_os="android" target_cpu="arm64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_config_network_layer_ble=false '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -107,7 +107,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-x64-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-x64-chip-tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true '
+gn gen --check --fail-on-unused-args {out}/android-x64-chip-tool '--args=target_os="android" target_cpu="x64" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
@@ -119,7 +119,7 @@ python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Generating android-x86-chip-tool
-gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" chip_use_clusters_for_ip_commissioning=true '
+gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_os="android" target_cpu="x86" android_ndk_root="TEST_ANDROID_NDK_HOME" android_sdk_root="TEST_ANDROID_HOME" '
 
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'

diff --git a/scripts/build_python.sh b/scripts/build_python.sh
@@ -41,7 +41,6 @@ ENVIRONMENT_ROOT="$CHIP_ROOT/out/python_env"
 declare chip_detail_logging=false
 declare enable_pybindings=false
 declare chip_mdns
-declare clusters=true
 declare case_retry_delta
 
 help() {
@@ -55,8 +54,6 @@ Input Options:
                                                             By default it is false.
   -m, --chip_mdns           ChipMDNSValue                   Specify ChipMDNSValue as platform or minimal.
                                                             By default it is minimal.
-  -c, --clusters_for_ip_commissioning  true/false           Specify whether to use clusters for IP commissioning.
-                                                            By default it is true.
   -p, --enable_pybindings   EnableValue                     Specify whether to enable pybindings as python controller.
 
   -t --time_between_case_retries MRPActiveRetryInterval     Specify MRPActiveRetryInterval value
@@ -80,10 +77,6 @@ while (($#)); do
             chip_mdns=$2
             shift
             ;;
-        --clusters_for_ip_commissioning | -c)
-            clusters=$2
-            shift
-            ;;
         --enable_pybindings | -p)
             enable_pybindings=$2
             shift
@@ -111,7 +104,7 @@ source "$CHIP_ROOT/scripts/activate.sh"
 [[ -n "$chip_mdns" ]] && chip_mdns_arg="chip_mdns=\"$chip_mdns\"" || chip_mdns_arg=""
 [[ -n "$chip_case_retry_delta" ]] && chip_case_retry_arg="chip_case_retry_delta=$chip_case_retry_delta" || chip_case_retry_arg=""
 
-gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_use_clusters_for_ip_commissioning=$clusters chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg $chip_case_retry_arg"
+gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_project_config_include_dirs=[\"//config/python\"] $chip_mdns_arg $chip_case_retry_arg"
 
 # Compiles python files
 # Check pybindings was requested

diff --git a/scripts/examples/android_app_ide.sh b/scripts/examples/android_app_ide.sh
@@ -43,4 +43,4 @@ python3 third_party/android_deps/set_up_android_deps.py
 
 # Build CMake for Android Studio
 echo "build ide"
-gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\" chip_use_clusters_for_ip_commissioning=\"true\"" --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
+gn gen --check --fail-on-unused-args out/"android_$TARGET_CPU" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\"" --ide=json --json-ide-script=//scripts/examples/gn_to_cmakelists.py
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -123,13 +123,6 @@ static_library("app") {
     "reporting/Engine.h",
   ]
 
-  if (chip_ip_commissioning) {
-    defines = [
-      "CONFIG_USE_CLUSTERS_FOR_IP_COMMISSIONING=1",
-      "CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY=1",
-    ]
-  }
-
   public_deps = [
     ":app_buildconfig",
     "${chip_root}/src/app/util:device_callbacks_manager",

diff --git a/src/app/common_flags.gni b/src/app/common_flags.gni
@@ -15,5 +15,4 @@
 declare_args() {
   # Temporary flag for interaction model and echo protocols, set it to true to enable
   chip_app_use_echo = false
-  chip_ip_commissioning = false
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,3 @@ chip_project_config_include_dirs =
		chip_project_config_include_dirs += [ "${chip_root}/config/standalone" ]

		chip_build_libshell = true
		chip_use_clusters_for_ip_commissioning = true