Skip to content

Commit b5a9905

Browse files
j-ororkej-ororke
authored
Merge branch 'master' into remove_PICS_from_OPSTATE_tests
2 parents 06c7306 + 84fb78f commit b5a9905

File tree

224 files changed

+3641
-1363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+3641
-1363
lines changed

‎.github/workflows/docker_img.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
required: false
3434
type: boolean
3535
default: false
36-
36+
3737
jobs:
3838
build_images_base:
3939
name: Build Docker CHIP Build images - base
@@ -102,6 +102,7 @@ jobs:
102102
# - "-imx"
103103
- "-java"
104104
- "-nxp"
105+
- "-nxp-zephyr"
105106
- "-nrf-platform"
106107
- "-telink"
107108
- "-ti"
@@ -120,7 +121,7 @@ jobs:
120121
run: |
121122
cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
122123
./build.sh --latest
123-
124+
124125
build_images_stage_3:
125126
needs: [build_images_base, build_images_stage_1, build_images_stage_2]
126127
name: Build Docker CHIP Build images - stage 3

‎.github/workflows/java-tests.yaml

+59-12
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ jobs:
104104
build \
105105
"
106106
- name: Run Discover Commissionables Test
107+
# Generally completes in seconds
108+
timeout-minutes: 2
107109
run: |
108110
scripts/run_in_python_env.sh out/venv \
109111
'./scripts/tests/run_java_test.py \
@@ -115,6 +117,8 @@ jobs:
115117
--factoryreset \
116118
'
117119
- name: Run Pairing Onnetwork Test
120+
# Generally completes in seconds
121+
timeout-minutes: 2
118122
run: |
119123
scripts/run_in_python_env.sh out/venv \
120124
'./scripts/tests/run_java_test.py \
@@ -126,6 +130,8 @@ jobs:
126130
--factoryreset \
127131
'
128132
- name: Run IM Invoke Test
133+
# Generally completes in seconds
134+
timeout-minutes: 2
129135
run: |
130136
scripts/run_in_python_env.sh out/venv \
131137
'./scripts/tests/run_java_test.py \
@@ -137,6 +143,8 @@ jobs:
137143
--factoryreset \
138144
'
139145
- name: Run IM Extendable Invoke Test
146+
# Generally completes in seconds
147+
timeout-minutes: 2
140148
run: |
141149
scripts/run_in_python_env.sh out/venv \
142150
'./scripts/tests/run_java_test.py \
@@ -148,6 +156,8 @@ jobs:
148156
--factoryreset \
149157
'
150158
- name: Run IM Read Test
159+
# Generally completes in seconds
160+
timeout-minutes: 2
151161
run: |
152162
scripts/run_in_python_env.sh out/venv \
153163
'./scripts/tests/run_java_test.py \
@@ -159,6 +169,8 @@ jobs:
159169
--factoryreset \
160170
'
161171
- name: Run IM Write Test
172+
# Generally completes in seconds
173+
timeout-minutes: 2
162174
run: |
163175
scripts/run_in_python_env.sh out/venv \
164176
'./scripts/tests/run_java_test.py \
@@ -170,6 +182,8 @@ jobs:
170182
--factoryreset \
171183
'
172184
- name: Run IM Subscribe Test
185+
# Generally completes in seconds
186+
timeout-minutes: 2
173187
run: |
174188
scripts/run_in_python_env.sh out/venv \
175189
'./scripts/tests/run_java_test.py \
@@ -181,6 +195,8 @@ jobs:
181195
--factoryreset \
182196
'
183197
- name: Run Pairing AlreadyDiscovered Test
198+
# Generally completes in seconds
199+
timeout-minutes: 2
184200
run: |
185201
scripts/run_in_python_env.sh out/venv \
186202
'./scripts/tests/run_java_test.py \
@@ -191,19 +207,22 @@ jobs:
191207
--tool-args "already-discovered --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
192208
--factoryreset \
193209
'
194-
# Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361
195-
# - name: Run Pairing Address-PaseOnly Test
196-
# run: |
197-
# scripts/run_in_python_env.sh out/venv \
198-
# './scripts/tests/run_java_test.py \
199-
# --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
200-
# --app-args "--discriminator 3840 --interface-id -1" \
201-
# --tool-path out/linux-x64-java-matter-controller \
202-
# --tool-cluster "pairing" \
203-
# --tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
204-
# --factoryreset \
205-
# '
210+
- name: Run Pairing Address-PaseOnly Test
211+
# Disabled due to failure: https://github.com/project-chip/connectedhomeip/issues/27361
212+
if: false
213+
run: |
214+
scripts/run_in_python_env.sh out/venv \
215+
'./scripts/tests/run_java_test.py \
216+
--app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
217+
--app-args "--discriminator 3840 --interface-id -1" \
218+
--tool-path out/linux-x64-java-matter-controller \
219+
--tool-cluster "pairing" \
220+
--tool-args "address-paseonly --nodeid 1 --setup-pin-code 20202021 --address ::1 --port 5540 -t 1000" \
221+
--factoryreset \
222+
'
206223
- name: Run Pairing SetupQRCode Test
224+
# Generally completes in seconds
225+
timeout-minutes: 2
207226
run: |
208227
scripts/run_in_python_env.sh out/venv \
209228
'./scripts/tests/run_java_test.py \
@@ -215,6 +234,8 @@ jobs:
215234
--factoryreset \
216235
'
217236
- name: Run Pairing ManualCode Test
237+
# Generally completes in seconds
238+
timeout-minutes: 2
218239
run: |
219240
scripts/run_in_python_env.sh out/venv \
220241
'./scripts/tests/run_java_test.py \
@@ -226,6 +247,8 @@ jobs:
226247
--factoryreset \
227248
'
228249
- name: Run Pairing ICD Onnetwork Test
250+
# Generally completes in seconds
251+
timeout-minutes: 2
229252
run: |
230253
scripts/run_in_python_env.sh out/venv \
231254
'./scripts/tests/run_java_test.py \
@@ -236,7 +259,23 @@ jobs:
236259
--tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
237260
--factoryreset \
238261
'
262+
- name: Run Pairing Onnetwork and get diagnostic log Test
263+
# TODO: test below is disabled because it seems flaky (crashes on pool not being empty on app exit)
264+
# See: https://github.com/project-chip/connectedhomeip/issues/36734
265+
if: false
266+
run: |
267+
scripts/run_in_python_env.sh out/venv \
268+
'./scripts/tests/run_java_test.py \
269+
--app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
270+
--app-args "--discriminator 3840 --interface-id -1 --crash_log ./crashLog.log --end_user_support_log ./enduser.log --network_diagnostics_log ./network.log" \
271+
--tool-path out/linux-x64-java-matter-controller \
272+
--tool-cluster "bdx" \
273+
--tool-args "onnetwork-long-downloadLog --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 3000 --logType CrashLogs --fileName ./crashLog.log" \
274+
--factoryreset \
275+
'
239276
- name: Run Pairing Onnetwork Test
277+
# Generally completes in seconds
278+
timeout-minutes: 2
240279
run: |
241280
scripts/run_in_python_env.sh out/venv \
242281
'./scripts/tests/run_kotlin_test.py \
@@ -248,6 +287,8 @@ jobs:
248287
--factoryreset \
249288
'
250289
- name: Run Kotlin IM Invoke Test
290+
# Generally completes in seconds
291+
timeout-minutes: 2
251292
run: |
252293
scripts/run_in_python_env.sh out/venv \
253294
'./scripts/tests/run_kotlin_test.py \
@@ -259,6 +300,8 @@ jobs:
259300
--factoryreset \
260301
'
261302
- name: Run Kotlin IM Read Test
303+
# Generally completes in seconds
304+
timeout-minutes: 2
262305
run: |
263306
scripts/run_in_python_env.sh out/venv \
264307
'./scripts/tests/run_kotlin_test.py \
@@ -270,6 +313,8 @@ jobs:
270313
--factoryreset \
271314
'
272315
- name: Run Kotlin IM Write Test
316+
# Generally completes in seconds
317+
timeout-minutes: 2
273318
run: |
274319
scripts/run_in_python_env.sh out/venv \
275320
'./scripts/tests/run_kotlin_test.py \
@@ -281,6 +326,8 @@ jobs:
281326
--factoryreset \
282327
'
283328
- name: Run Kotlin IM Subscribe Test
329+
# Generally completes in seconds
330+
timeout-minutes: 2
284331
run: |
285332
scripts/run_in_python_env.sh out/venv \
286333
'./scripts/tests/run_kotlin_test.py \

