Skip to content

Commit ff91326

Browse files
jmartinez-silabsandy31415
jmartinez-silabs
and
andy31415
authored
Remove deprecated GroupKeyMulticastPolicy from GroupKeySetStruct (project-chip#72580)
* regen group-key-mgmt-cluster.xml with alchemy * Run zap regen all * Remove notion of GroupKeyMulticastPolicy in yaml tests * Manual removal GroupKeyMulticastPolicy references in android and darwin builds. Fix check on cluster revision in TestGroupKeyManagementCluster.yaml * Add GroupKeyManagement Cluster revision errata for DeviceConformance test (1.6.1 in progress) * enable spec errata for ci in deviceConformance test * Update data_model/errata_future.yaml Co-authored-by: Andrei Litvin <andy314@gmail.com> --------- Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent be915b1 commit ff91326

174 files changed

Lines changed: 210 additions & 481 deletions

File tree

Some content is hidden

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

‎data_model/errata_future.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,10 @@ AmbientContextSensing:
1212
# Reconciles against future spec / PR #43327
1313
SimultaneousDetectionLimit:
1414
write_access: none
15+
16+
GroupKeyManagement:
17+
# Cluster revision bumped to 4 in Matter 1.6.1 (Add "C" quality to GroupKeyMap attribute).
18+
# The baseline 1.6 XML lists revision 3, so override the reference revision the conformance
19+
# test expects to 4.
20+
# TODO Can be removed once 1.6.1 datamodel is generated and checked in to datamodel/1.6.1/
21+
revision: 4

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ cluster OperationalCredentials = 62 {
15651565

15661566
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
15671567
cluster GroupKeyManagement = 63 {
1568-
revision 3;
1568+
revision 4;
15691569

15701570
enum GroupKeyMulticastPolicyEnum : enum8 {
15711571
kPerGroupID = 0;
@@ -1604,7 +1604,6 @@ cluster GroupKeyManagement = 63 {
16041604
nullable epoch_us epochStartTime1 = 5;
16051605
nullable octet_string<16> epochKey2 = 6;
16061606
nullable epoch_us epochStartTime2 = 7;
1607-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
16081607
}
16091608

16101609
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ cluster OperationalCredentials = 62 {
17681768

17691769
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
17701770
cluster GroupKeyManagement = 63 {
1771-
revision 3;
1771+
revision 4;
17721772

17731773
enum GroupKeyMulticastPolicyEnum : enum8 {
17741774
kPerGroupID = 0;
@@ -1807,7 +1807,6 @@ cluster GroupKeyManagement = 63 {
18071807
nullable epoch_us epochStartTime1 = 5;
18081808
nullable octet_string<16> epochKey2 = 6;
18091809
nullable epoch_us epochStartTime2 = 7;
1810-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
18111810
}
18121811

18131812
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/air-quality-sensor-app/air-quality-sensor-common/icd-lit-air-quality-sensor-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,7 @@ cluster OperationalCredentials = 62 {
17681768

17691769
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
17701770
cluster GroupKeyManagement = 63 {
1771-
revision 3;
1771+
revision 4;
17721772

17731773
enum GroupKeyMulticastPolicyEnum : enum8 {
17741774
kPerGroupID = 0;
@@ -1807,7 +1807,6 @@ cluster GroupKeyManagement = 63 {
18071807
nullable epoch_us epochStartTime1 = 5;
18081808
nullable octet_string<16> epochKey2 = 6;
18091809
nullable epoch_us epochStartTime2 = 7;
1810-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
18111810
}
18121811

18131812
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ cluster OperationalCredentials = 62 {
29082908

29092909
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
29102910
cluster GroupKeyManagement = 63 {
2911-
revision 3;
2911+
revision 4;
29122912

29132913
enum GroupKeyMulticastPolicyEnum : enum8 {
29142914
kPerGroupID = 0;
@@ -2947,7 +2947,6 @@ cluster GroupKeyManagement = 63 {
29472947
nullable epoch_us epochStartTime1 = 5;
29482948
nullable octet_string<16> epochKey2 = 6;
29492949
nullable epoch_us epochStartTime2 = 7;
2950-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
29512950
}
29522951

29532952
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/all-clusters-app/realtek/data_model/all-clusters-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2908,7 +2908,7 @@ cluster OperationalCredentials = 62 {
29082908

29092909
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
29102910
cluster GroupKeyManagement = 63 {
2911-
revision 3;
2911+
revision 4;
29122912

29132913
enum GroupKeyMulticastPolicyEnum : enum8 {
29142914
kPerGroupID = 0;
@@ -2947,7 +2947,6 @@ cluster GroupKeyManagement = 63 {
29472947
nullable epoch_us epochStartTime1 = 5;
29482948
nullable octet_string<16> epochKey2 = 6;
29492949
nullable epoch_us epochStartTime2 = 7;
2950-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
29512950
}
29522951

29532952
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2678,7 +2678,7 @@ cluster OperationalCredentials = 62 {
26782678

26792679
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
26802680
cluster GroupKeyManagement = 63 {
2681-
revision 3;
2681+
revision 4;
26822682

26832683
enum GroupKeyMulticastPolicyEnum : enum8 {
26842684
kPerGroupID = 0;
@@ -2717,7 +2717,6 @@ cluster GroupKeyManagement = 63 {
27172717
nullable epoch_us epochStartTime1 = 5;
27182718
nullable octet_string<16> epochKey2 = 6;
27192719
nullable epoch_us epochStartTime2 = 7;
2720-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
27212720
}
27222721

27232722
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ class GroupSettingFragment : Fragment() {
260260
hexStringToByteArray(epochKey1Ed.text.toString()),
261261
epochStartTime1Ed.text.toString().toULong().toLong(),
262262
hexStringToByteArray(epochKey2Ed.text.toString()),
263-
epochStartTime2Ed.text.toString().toULong().toLong(),
264-
0
263+
epochStartTime2Ed.text.toString().toULong().toLong()
265264
)
266265
sendKeySetWrite(keySetWritestruct)
267266
requireActivity().runOnUiThread { dialog.dismiss() }

‎examples/bridge-app/bridge-common/bridge-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ cluster OperationalCredentials = 62 {
21722172

21732173
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
21742174
cluster GroupKeyManagement = 63 {
2175-
revision 3;
2175+
revision 4;
21762176

21772177
enum GroupKeyMulticastPolicyEnum : enum8 {
21782178
kPerGroupID = 0;
@@ -2211,7 +2211,6 @@ cluster GroupKeyManagement = 63 {
22112211
nullable epoch_us epochStartTime1 = 5;
22122212
nullable octet_string<16> epochKey2 = 6;
22132213
nullable epoch_us epochStartTime2 = 7;
2214-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
22152214
}
22162215

22172216
fabric_scoped struct GroupcastAdoptionStruct {

‎examples/camera-app/camera-common/camera-app.matter‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ cluster OperationalCredentials = 62 {
23312331

23322332
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
23332333
cluster GroupKeyManagement = 63 {
2334-
revision 3;
2334+
revision 4;
23352335

23362336
enum GroupKeyMulticastPolicyEnum : enum8 {
23372337
kPerGroupID = 0;
@@ -2370,7 +2370,6 @@ cluster GroupKeyManagement = 63 {
23702370
nullable epoch_us epochStartTime1 = 5;
23712371
nullable octet_string<16> epochKey2 = 6;
23722372
nullable epoch_us epochStartTime2 = 7;
2373-
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
23742373
}
23752374

23762375
fabric_scoped struct GroupcastAdoptionStruct {

0 commit comments

Comments
 (0)