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

Add GroupKeyMulticastPolicy to GroupKeySetStruct in group key management cluster #28382

Closed
wants to merge 3 commits into from
Closed

Add GroupKeyMulticastPolicy to GroupKeySetStruct in group key management cluster #28382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
659fb53
Add missing group for multicast policy, slight move of existing enum
andreilitvin Jul 28, 2023
43fa207
Fix unittest yaml to add new new required member
andreilitvin Jul 28, 2023
16c27ec
Zap regen
andreilitvin Jul 28, 2023
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
10 changes: 10 additions & 0 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 @@ -2290,11 +2290,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -2317,6 +2326,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions 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 @@ -1929,11 +1929,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1956,6 +1965,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions 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 @@ -1541,11 +1541,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1568,6 +1577,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions 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 @@ -1426,11 +1426,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1453,6 +1462,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions ...irpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,11 +893,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -920,6 +929,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,11 +1126,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1153,6 +1162,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,11 +1186,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1213,6 +1222,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,11 +1140,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1167,6 +1176,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,11 +1290,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1317,6 +1326,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,11 +1140,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1167,6 +1176,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,11 +1290,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1317,6 +1326,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,11 +1127,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1154,6 +1163,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
10 changes: 10 additions & 0 deletions examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,11 +1215,20 @@ server cluster OperationalCredentials = 62 {

/** The Group Key Management Cluster is the mechanism by which group keys are managed. */
server cluster GroupKeyManagement = 63 {
enum GroupKeyMulticastPolicyEnum : ENUM8 {
kPerGroupID = 0;
kAllNodes = 1;
}

enum GroupKeySecurityPolicyEnum : ENUM8 {
kTrustFirst = 0;
kCacheAndSync = 1;
}

bitmap Feature : BITMAP32 {
kCacheAndSync = 0x1;
}

fabric_scoped struct GroupInfoMapStruct {
group_id groupId = 1;
endpoint_no endpoints[] = 2;
Expand All @@ -1242,6 +1251,7 @@ server cluster GroupKeyManagement = 63 {
nullable epoch_us epochStartTime1 = 5;
nullable octet_string<16> epochKey2 = 6;
nullable epoch_us epochStartTime2 = 7;
GroupKeyMulticastPolicyEnum groupKeyMulticastPolicy = 8;
}

attribute access(write: manage) GroupKeyMapStruct groupKeyMap[] = 0;
Expand Down
Loading