‎.github/workflows/tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ jobs:
496496
--target linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test \
497497
--target linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang \
498498
--target linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang \
499+
--target linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang \
499500
--target linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang \
500501
--target linux-x64-python-bindings \
501502
build \
@@ -513,6 +514,7 @@ jobs:
513514
echo "NETWORK_MANAGEMENT_APP: out/linux-x64-network-manager-ipv6only-no-ble-no-wifi-tsan-clang-test/matter-network-manager-app" >> /tmp/test_env.yaml
514515
echo "FABRIC_ADMIN_APP: out/linux-x64-fabric-admin-rpc-ipv6only-no-ble-no-wifi-clang/fabric-admin" >> /tmp/test_env.yaml
515516
echo "FABRIC_BRIDGE_APP: out/linux-x64-fabric-bridge-rpc-ipv6only-no-ble-no-wifi-clang/fabric-bridge-app" >> /tmp/test_env.yaml
517+
echo "FABRIC_SYNC_APP: out/linux-x64-fabric-sync-ipv6only-no-ble-no-wifi-clang/fabric-sync" >> /tmp/test_env.yaml
516518
echo "LIGHTING_APP_NO_UNIQUE_ID: out/linux-x64-light-data-model-no-unique-id-ipv6only-no-ble-no-wifi-clang/chip-lighting-app" >> /tmp/test_env.yaml
517519
echo "TRACE_APP: out/trace_data/app-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml
518520
echo "TRACE_TEST_JSON: out/trace_data/test-{SCRIPT_BASE_NAME}" >> /tmp/test_env.yaml

