Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[YAML][CI] Update the test runner to implement type checking #21354

Merged
merged 36 commits into from
Jul 29, 2022
Merged

[YAML][CI] Update the test runner to implement type checking #21354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
583e120
[YAML][CI] Update the test runner to implement type checking
vivien-apple Jul 28, 2022
1a6c398
Update src/app/tests/suites/ with boolean instead of bool types
vivien-apple Jul 28, 2022
ffa9645
Update src/app/tests/suites/ with int*u instead of uint* types
vivien-apple Jul 28, 2022
3c495fb
Update src/app/tests/suites/ with int*s instead of int* types
vivien-apple Jul 28, 2022
df735ed
Update src/app/tests/suites/ with bitmap* instead of map* types
vivien-apple Jul 28, 2022
c9eca34
Update src/app/tests/suites/ with char_string instead of string types
vivien-apple Jul 28, 2022
b695984
Update src/app/tests/suites/ with octet_string instead of octstr types
vivien-apple Jul 28, 2022
60db50a
Update src/app/zap-templates/zcl/data-model/chip/operational-credenti…
vivien-apple Jul 28, 2022
e3dcd6f
NODE_ID to node_id
vivien-apple Jul 28, 2022
6c704ca
ENUM8 -> enum8
vivien-apple Jul 28, 2022
5cb85cd
Update Test_TC_DGWIFI_2_1.yaml to check for enum8 for SecurityType in…
vivien-apple Jul 28, 2022
0f950aa
Use int8s in Test_TC_TSTAT_2_2 instead of temp-s8 which is a type def…
vivien-apple Jul 28, 2022
d6da283
Convert OutPutInfo to list since OutputInfo is the inner type
vivien-apple Jul 28, 2022
daa42b1
Check for enum8 instead of RoutingRole in Test_TC_DGTHREAD_2_1
vivien-apple Jul 28, 2022
5f893e8
Use ApplicationBasicApplication instead of struct in Test_TC_APBSC_9_1
vivien-apple Jul 28, 2022
fe09288
vendor-id to vendor_id
vivien-apple Jul 28, 2022
5846702
Update src/app/zap-templates/zcl/data-model/chip/application-basic-cl…
vivien-apple Jul 28, 2022
255db8b
Update Test_TC_BINFO_2_1 to check for type vendor_id instead of int16…
vivien-apple Jul 28, 2022
a0c909d
Update Test_TC_CHANNEL_5_3 to check for type ChannelInfo instead of l…
vivien-apple Jul 28, 2022
6a4bfb1
Update Test_TC_TMP_2_2 since the type of the value per spec is int16s…
vivien-apple Jul 28, 2022
9ca7d3b
Update Test_TC_RH_2_2 since the type of the value per spec is int16u …
vivien-apple Jul 28, 2022
bab7ec2
Update Test_T_LUNIT_3_1 since the type of the TemperatureUnit is enum…
vivien-apple Jul 28, 2022
b9cfebe
Update Test_TC_BINFO since the type of DataModelVersion is not vendor…
vivien-apple Jul 28, 2022
2b63d2e
Update Test_TC_BINFO_2_1 to use long_char_string for ProductURL
vivien-apple Jul 28, 2022
284669d
Update Test_TC_OCC_2_1 since the type of UltrasonicUnoccupiedToOccupi…
vivien-apple Jul 28, 2022
df07ecf
Update Test_TC_PRS_2_1 since the type for Tolerance and ScaledToleran…
vivien-apple Jul 28, 2022
82df8dc
Update Test_TC_RH_1_1 to use int16u for the attribute ClusterRevision…
vivien-apple Jul 28, 2022
7ee59eb
Update Test_TC_RH_2_1 to use int16u and not int16s
vivien-apple Jul 28, 2022
447e345
Update Test_TC_TSTAT_2_1 to use bitmap8 instead of in16s for the occu…
vivien-apple Jul 28, 2022
59e88a8
Update src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.x…
vivien-apple Jul 28, 2022
7e23f63
Update Test_TC_WNCV_1_1 to use bitmap32 instead of int32 for ClusterR…
vivien-apple Jul 28, 2022
0f5d280
Update Test_TC_WNCV_3_1 to use Percent/Percent100ths type instead of …
vivien-apple Jul 28, 2022
2aea0e6
Update Test_TC_WNCV_3_2 to use Percent/Percent100ths type instead of …
vivien-apple Jul 28, 2022
5ee5c44
Add an assert at generation time for different types
vivien-apple Jul 28, 2022
fae1514
Map utc to uint32_t in src/app/zap-templates/common/override.js
vivien-apple Jul 28, 2022
99234a1
Update generated code
vivien-apple Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -3466,7 +3466,7 @@ server cluster ApplicationBasic = 1293 {
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationStatusEnum status = 5;
Expand Down
2 changes: 1 addition & 1 deletion examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
14 changes: 14 additions & 0 deletions examples/chip-tool/templates/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,24 @@ async function structs_with_cluster_name(options)
return templateUtil.collectBlocks(blocks, options, this);
}

