Revert "Merge branch 'master' into 27663-remove-previously-provisiona…

…lly-aliased-resource-monitoring-clusters-from-the-sdk" This reverts commit 02d094f, reversing changes made to a7618cf.
project-chip · Jul 17, 2023 · 7348159 · 7348159
1 parent 02d094f
commit 7348159
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 83 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -448,7 +448,6 @@ jobs:
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_CGEN_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values"'
-                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_TIMESYNC_3_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_IDM_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py"'

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -6,7 +6,7 @@ steps:
           - "--init"
           - "--recursive"
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -21,7 +21,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -85,7 +85,7 @@ steps:
               --target k32w-shell
               build
               --create-archives /workspace/artifacts/
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:

diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 2700s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -26,7 +26,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:

diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
@@ -1,13 +1,13 @@
 steps:
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       entrypoint: "bash"
       args:
           - "-c"
           - |
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -22,7 +22,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -42,7 +42,7 @@ steps:
       volumes:
           - name: pwenv
             path: /pwenv
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -63,7 +63,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -85,7 +85,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -138,7 +138,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:1"
+    - name: "connectedhomeip/chip-build-vscode:0.7.25"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv

diff --git a/src/python_testing/TC_TIMESYNC_2_2.py b/src/python_testing/TC_TIMESYNC_2_2.py
@@ -32,8 +32,7 @@ async def read_ts_attribute_expect_success(self, endpoint, attribute):
     @async_test_body
     async def test_TC_TIMESYNC_2_2(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        endpoint = 0
+        endpoint = self.user_params.get("endpoint", 0)
 
         time_cluster = Clusters.Objects.TimeSynchronization
 

diff --git a/src/python_testing/TC_TIMESYNC_2_4.py b/src/python_testing/TC_TIMESYNC_2_4.py
@@ -46,8 +46,7 @@ async def send_set_time_zone_cmd_expect_error(self, tz: typing.List[Clusters.Obj
     @async_test_body
     async def test_TC_TIMESYNC_2_4(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         time_cluster = Clusters.Objects.TimeSynchronization
         tz_struct = time_cluster.Structs.TimeZoneStruct

diff --git a/src/python_testing/TC_TIMESYNC_2_5.py b/src/python_testing/TC_TIMESYNC_2_5.py
@@ -43,8 +43,7 @@ async def send_set_dst_cmd_expect_error(self, dst: typing.List[Clusters.Objects.
     @async_test_body
     async def test_TC_TIMESYNC_2_5(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         time_cluster = Clusters.Objects.TimeSynchronization
         dst_struct = time_cluster.Structs.DSTOffsetStruct

diff --git a/src/python_testing/TC_TIMESYNC_2_6.py b/src/python_testing/TC_TIMESYNC_2_6.py
@@ -43,8 +43,7 @@ async def send_set_default_ntp_cmd_expect_error(self, ntp: typing.Union[Nullable
     @async_test_body
     async def test_TC_TIMESYNC_2_6(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         self.print_step(0, "Commissioning, already done")
         attributes = Clusters.TimeSynchronization.Attributes

diff --git a/src/python_testing/TC_TIMESYNC_2_7.py b/src/python_testing/TC_TIMESYNC_2_7.py
@@ -49,8 +49,7 @@ async def send_set_utc_cmd(self, utc: uint) -> None:
     @async_test_body
     async def test_TC_TIMESYNC_2_7(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         self.print_step(0, "Commissioning, already done")
         time_cluster = Clusters.Objects.TimeSynchronization
@@ -109,8 +108,6 @@ async def test_TC_TIMESYNC_2_7(self):
         if tz_list_size > 1:
             th_utc = utc_time_in_matter_epoch()
             tz = [tz_struct(offset=3600, validAt=0), tz_struct(offset=7200, validAt=th_utc+1e+7)]
-            ret = await self.send_set_time_zone_cmd(tz)
-            asserts.assert_true(ret.DSTOffsetRequired, "DSTOffsetRequired not set to true")
 
         self.print_step(12, "Send SetDSTOffset command")
         if tz_list_size > 1:

diff --git a/src/python_testing/TC_TIMESYNC_2_8.py b/src/python_testing/TC_TIMESYNC_2_8.py
@@ -49,8 +49,7 @@ async def send_set_utc_cmd(self, utc: uint) -> None:
     @async_test_body
     async def test_TC_TIMESYNC_2_8(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         self.print_step(0, "Commissioning, already done")
         time_cluster = Clusters.Objects.TimeSynchronization
@@ -107,9 +106,10 @@ async def test_TC_TIMESYNC_2_8(self):
 
         self.print_step(11, "Read LocalTime")
         local = await self.read_ts_attribute_expect_success(local_attr)
-        asserts.assert_equal(local, NullValue, "LocalTime cannot be calculated since DST is empty")
+        compare_time(received=local, offset=timedelta(), tolerance=timedelta(seconds=5))
 
         self.print_step(12, "Send SetDSTOffset command")
+        th_utc = utc_time_in_matter_epoch()
         dst = [dst_struct(offset=3600, validStarting=0, validUntil=NullValue)]
         await self.send_set_dst_cmd(dst)
 
@@ -164,17 +164,19 @@ async def test_TC_TIMESYNC_2_8(self):
         self.print_step(24, "Read LocalTime")
         if dst_list_size > 1:
             local = await self.read_ts_attribute_expect_success(local_attr)
-            asserts.assert_equal(local, NullValue, "LocalTime cannot be calculated since DST is empty")
+            compare_time(received=local, offset=timedelta(), tolerance=timedelta(seconds=5))
 
         self.print_step(25, "Send SetDSTOffset command")
-        dst = [dst_struct(offset=-3600, validStarting=0, validUntil=NullValue)]
+        th_utc = utc_time_in_matter_epoch()
+        dst = [dst_struct(offset=3600, validStarting=0, validUntil=NullValue)]
         await self.send_set_dst_cmd(dst)
 
         self.print_step(26, "Read LocalTime")
         local = await self.read_ts_attribute_expect_success(local_attr)
         compare_time(received=local, offset=timedelta(seconds=-3600), tolerance=timedelta(seconds=5))
 
         self.print_step(27, "Send SetDSTOffset command")
+        th_utc = utc_time_in_matter_epoch()
         dst = [dst_struct(offset=0, validStarting=0, validUntil=NullValue)]
         await self.send_set_dst_cmd(dst)
 

diff --git a/src/python_testing/TC_TIMESYNC_2_9.py b/src/python_testing/TC_TIMESYNC_2_9.py
@@ -48,8 +48,7 @@ async def send_set_utc_cmd(self, utc: uint) -> None:
     @async_test_body
     async def test_TC_TIMESYNC_2_9(self):
 
-        # Time sync is required to be on endpoint 0 if it is present
-        self.endpoint = 0
+        self.endpoint = self.user_params.get("endpoint", 0)
 
         self.print_step(0, "Commissioning, already done")
         time_cluster = Clusters.Objects.TimeSynchronization

diff --git a/src/python_testing/TC_TIMESYNC_3_1.py b/src/python_testing/TC_TIMESYNC_3_1.py
diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
+0 −1		.github/workflows/build.yml
+2 −2		.github/workflows/codeql.yml
+1 −1		.github/workflows/scorecards.yml
+0 −1		etc/cmake/options.cmake
+0 −6		include/openthread/border_agent.h
+1 −1		include/openthread/instance.h
+6 −189		include/openthread/mesh_diag.h
+0 −1		include/openthread/netdata.h
+0 −31		include/openthread/netdiag.h
+122 −87		include/openthread/srp_server.h
+0 −57		include/openthread/thread.h
+1 −179		src/cli/README.md
+0 −3		src/cli/README_NETDATA.md
+9 −446		src/cli/cli.cpp
+0 −18		src/cli/cli.hpp
+0 −5		src/cli/cli_network_data.cpp
+19 −17		src/cli/cli_srp_server.cpp
+0 −1		src/core/BUILD.gn
+0 −1		src/core/CMakeLists.txt
+0 −24		src/core/api/mesh_diag_api.cpp
+17 −36		src/core/api/srp_server_api.cpp
+0 −20		src/core/api/thread_api.cpp
+29 −67		src/core/border_router/routing_manager.cpp
+9 −15		src/core/border_router/routing_manager.hpp
+9 −11		src/core/common/time.hpp
+1 −8		src/core/common/tlvs.cpp
+0 −37		src/core/common/tlvs.hpp
+0 −52		src/core/config/mesh_forwarder.h
+27 −8		src/core/meshcop/commissioner.cpp
+2 −0		src/core/meshcop/commissioner.hpp
+41 −39		src/core/net/dnssd_server.cpp
+12 −9		src/core/net/dnssd_server.hpp
+438 −252		src/core/net/srp_server.cpp
+160 −94		src/core/net/srp_server.hpp
+0 −30		src/core/thread/mesh_forwarder.cpp
+0 −71		src/core/thread/mesh_forwarder.hpp
+41 −49		src/core/thread/mle.cpp
+0 −1		src/core/thread/mle.hpp
+0 −5		src/core/thread/mle_router.cpp
+0 −10		src/core/thread/network_data_tlvs.hpp
+0 −6		src/core/thread/network_data_types.cpp
+15 −401		src/core/thread/network_diagnostic.cpp
+2 −65		src/core/thread/network_diagnostic.hpp
+0 −152		src/core/thread/network_diagnostic_tlvs.cpp
+22 −500		src/core/thread/network_diagnostic_tlvs.hpp
+53 −390		src/core/utils/mesh_diag.cpp
+11 −135		src/core/utils/mesh_diag.hpp
+1 −1		src/lib/spinel/radio_spinel_impl.hpp
+9 −9		tests/scripts/thread-cert/Cert_5_7_02_CoapDiagCommands.py
+4 −4		tests/scripts/thread-cert/Cert_5_7_03_CoapDiagCommands.py
+0 −24		tests/scripts/thread-cert/test_mle_msg_key_seq_jump.py
+9 −9		tests/toranj/cli/test-021-br-route-prf.py
+0 −164		tests/toranj/cli/test-023-mesh-diag.py
+24 −0		tests/toranj/openthread-core-toranj-config-posix.h
+50 −2		tests/toranj/openthread-core-toranj-config-simulation.h
+471 −4		tests/toranj/openthread-core-toranj-config.h
+0 −1		tests/toranj/start.sh
+0 −2		tests/unit/test_network_data.cpp
+61 −70		tests/unit/test_routing_manager.cpp
+4 −11		tests/unit/test_timer.cpp