‎build/chip/chip_test_suite.gni

+4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ template("chip_test_suite") {
9393
} else {
9494
public_deps += [ "${chip_root}/src/platform/logging:default" ]
9595
}
96+
97+
if (chip_device_platform == "esp32") {
98+
complete_static_lib = true
99+
}
96100
}
97101

98102
# Build a source_set or a flashable executable for each individual unit test source, which also includes the common files.

‎credentials/generate-revocation-set.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import requests
3333
from click_option_group import RequiredMutuallyExclusiveOptionGroup, optgroup
3434
from cryptography import x509
35+
from cryptography.hazmat.primitives import serialization
3536
from cryptography.hazmat.primitives.asymmetric import ec
3637
from cryptography.x509.oid import NameOID
3738

@@ -510,12 +511,12 @@ def main(use_main_net_dcld: str, use_test_net_dcld: str, use_main_net_http: bool
510511
"issuer_subject_key_id": certificate_akid_hex,
511512
"issuer_name": certificate_authority_name_b64,
512513
"revoked_serial_numbers": serialnumber_list,
513-
"crl_signer_cert": revocation_point["crlSignerCertificate"],
514+
"crl_signer_cert": base64.b64encode(crl_signer_certificate.public_bytes(serialization.Encoding.DER)).decode('utf-8'),
514515
}
515516

516-
if "crlSignerDelegator" in revocation_point:
517-
entry["crl_signer_delegator"] = revocation_point["crlSignerDelegator"]
518-
517+
if crl_signer_delegator_cert:
518+
entry["crl_signer_delegator"] = base64.b64encode(
519+
crl_signer_delegator_cert.public_bytes(serialization.Encoding.DER)).decode('utf-8'),
519520
logging.debug(f"Entry to append: {entry}")
520521
revocation_set.append(entry)
521522

‎docs/upgrading.md

