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.

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

Implement NOCs attribute in Node Operational Credentials Cluster #13563

Merged
merged 2 commits into from
Jan 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2084,15 +2084,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4355,6 +4355,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
9 changes: 8 additions & 1 deletion examples/bridge-app/bridge-common/bridge-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -536,15 +536,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -2918,6 +2918,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
9 changes: 8 additions & 1 deletion examples/door-lock-app/door-lock-common/door-lock-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -764,15 +764,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/door-lock-app/door-lock-common/door-lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3885,6 +3885,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
9 changes: 8 additions & 1 deletion examples/lighting-app/lighting-common/lighting-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -1021,15 +1021,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/lighting-app/lighting-common/lighting-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -4143,6 +4143,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
9 changes: 8 additions & 1 deletion examples/lock-app/lock-common/lock-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -460,15 +460,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/lock-app/lock-common/lock-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3885,6 +3885,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -1721,6 +1721,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app1/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
Expand Down
2 changes: 1 addition & 1 deletion examples/placeholder/linux/apps/app2/config.matter
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
Expand Down
9 changes: 8 additions & 1 deletion examples/pump-app/pump-common/pump-app.matter
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,22 @@ server cluster OperationalCredentials = 62 {
kInvalidFabricIndex = 11;
}

struct NOCStruct {
fabric_idx fabricIndex = 0;
OCTET_STRING noc = 1;
OCTET_STRING icac = 2;
}

struct FabricDescriptor {
INT8U fabricIndex = 0;
fabric_idx fabricIndex = 0;
OCTET_STRING rootPublicKey = 1;
INT16U vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING label = 5;
}

readonly attribute NOCStruct NOCs[] = 0;
readonly attribute FabricDescriptor fabricsList[] = 1;
readonly attribute int8u supportedFabrics = 2;
readonly attribute int8u commissionedFabrics = 3;
Expand Down
15 changes: 15 additions & 0 deletions examples/pump-app/pump-common/pump-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -3661,6 +3661,21 @@
}
],
"attributes": [
{
"name": "NOCs",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "fabrics list",
"code": 1,
Expand Down
Loading