async function assertSameTestType(current, expected)
{
if (current == expected) {
return '';
}

const filename = this.parent.parent.parent.filename;
const testName = this.parent.parent.parent.testName;
const error = `\nFile: ${filename}\nTest: ${testName}\nCluster ${this.parent.cluster} Attribute: ${this.name}: Constraint type "${
expected}" does not match the current type "${current}".`;
throw error;
}

//
// Module exports
//
exports.asDelimitedCommand = asDelimitedCommand;
exports.asTypeMinValue = asTypeMinValue;
exports.asTypeMaxValue = asTypeMaxValue;
exports.structs_with_cluster_name = structs_with_cluster_name;
exports.assertSameTestType = assertSameTestType;
5 changes: 3 additions & 2 deletions examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
{{~#chip_tests_iterate_constraints expectedConstraints}}
{{~#if (isStrEqual constraint "hasValue")}}
{{~! Already handled above~}}
{{~else if (isStrEqual constraint "type")}}VerifyOrReturn(CheckConstraintType("{{asPropertyValue context=..}}", "", "{{value}}"));

{{~else if (isStrEqual constraint "type")}}
{{~assertSameTestType (asTestType ../type ../isArray) value~}}
VerifyOrReturn(CheckConstraintType("{{asPropertyValue context=..}}", "{{asTestType ../type ../isArray}}", "{{value}}"));
{{~else if (isStrEqual constraint "format")}}VerifyOrReturn(CheckConstraintFormat("{{asPropertyValue context=..}}", "", "{{value}}"));

{{~else if (isStrEqual constraint "startsWith")}}VerifyOrReturn(CheckConstraintStartsWith("{{asPropertyValue context=..}}", {{asPropertyValue context=..}}, "{{value}}"));
Expand Down
2 changes: 1 addition & 1 deletion .../darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
if ({{>actualValue}} != nil) {
{{/if}}

{{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "", "{{expectedConstraints.type}}"));{{/if}}
{{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "{{asTestType type isArray}}", "{{expectedConstraints.type}}"));{{/if}}

{{~#if (hasProperty expectedConstraints "format")}}VerifyOrReturn(CheckConstraintFormat("{{>item}}", "", "{{expectedConstraints.format}}"));{{/if}}

Expand Down
2 changes: 1 addition & 1 deletion examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/lock-common/lock-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
8 changes: 4 additions & 4 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ client cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -1334,7 +1334,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -2543,7 +2543,7 @@ client cluster ApplicationBasic = 1293 {
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
Expand Down Expand Up @@ -2571,7 +2571,7 @@ server cluster ApplicationBasic = 1293 {
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
Expand Down
8 changes: 4 additions & 4 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ client cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -1334,7 +1334,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down Expand Up @@ -2543,7 +2543,7 @@ client cluster ApplicationBasic = 1293 {
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
Expand Down Expand Up @@ -2571,7 +2571,7 @@ server cluster ApplicationBasic = 1293 {
}

readonly attribute char_string<32> vendorName = 0;
readonly attribute int16u vendorID = 1;
readonly attribute vendor_id vendorID = 1;
readonly attribute char_string<32> applicationName = 2;
readonly attribute int16u productID = 3;
readonly attribute ApplicationBasicApplication application = 4;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-app/pump-common/pump-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
2 changes: 1 addition & 1 deletion examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute attrib_id attributeList[] = 65531;
Expand Down
2 changes: 1 addition & 1 deletion examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
2 changes: 1 addition & 1 deletion examples/thermostat/thermostat-common/thermostat.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,7 @@ server cluster OperationalCredentials = 62 {
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
readonly attribute OCTET_STRING trustedRootCertificates[] = 4;
readonly attribute fabric_idx currentFabricIndex = 5;
readonly attribute int8u currentFabricIndex = 5;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

Expand Down
Loading