+5
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,8 @@ To preserve `codegen/zap` generated logic, use
102102
`CodegenDataModelProviderInstance` (see changes in
103103
[36558](https://github.com/project-chip/connectedhomeip/pull/36558) and
104104
[36613](https://github.com/project-chip/connectedhomeip/pull/36613) ).
105+
106+
To use default attribute persistence, you need to pass in a
107+
`PersistentStorageDelegate` to `CodegenDataModelProviderInstance`. See example
108+
changes in [36658](https://github.com/project-chip/connectedhomeip/pull/36658)
109+
).

‎examples/air-purifier-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void InitServer(intptr_t context)
135135
// Init ZCL Data Model and CHIP App Server
136136
static chip::CommonCaseDeviceServerInitParams initParams;
137137
(void) initParams.InitializeStaticResourcesBeforeServerInit();
138-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
138+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
139139
#if CONFIG_ENABLE_AMEBA_CRYPTO
140140
ChipLogProgress(DeviceLayer, "platform crypto enabled!");
141141
static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

‎examples/air-purifier-app/cc32xx/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ int AppTask::Init()
165165
PLAT_LOG("Initialize Server");
166166
static chip::CommonCaseDeviceServerInitParams initParams;
167167
(void) initParams.InitializeStaticResourcesBeforeServerInit();
168-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
168+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
169169
chip::Server::GetInstance().Init(initParams);
170170

171171
// Initialize device attestation config

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static void InitServer(intptr_t context)
150150
initParams.appDelegate = &sAmebaObserver;
151151

152152
initParams.InitializeStaticResourcesBeforeServerInit();
153-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
153+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
154154

155155
#if CONFIG_ENABLE_AMEBA_CRYPTO
156156
ChipLogProgress(DeviceLayer, "platform crypto enabled!");

‎examples/all-clusters-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ asr_executable("clusters_app") {
111111
"${chip_root}/examples/all-clusters-app/all-clusters-common",
112112
"${chip_root}/examples/common/QRCode",
113113
"${chip_root}/examples/providers:device_info_provider",
114+
"${chip_root}/src/app:attribute-persistence",
114115
"${chip_root}/src/lib",
115116
"${chip_root}/src/platform/logging:default",
116117
"${chip_root}/src/setup_payload",

‎examples/all-clusters-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ psoc6_executable("clusters_app") {
148148
"${chip_root}/examples/all-clusters-app/all-clusters-common",
149149
"${chip_root}/examples/common/QRCode",
150150
"${chip_root}/examples/providers:device_info_provider",
151+
"${chip_root}/src/app:attribute-persistence",
151152
"${chip_root}/src/lib",
152153
"${chip_root}/src/platform/logging:default",
153154
"${chip_root}/src/setup_payload",

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void InitServer(intptr_t context)
130130
// Init ZCL Data Model
131131
static chip::CommonCaseDeviceServerInitParams initParams;
132132
(void) initParams.InitializeStaticResourcesBeforeServerInit();
133-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
133+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
134134
chip::Server::GetInstance().Init(initParams);
135135

136136
// We only have network commissioning on endpoint 0.

‎examples/all-clusters-app/linux/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ source_set("chip-all-clusters-common") {
9292
deps = [
9393
"${chip_root}/examples/all-clusters-app/all-clusters-common",
9494
"${chip_root}/examples/platform/linux:app-main",
95+
"${chip_root}/src/app:attribute-persistence",
9596
"${chip_root}/src/app/tests/suites/credentials:dac_provider",
9697
"${chip_root}/src/lib",
9798
"${chip_root}/third_party/jsoncpp",

‎examples/all-clusters-app/linux/fuzzing-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
5757
// ChipLinuxAppMainLoop blocks, and we don't want that here.
5858
static chip::CommonCaseDeviceServerInitParams initParams;
5959
(void) initParams.InitializeStaticResourcesBeforeServerInit();
60-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
60+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
6161
VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
6262

6363
ApplicationInit();

‎examples/all-clusters-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int AppTask::Init()
7272
// Init ZCL Data Model and start server
7373
static chip::CommonCaseDeviceServerInitParams initParams;
7474
(void) initParams.InitializeStaticResourcesBeforeServerInit();
75-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
75+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
7676
error = Server::GetInstance().Init(initParams);
7777
if (error != CHIP_NO_ERROR)
7878
{

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ CHIP_ERROR AppTask::Init()
227227
initParams.operationalKeystore = &sPSAOperationalKeystore;
228228
#endif
229229
(void) initParams.InitializeStaticResourcesBeforeServerInit();
230-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
230+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
231231
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
232232
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
233233
AppFabricTableDelegate::Init();

‎examples/all-clusters-app/nrfconnect/main/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ static int InitUSB()
3333
{
3434
int err = usb_enable(nullptr);
3535

36-
if (err)
36+
if ((err != 0) && (err != -EALREADY))
3737
{
38-
LOG_ERR("Failed to initialize USB device");
38+
LOG_ERR("Failed to initialize USB device %d", err);
3939
return err;
4040
}
4141

‎examples/all-clusters-app/nxp/mw320/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ mw320_executable("shell_mw320") {
6464
]
6565

6666
deps = [
67+
"${chip_root}/src/app:attribute-persistence",
6768
"${chip_root}/src/platform:syscalls_stub",
6869
"${chip_root}/src/platform/logging:default",
6970
]

‎examples/all-clusters-app/nxp/mw320/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ static void run_chip_srv(System::Layer * aSystemLayer, void * aAppState)
10691069

10701070
static chip::CommonCaseDeviceServerInitParams initParams;
10711071
(void) initParams.InitializeStaticResourcesBeforeServerInit();
1072-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
1072+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
10731073
chip::Server::GetInstance().Init(initParams);
10741074
PRINTF("Done to call chip::Server() \r\n");
10751075
}

‎examples/all-clusters-app/tizen/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ source_set("chip-all-clusters-common") {
5353
deps = [
5454
"${chip_root}/examples/all-clusters-app/all-clusters-common",
5555
"${chip_root}/examples/platform/tizen:app-main",
56+
"${chip_root}/src/app:attribute-persistence",
5657
"${chip_root}/src/lib/shell:shell_core",
5758
]
5859

0 commit comments

Comments
 (0)