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

Update AddNOC/UpdateNOC to follow final error handling spec text #18861

Merged
merged 20 commits into from
May 28, 2022
Merged

Update AddNOC/UpdateNOC to follow final error handling spec text #18861

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a2782ab
updated noc to follow final error handling spec
HodgertA May 20, 2022
07fe5ba
Removes white spacing
HodgertA May 25, 2022
f4d2ea7
Regenerated ZAP files
HodgertA May 25, 2022
1419184
Updated validation for update and add in op-cred
HodgertA May 25, 2022
97152ab
Verify ICAC.size
HodgertA May 25, 2022
05d49d1
Regenerated ZAP files with proper formatting
HodgertA May 26, 2022
dac5c54
Merge remote-tracking branch 'upstream/master' into update-noc-to-fol…
HodgertA May 26, 2022
34e0457
Added proper error handling for invalid commands
HodgertA May 26, 2022
21a6880
Merge remote-tracking branch 'upstream/master' into update-noc-to-fol…
HodgertA May 26, 2022
5e14015
Moved fabric index check to be the last check
HodgertA May 26, 2022
c083a63
Restyled by whitespace
restyled-commits May 26, 2022
fafb39b
Restyled by clang-format
restyled-commits May 26, 2022
3ccb349
Pr changes: moved constraint checks & updated logs
HodgertA May 26, 2022
ececa1b
Added CHIP_ERROR_INVALID_ADMIN_SUBJECT and PR fix
HodgertA May 27, 2022
f253554
Updated comments to reflect reality
HodgertA May 27, 2022
4bd82c4
Regnerated zap files
HodgertA May 27, 2022
b7e647b
Fixed more review comments
HodgertA May 27, 2022
950d691
Merge remote-tracking branch 'upstream/master' into update-noc-to-fol…
HodgertA May 27, 2022
b1dbc35
Removed dublicate error case
HodgertA May 27, 2022
d033038
Merge remote-tracking branch 'upstream/master' into update-noc-to-fol…
HodgertA May 27, 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
1 change: 1 addition & 0 deletions .github/.wordlist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ nongnu
nordicsemi
NotAvailable
notValue
npm
nRF
nrfconnect
nrfdks
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -2498,6 +2498,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -2544,7 +2545,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -726,6 +726,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -772,7 +773,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -1160,6 +1160,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1206,7 +1207,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -1250,6 +1250,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1296,7 +1297,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -1387,6 +1387,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1433,7 +1434,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 1 deletion examples/log-source-app/log-source-common/log-source-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -353,7 +354,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -461,6 +461,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -507,7 +508,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -500,6 +500,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -546,7 +547,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
6 changes: 4 additions & 2 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 @@ -1540,6 +1540,7 @@ client cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1579,7 +1580,7 @@ client cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down Expand Up @@ -1623,6 +1624,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1662,7 +1664,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
6 changes: 4 additions & 2 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 @@ -1540,6 +1540,7 @@ client cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1579,7 +1580,7 @@ client cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down Expand Up @@ -1623,6 +1624,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1662,7 +1664,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -970,6 +970,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1016,7 +1017,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -856,6 +856,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -902,7 +903,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -524,6 +524,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -570,7 +571,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 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 @@ -761,6 +761,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -807,7 +808,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
6 changes: 4 additions & 2 deletions examples/tv-app/tv-common/tv-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,6 +1499,7 @@ client cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1545,7 +1546,7 @@ client cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down Expand Up @@ -1598,6 +1599,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1644,7 +1646,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 1 deletion examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -1600,7 +1601,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
3 changes: 2 additions & 1 deletion examples/window-app/common/window-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ server cluster OperationalCredentials = 62 {
kInvalidNOC = 3;
kMissingCsr = 4;
kTableFull = 5;
kInvalidAdminSubject = 6;
kInsufficientPrivilege = 8;
kFabricConflict = 9;
kLabelConflict = 10;
Expand Down Expand Up @@ -871,7 +872,7 @@ server cluster OperationalCredentials = 62 {
OCTET_STRING NOCValue = 0;
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
NODE_ID caseAdminSubject = 3;
VENDOR_ID adminVendorId = 4;
}

Expand Down
Loading