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

Fabric scoped commands in idl generation #21050

Merged
merged 2 commits into from
Jul 21, 2022
+525 −524
Merged

Fabric scoped commands in idl generation #21050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c219d82
Detect fabric-scoped commands and flag them in matter idl
andy31415 Jul 21, 2022
c5fbefa
zap regen
andy31415 Jul 21, 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
40 changes: 20 additions & 20 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 @@ -99,12 +99,12 @@ server cluster Groups = 4 {
group_id groupId = 1;
}

command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

server cluster Scenes = 5 {
Expand Down Expand Up @@ -206,13 +206,13 @@ server cluster Scenes = 5 {
optional INT8U sceneList[] = 3;
}

command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
}

server cluster OnOff = 6 {
Expand Down Expand Up @@ -911,7 +911,7 @@ server cluster GeneralCommissioning = 48 {

command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
}

server cluster NetworkCommissioning = 49 {
Expand Down Expand Up @@ -1632,8 +1632,8 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
}
Expand Down Expand Up @@ -1699,10 +1699,10 @@ server cluster GroupKeyManagement = 63 {
INT16U groupKeySetIDs[] = 0;
}

command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
}

server cluster FixedLabel = 64 {
Expand Down
40 changes: 20 additions & 20 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 @@ -93,12 +93,12 @@ server cluster Groups = 4 {
group_id groupId = 1;
}

command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

server cluster Scenes = 5 {
Expand Down Expand Up @@ -200,13 +200,13 @@ server cluster Scenes = 5 {
optional INT8U sceneList[] = 3;
}

command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
}

server cluster OnOff = 6 {
Expand Down Expand Up @@ -840,7 +840,7 @@ server cluster GeneralCommissioning = 48 {

command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
}

server cluster NetworkCommissioning = 49 {
Expand Down Expand Up @@ -1477,8 +1477,8 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
}
Expand Down Expand Up @@ -1544,10 +1544,10 @@ server cluster GroupKeyManagement = 63 {
INT16U groupKeySetIDs[] = 0;
}

command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
}

server cluster FixedLabel = 64 {
Expand Down
14 changes: 7 additions & 7 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 @@ -593,7 +593,7 @@ server cluster GeneralCommissioning = 48 {

command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
}

server cluster NetworkCommissioning = 49 {
Expand Down Expand Up @@ -1317,8 +1317,8 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
}
Expand Down Expand Up @@ -1387,10 +1387,10 @@ server cluster GroupKeyManagement = 63 {
INT16U groupKeySetIDs[] = 0;
}

command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
}

server cluster UserLabel = 65 {
Expand Down
40 changes: 20 additions & 20 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 @@ -99,12 +99,12 @@ server cluster Groups = 4 {
group_id groupId = 1;
}

command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
fabric command access(invoke: manage) AddGroup(AddGroupRequest): AddGroupResponse = 0;
fabric command ViewGroup(ViewGroupRequest): ViewGroupResponse = 1;
fabric command GetGroupMembership(GetGroupMembershipRequest): GetGroupMembershipResponse = 2;
fabric command access(invoke: manage) RemoveGroup(RemoveGroupRequest): RemoveGroupResponse = 3;
fabric command access(invoke: manage) RemoveAllGroups(): DefaultSuccess = 4;
fabric command access(invoke: manage) AddGroupIfIdentifying(AddGroupIfIdentifyingRequest): DefaultSuccess = 5;
}

server cluster Scenes = 5 {
Expand Down Expand Up @@ -209,13 +209,13 @@ server cluster Scenes = 5 {
optional INT8U sceneList[] = 3;
}

command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
fabric command access(invoke: manage) RemoveScene(RemoveSceneRequest): RemoveSceneResponse = 2;
fabric command access(invoke: manage) RemoveAllScenes(RemoveAllScenesRequest): RemoveAllScenesResponse = 3;
fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
}

server cluster OnOff = 6 {
Expand Down Expand Up @@ -709,7 +709,7 @@ server cluster GeneralCommissioning = 48 {

command access(invoke: administer) ArmFailSafe(ArmFailSafeRequest): ArmFailSafeResponse = 0;
command access(invoke: administer) SetRegulatoryConfig(SetRegulatoryConfigRequest): SetRegulatoryConfigResponse = 2;
command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
fabric command access(invoke: administer) CommissioningComplete(): CommissioningCompleteResponse = 4;
}

server cluster DiagnosticLogs = 50 {
Expand Down Expand Up @@ -1290,8 +1290,8 @@ server cluster OperationalCredentials = 62 {
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
}
Expand Down Expand Up @@ -1357,10 +1357,10 @@ server cluster GroupKeyManagement = 63 {
INT16U groupKeySetIDs[] = 0;
}

command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
fabric command access(invoke: administer) KeySetWrite(KeySetWriteRequest): DefaultSuccess = 0;
fabric command access(invoke: administer) KeySetRead(KeySetReadRequest): KeySetReadResponse = 1;
fabric command access(invoke: administer) KeySetRemove(KeySetRemoveRequest): DefaultSuccess = 3;
fabric command access(invoke: administer) KeySetReadAllIndices(KeySetReadAllIndicesRequest): KeySetReadAllIndicesResponse = 4;
}

server cluster FixedLabel = 64 {
Expand Down
Loading