Skip to content

Commit

Permalink
Change type from INT16U to VendorId into the Operational Credentials …
Browse files Browse the repository at this point in the history 
…Cluster definition (#18210)

* Change type from INT16U to VendorId into the Operational Credentials Cluster definition

* Update generated code
  • Loading branch information
@vivien-apple @pull
vivien-apple authored and pull[bot] committed Jan 22, 2024
1 parent aa059dc commit 2316569
Show file tree
Hide file tree
Showing 32 changed files with 69 additions and 66 deletions.
4 changes: 2 additions & 2 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -2499,7 +2499,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -757,7 +757,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1191,7 +1191,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1283,7 +1283,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1391,7 +1391,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/log-source-app/log-source-common/log-source-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -346,7 +346,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateFabricLabelRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -501,7 +501,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateFabricLabelRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -540,7 +540,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
8 changes: 4 additions & 4 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1548,7 +1548,7 @@ client cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down Expand Up @@ -1599,7 +1599,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1630,7 +1630,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
8 changes: 4 additions & 4 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1548,7 +1548,7 @@ client cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down Expand Up @@ -1599,7 +1599,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1630,7 +1630,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/pump-app/pump-common/pump-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1018,7 +1018,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -904,7 +904,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -561,7 +561,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/thermostat/thermostat-common/thermostat.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -802,7 +802,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
8 changes: 4 additions & 4 deletions examples/tv-app/tv-common/tv-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ client cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1517,7 +1517,7 @@ client cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateFabricLabelRequest {
Expand Down Expand Up @@ -1583,7 +1583,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1615,7 +1615,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -1577,7 +1577,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
4 changes: 2 additions & 2 deletions examples/window-app/common/window-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ server cluster OperationalCredentials = 62 {

struct FabricDescriptor {
OCTET_STRING<65> rootPublicKey = 1;
INT16U vendorId = 2;
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
CHAR_STRING<32> label = 5;
Expand Down Expand Up @@ -865,7 +865,7 @@ server cluster OperationalCredentials = 62 {
optional OCTET_STRING ICACValue = 1;
OCTET_STRING IPKValue = 2;
NODE_ID caseAdminNode = 3;
INT16U adminVendorId = 4;
VENDOR_ID adminVendorId = 4;
}

request struct UpdateNOCRequest {
Expand Down
2 changes: 1 addition & 1 deletion src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ CHIP_ERROR OperationalCredentialsAttrAccess::ReadFabricsList(EndpointId endpoint

fabricDescriptor.fabricIndex = fabricInfo.GetFabricIndex();
fabricDescriptor.nodeId = fabricInfo.GetPeerId().GetNodeId();
fabricDescriptor.vendorId = fabricInfo.GetVendorId();
fabricDescriptor.vendorId = static_cast<chip::VendorId>(fabricInfo.GetVendorId());
fabricDescriptor.fabricId = fabricInfo.GetFabricId();

fabricDescriptor.label = fabricInfo.GetFabricLabel();
Expand Down
4 changes: 2 additions & 2 deletions src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<struct name="FabricDescriptor">
<cluster code="0x003E"/>
<item fieldId="1" name="RootPublicKey" type="OCTET_STRING" length="65"/>
<item fieldId="2" name="VendorId" type="INT16U"/> <!-- Change INT16U to new type VendorID #2395 -->
<item fieldId="2" name="VendorId" type="VENDOR_ID"/>
<item fieldId="3" name="FabricId" type="FABRIC_ID"/>
<item fieldId="4" name="NodeId" type="NODE_ID"/>
<item fieldId="5" name="Label" type="CHAR_STRING" length="32"/>
Expand Down Expand Up @@ -107,7 +107,7 @@ limitations under the License.
<arg name="ICACValue" type="OCTET_STRING" optional="true"/>
<arg name="IPKValue" type="OCTET_STRING"/>
<arg name="CaseAdminNode" type="NODE_ID"/>
<arg name="AdminVendorId" type="INT16U"/>
<arg name="AdminVendorId" type="VENDOR_ID"/>
<access op="invoke" privilege="administer"/>
</command>

Expand Down
Loading

0 comments on commit 2316569

Please sign in to comment.