@matter/model 0.11.9-alpha.0-20241205-ccf69a00a → 0.11.9-alpha.0-20241207-b604cfa44

package/src/standard/elements/OperationalCredentials.ts

@@ -15,16 +15,18 @@ import {
     DatatypeElement as Datatype
 } from "../../elements/index.js";
 
-export const OperationalCredentials = Cluster({
-    name: "OperationalCredentials", id: 0x3e, classification: "node", pics: "OPCREDS",
-    details: "This cluster is used to add or remove Node Operational credentials on a Commissionee or Node, as " +
-        "well as manage the associated Fabrics.",
-    xref: { document: "core", section: "11.18" },
-
-    children: [
-        Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 1 }),
-
-        Attribute({
+export const OperationalCredentials = Cluster(
+    {
+        name: "OperationalCredentials", id: 0x3e, classification: "node", pics: "OPCREDS",
+        details: "This cluster is used to add or remove Node Operational credentials on a Commissionee or Node, as " +
+            "well as manage the associated Fabrics.",
+        xref: { document: "core", section: "11.18" }
+    },
+
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 1 }),
+
+    Attribute(
+        {
             name: "Nocs", id: 0x0, type: "list", access: "R F A", conformance: "M",
             constraint: "max supportedFabrics", quality: "N C",
 
@@ -37,11 +39,14 @@ export const OperationalCredentials = Cluster({
                 "\n" +
                 "The number of entries in this list shall match the number of entries in the Fabrics attribute.",
 
-            xref: { document: "core", section: "11.18.5.1" },
-            children: [Field({ name: "entry", type: "NOCStruct" })]
-        }),
+            xref: { document: "core", section: "11.18.5.1" }
+        },
+
+        Field({ name: "entry", type: "NOCStruct" })
+    ),
 
-        Attribute({
+    Attribute(
+        {
             name: "Fabrics", id: 0x1, type: "list", access: "R F V", conformance: "M",
             constraint: "max supportedFabrics", quality: "N",
 
@@ -52,35 +57,38 @@ export const OperationalCredentials = Cluster({
                 "\n" +
                 "The number of entries in this list shall match the number of entries in the NOCs attribute.",
 
-            xref: { document: "core", section: "11.18.5.2" },
-            children: [Field({ name: "entry", type: "FabricDescriptorStruct" })]
-        }),
-
-        Attribute({
-            name: "SupportedFabrics", id: 0x2, type: "uint8", access: "R V", conformance: "M",
-            constraint: "5 to 254", quality: "F",
-            details: "This attribute contains the number of Fabrics that are supported by the device. This value is fixed " +
-                "for a particular device.",
-            xref: { document: "core", section: "11.18.5.3" }
-        }),
-
-        Attribute({
-            name: "CommissionedFabrics", id: 0x3, type: "uint8", access: "R V", conformance: "M",
-            constraint: "max supportedFabrics", quality: "N",
-
-            details: "This attribute contains the number of Fabrics to which the device is currently commissioned. This " +
-                "attribute shall be equal to the following:" +
-                "\n" +
-                "  • The number of entries in the NOCs attribute." +
-                "\n" +
-                "  • The number of entries in the Fabrics attribute." +
-                "\n" +
-                "Upon Factory Data Reset, this attribute shall be set to a default value of 0.",
-
-            xref: { document: "core", section: "11.18.5.4" }
-        }),
-
-        Attribute({
+            xref: { document: "core", section: "11.18.5.2" }
+        },
+
+        Field({ name: "entry", type: "FabricDescriptorStruct" })
+    ),
+
+    Attribute({
+        name: "SupportedFabrics", id: 0x2, type: "uint8", access: "R V", conformance: "M",
+        constraint: "5 to 254", quality: "F",
+        details: "This attribute contains the number of Fabrics that are supported by the device. This value is fixed " +
+            "for a particular device.",
+        xref: { document: "core", section: "11.18.5.3" }
+    }),
+
+    Attribute({
+        name: "CommissionedFabrics", id: 0x3, type: "uint8", access: "R V", conformance: "M",
+        constraint: "max supportedFabrics", quality: "N",
+
+        details: "This attribute contains the number of Fabrics to which the device is currently commissioned. This " +
+            "attribute shall be equal to the following:" +
+            "\n" +
+            "  • The number of entries in the NOCs attribute." +
+            "\n" +
+            "  • The number of entries in the Fabrics attribute." +
+            "\n" +
+            "Upon Factory Data Reset, this attribute shall be set to a default value of 0.",
+
+        xref: { document: "core", section: "11.18.5.4" }
+    }),
+
+    Attribute(
+        {
             name: "TrustedRootCertificates", id: 0x4, type: "list", access: "R V", conformance: "M",
             constraint: "max supportedFabrics[max 400]", quality: "N C",
 
@@ -99,33 +107,39 @@ export const OperationalCredentials = Cluster({
                 "\n" +
                 "Upon Factory Data Reset, this attribute shall be set to a default value whereby the list is empty.",
 
-            xref: { document: "core", section: "11.18.5.5" },
-            children: [Field({ name: "entry", type: "octstr" })]
-        }),
-
-        Attribute({
-            name: "CurrentFabricIndex", id: 0x5, type: "fabric-idx", access: "R V", conformance: "M",
-            default: 0,
-            details: "This attribute shall contain accessing fabric index." +
-                "\n" +
-                "This attribute is useful to contextualize Fabric-Scoped entries obtained from response commands or " +
-                "attribute reads, since a given Fabric may be referenced by a different Fabric Index locally on a " +
-                "remote Node.",
-            xref: { document: "core", section: "11.18.5.6" }
-        }),
-
-        Command({
+            xref: { document: "core", section: "11.18.5.5" }
+        },
+
+        Field({ name: "entry", type: "octstr" })
+    ),
+
+    Attribute({
+        name: "CurrentFabricIndex", id: 0x5, type: "fabric-idx", access: "R V", conformance: "M",
+        default: 0,
+        details: "This attribute shall contain accessing fabric index." +
+            "\n" +
+            "This attribute is useful to contextualize Fabric-Scoped entries obtained from response commands or " +
+            "attribute reads, since a given Fabric may be referenced by a different Fabric Index locally on a " +
+            "remote Node.",
+        xref: { document: "core", section: "11.18.5.6" }
+    }),
+
+    Command(
+        {
             name: "AttestationRequest", id: 0x0, access: "A", conformance: "M", direction: "request",
             response: "AttestationResponse",
             details: "This command shall be generated to request the Attestation Information, in the form of an " +
                 "AttestationResponse Command. If the AttestationNonce that is provided in the command is malformed, " +
                 "a recipient shall fail the command with a Status Code of INVALID_COMMAND. The AttestationNonce " +
                 "field shall be used in the computation of the Attestation Information.",
-            xref: { document: "core", section: "11.18.6.1" },
-            children: [Field({ name: "AttestationNonce", id: 0x0, type: "octstr", conformance: "M", constraint: "32" })]
-        }),
+            xref: { document: "core", section: "11.18.6.1" }
+        },
 
-        Command({
+        Field({ name: "AttestationNonce", id: 0x0, type: "octstr", conformance: "M", constraint: "32" })
+    ),
+
+    Command(
+        {
             name: "AttestationResponse", id: 0x1, conformance: "M", direction: "response",
 
             details: "This command shall be generated in response to an Attestation Request command." +
@@ -136,50 +150,52 @@ export const OperationalCredentials = Cluster({
                 "See Section F.2, “Device Attestation Response test vector” for an example computation of an " +
                 "AttestationResponse.",
 
-            xref: { document: "core", section: "11.18.6.2" },
-
-            children: [
-                Field({
-                    name: "AttestationElements", id: 0x0, type: "octstr", conformance: "M", constraint: "max 900",
-                    details: "This field shall contain the octet string of the serialized attestation_elements_message.",
-                    xref: { document: "core", section: "11.18.6.2.1" }
-                }),
-
-                Field({
-                    name: "AttestationSignature", id: 0x1, type: "octstr", conformance: "M", constraint: "64",
-                    details: "This field shall contain the octet string of the necessary attestation_signature as described in " +
-                        "Section 11.18.4.7, “Attestation Information”.",
-                    xref: { document: "core", section: "11.18.6.2.2" }
-                })
-            ]
+            xref: { document: "core", section: "11.18.6.2" }
+        },
+
+        Field({
+            name: "AttestationElements", id: 0x0, type: "octstr", conformance: "M", constraint: "max 900",
+            details: "This field shall contain the octet string of the serialized attestation_elements_message.",
+            xref: { document: "core", section: "11.18.6.2.1" }
         }),
 
-        Command({
+        Field({
+            name: "AttestationSignature", id: 0x1, type: "octstr", conformance: "M", constraint: "64",
+            details: "This field shall contain the octet string of the necessary attestation_signature as described in " +
+                "Section 11.18.4.7, “Attestation Information”.",
+            xref: { document: "core", section: "11.18.6.2.2" }
+        })
+    ),
+
+    Command(
+        {
             name: "CertificateChainRequest", id: 0x2, access: "A", conformance: "M", direction: "request",
             response: "CertificateChainResponse",
             details: "If the CertificateType is not a valid value per CertificateChainTypeEnum then the command shall " +
                 "fail with a Status Code of INVALID_COMMAND.",
-            xref: { document: "core", section: "11.18.6.3" },
-            children: [Field({
-                name: "CertificateType", id: 0x0, type: "CertificateChainTypeEnum", conformance: "M",
-                constraint: "desc"
-            })]
-        }),
+            xref: { document: "core", section: "11.18.6.3" }
+        },
+
+        Field({ name: "CertificateType", id: 0x0, type: "CertificateChainTypeEnum", conformance: "M", constraint: "desc" })
+    ),
 
-        Command({
+    Command(
+        {
             name: "CertificateChainResponse", id: 0x3, conformance: "M", direction: "response",
             details: "This command shall be generated in response to a CertificateChainRequest command.",
-            xref: { document: "core", section: "11.18.6.4" },
-
-            children: [Field({
-                name: "Certificate", id: 0x0, type: "octstr", conformance: "M", constraint: "max 600",
-                details: "This field shall be the DER encoded certificate corresponding to the CertificateType field in the " +
-                    "CertificateChainRequest command.",
-                xref: { document: "core", section: "11.18.6.4.1" }
-            })]
-        }),
+            xref: { document: "core", section: "11.18.6.4" }
+        },
+
+        Field({
+            name: "Certificate", id: 0x0, type: "octstr", conformance: "M", constraint: "max 600",
+            details: "This field shall be the DER encoded certificate corresponding to the CertificateType field in the " +
+                "CertificateChainRequest command.",
+            xref: { document: "core", section: "11.18.6.4.1" }
+        })
+    ),
 
-        Command({
+    Command(
+        {
             name: "CsrRequest", id: 0x4, access: "A", conformance: "M", direction: "request",
             response: "CsrResponse",
 
@@ -211,14 +227,15 @@ export const OperationalCredentials = Cluster({
                 "check had been executed, then this command shall fail with a FAILURE status code sent back to the " +
                 "initiator.",
 
-            xref: { document: "core", section: "11.18.6.5" },
-            children: [
-                Field({ name: "CsrNonce", id: 0x0, type: "octstr", conformance: "M", constraint: "32" }),
-                Field({ name: "IsForUpdateNoc", id: 0x1, type: "bool", conformance: "O", default: false })
-            ]
-        }),
+            xref: { document: "core", section: "11.18.6.5" }
+        },
 
-        Command({
+        Field({ name: "CsrNonce", id: 0x0, type: "octstr", conformance: "M", constraint: "32" }),
+        Field({ name: "IsForUpdateNoc", id: 0x1, type: "bool", conformance: "O", default: false })
+    ),
+
+    Command(
+        {
             name: "CsrResponse", id: 0x5, conformance: "M", direction: "response",
 
             details: "This command shall be generated in response to a CSRRequest Command." +
@@ -229,25 +246,25 @@ export const OperationalCredentials = Cluster({
                 "See Section F.3, “Node Operational CSR Response test vector” for an example computation of a " +
                 "CSRResponse.",
 
-            xref: { document: "core", section: "11.18.6.6" },
-
-            children: [
-                Field({
-                    name: "NocsrElements", id: 0x0, type: "octstr", conformance: "M", constraint: "max 900",
-                    details: "This field shall contain the octet string of the serialized nocsr_elements_message.",
-                    xref: { document: "core", section: "11.18.6.6.1" }
-                }),
-
-                Field({
-                    name: "AttestationSignature", id: 0x1, type: "octstr", conformance: "M", constraint: "64",
-                    details: "This field shall contain the octet string of the necessary attestation_signature as described in " +
-                        "Section 11.18.4.9, “NOCSR Information”.",
-                    xref: { document: "core", section: "11.18.6.6.2" }
-                })
-            ]
+            xref: { document: "core", section: "11.18.6.6" }
+        },
+
+        Field({
+            name: "NocsrElements", id: 0x0, type: "octstr", conformance: "M", constraint: "max 900",
+            details: "This field shall contain the octet string of the serialized nocsr_elements_message.",
+            xref: { document: "core", section: "11.18.6.6.1" }
         }),
 
-        Command({
+        Field({
+            name: "AttestationSignature", id: 0x1, type: "octstr", conformance: "M", constraint: "64",
+            details: "This field shall contain the octet string of the necessary attestation_signature as described in " +
+                "Section 11.18.4.9, “NOCSR Information”.",
+            xref: { document: "core", section: "11.18.6.6.2" }
+        })
+    ),
+
+    Command(
+        {
             name: "AddNoc", id: 0x6, access: "A", conformance: "M", direction: "request",
             response: "NocResponse",
 
@@ -262,156 +279,156 @@ export const OperationalCredentials = Cluster({
                 "A Commissioner or Administrator SHOULD issue this command after performing the Attestation " +
                 "Procedure.",
 
-            xref: { document: "core", section: "11.18.6.8" },
-
-            children: [
-                Field({ name: "NocValue", id: 0x0, type: "octstr", conformance: "M", constraint: "max 400" }),
-                Field({ name: "IcacValue", id: 0x1, type: "octstr", conformance: "O", constraint: "max 400" }),
-
-                Field({
-                    name: "IpkValue", id: 0x2, type: "octstr", conformance: "M", constraint: "16",
-
-                    details: "This field shall contain the value of the Epoch Key for the Identity Protection Key (IPK) to set " +
-                        "for the Fabric which is to be added. This is needed to bootstrap a necessary configuration value " +
-                        "for subsequent CASE to succeed. See Section 4.14.2.6.1, “Identity Protection Key (IPK)” for details." +
-                        "\n" +
-                        "The IPK shall be provided as an octet string of length CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES." +
-                        "\n" +
-                        "On successful execution of the AddNOC command, the side-effect of having provided this field shall " +
-                        "be equivalent to having done a GroupKeyManagement cluster KeySetWrite command invocation using the " +
-                        "newly joined fabric as the accessing fabric and with the following argument fields (assuming " +
-                        "KeySetWrite allowed a GroupKeySetID set to 0):",
-
-                    xref: { document: "core", section: "11.18.6.8.1" }
-                }),
-
-                Field({
-                    name: "CaseAdminSubject", id: 0x3, type: "subject-id", conformance: "M",
-
-                    details: "If the AddNOC command succeeds according to the semantics of the following subsections, then the " +
-                        "Access Control SubjectID shall be used to atomically add an Access Control Entry enabling that " +
-                        "Subject to subsequently administer the Node whose operational identity is being added by this " +
-                        "command." +
-                        "\n" +
-                        "The format of the new Access Control Entry, created from this, shall be:" +
-                        "\n" +
-                        "NOTE" +
-                        "\n" +
-                        "Unless such an Access Control Entry is added atomically as described here, there would be no way " +
-                        "for the caller on its given Fabric to eventually add another Access Control Entry for CASE " +
-                        "authentication mode, to enable the new Administrator to administer the device, since the Fabric " +
-                        "Scoping of the Access Control List prevents the current Node from being able to write new entries " +
-                        "scoped to that Fabric, if the session is established from CASE. While a session established from " +
-                        "PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide " +
-                        "symmetry between both types of session establishment, both of which need to eventually add an " +
-                        "\"Administer Node over CASE\" Access Control Entry to finalize new Fabric configuration and " +
-                        "subsequently be able to call the CommissioningComplete command.",
-
-                    xref: { document: "core", section: "11.18.6.8.2" }
-                }),
-
-                Field({
-                    name: "AdminVendorId", id: 0x4, type: "vendor-id", conformance: "M",
-
-                    details: "This field shall be set to the Vendor ID of the entity issuing the AddNOC command. This value shall " +
-                        "NOT be one of the reserved Vendor ID values defined in Table 1, “Vendor ID Allocations”." +
-                        "\n" +
-                        "### Effect When Received" +
-                        "\n" +
-                        "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
-                        "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
-                        "initiator." +
-                        "\n" +
-                        "If a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, " +
-                        "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
-                        "\n" +
-                        "If the prior CSRRequest state that preceded AddNOC had the IsForUpdateNOC field indicated as true, " +
-                        "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
-                        "\n" +
-                        "If no prior AddTrustedRootCertificate command was successfully executed within the fail-safe timer " +
-                        "period, then this command shall process an error by responding with a NOCResponse with a StatusCode " +
-                        "of InvalidNOC as described in Section 11.18.6.7.2, “Handling Errors”. In other words, AddNOC always " +
-                        "requires that the client provides the root of trust certificate within the same Fail- Safe context " +
-                        "as the rest of the new fabric’s operational credentials, even if some other fabric already uses the " +
-                        "exact same root of trust certificate." +
-                        "\n" +
-                        "If the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab" +
-                        "\n" +
-                        "ricID> pair already present on the device, then the device shall process the error by responding " +
-                        "with a StatusCode of FabricConflict as described in Section 11.18.6.7.2, “Handling Errors”." +
-                        "\n" +
-                        "If the device already has the CommissionedFabrics attribute equal to the SupportedFabrics " +
-                        "attribute, then the device’s operational credentials table is considered full and the device shall " +
-                        "process the error by responding with a StatusCode of TableFull as described in Section 11.18.6.7.2, " +
-                        "“Handling Errors”." +
-                        "\n" +
-                        "If the CaseAdminSubject field is not a valid ACL subject in the context of AuthMode set to CASE, " +
-                        "such as not being in either the Operational or CASE Authenticated Tag range, then the device shall " +
-                        "process the error by responding with a StatusCode of InvalidAdminSubject as described in Section " +
-                        "11.18.6.7.2, “Handling Errors”." +
-                        "\n" +
-                        "Otherwise, the command is considered an addition of credentials, also known as \"joining a fabric\", " +
-                        "and the following shall apply:" +
-                        "\n" +
-                        "  1. A new FabricIndex shall be allocated, taking the next valid fabric-index value in " +
-                        "      monotonically incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is " +
-                        "      reserved and using 255 (0xFF) would prevent cluster specifications from using nullable " +
-                        "      fabric-idx fields." +
-                        "\n" +
-                        "  2. An entry within the Fabrics attribute table shall be added, reflecting the matter-fabric-id " +
-                        "      RDN within the NOC’s subject, along with the public key of the trusted root of the chain and " +
-                        "      the AdminVendorID field." +
-                        "\n" +
-                        "  3. The operational key pair associated with the incoming NOC from the NOCValue, and generated by " +
-                        "      the prior CSRRequest command, shall be recorded for subsequent use during CASE within the " +
-                        "      fail-safe timer period (see Section 5.5, “Commissioning Flows”)." +
-                        "\n" +
-                        "  4. The incoming NOCValue and ICACValue (if present) shall be stored under the FabricIndex " +
-                        "      associated with the new Fabric Scope, along with the RootCACertificate provided with the " +
-                        "      prior successful AddTrustedRootCertificate command invoked in the same fail-safe period." +
-                        "\n" +
-                        "    a. Implementation of certificate chain storage may separate or otherwise encode the components " +
-                        "       of the array in implementation-specific ways, as long as they follow the correct format when " +
-                        "       being read from the NOCs list or used within other protocols such as CASE." +
-                        "\n" +
-                        "  5. The NOCs list shall reflect the incoming NOC from the NOCValue field and ICAC from the " +
-                        "      ICACValue field (if present)." +
-                        "\n" +
-                        "  6. The operational discovery service record shall immediately reflect the new Operational " +
-                        "      Identifier, such that the Node immediately begins to exist within the Fabric and becomes " +
-                        "      reachable over CASE under the new operational identity." +
-                        "\n" +
-                        "  7. The receiver shall create and add a new Access Control Entry using the CaseAdminSubject field " +
-                        "      to grant subsequent Administer access to an Administrator member of the new Fabric. It is " +
-                        "      recommended that the Administrator presented in CaseAdminSubject exist within the same entity " +
-                        "      that is currently invoking the AddNOC command, within another of the Fabrics of which it is a " +
-                        "      member." +
-                        "\n" +
-                        "  8. The incoming IPKValue shall be stored in the Fabric-scoped slot within the Group Key " +
-                        "      Management cluster (see KeySetWrite), for subsequent use during CASE." +
-                        "\n" +
-                        "  9. The Fabric Index associated with the armed fail-safe context (see Section 11.10.6.2, " +
-                        "      “ArmFailSafe Command”) shall be updated to match the Fabric Index just allocated." +
-                        "\n" +
-                        "  10. If the current secure session was established with PASE, the receiver shall:" +
-                        "\n" +
-                        "    a. Augment the secure session context with the FabricIndex generated above, such that " +
-                        "       subsequent interactions have the proper accessing fabric." +
-                        "\n" +
-                        "  11. If the current secure session was established with CASE, subsequent configuration of the " +
-                        "      newly installed Fabric requires the opening of a new CASE session from the Administrator from " +
-                        "      the Fabric just installed. This Administrator is the one listed in the CaseAdminSubject " +
-                        "      argument." +
-                        "\n" +
-                        "Thereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex " +
-                        "field matching the FabricIndex under which the new Node Operational Certificate (NOC) is scoped.",
-
-                    xref: { document: "core", section: "11.18.6.8.3" }
-                })
-            ]
+            xref: { document: "core", section: "11.18.6.8" }
+        },
+
+        Field({ name: "NocValue", id: 0x0, type: "octstr", conformance: "M", constraint: "max 400" }),
+        Field({ name: "IcacValue", id: 0x1, type: "octstr", conformance: "O", constraint: "max 400" }),
+
+        Field({
+            name: "IpkValue", id: 0x2, type: "octstr", conformance: "M", constraint: "16",
+
+            details: "This field shall contain the value of the Epoch Key for the Identity Protection Key (IPK) to set " +
+                "for the Fabric which is to be added. This is needed to bootstrap a necessary configuration value " +
+                "for subsequent CASE to succeed. See Section 4.14.2.6.1, “Identity Protection Key (IPK)” for details." +
+                "\n" +
+                "The IPK shall be provided as an octet string of length CRYPTO_SYMMETRIC_KEY_LENGTH_BYTES." +
+                "\n" +
+                "On successful execution of the AddNOC command, the side-effect of having provided this field shall " +
+                "be equivalent to having done a GroupKeyManagement cluster KeySetWrite command invocation using the " +
+                "newly joined fabric as the accessing fabric and with the following argument fields (assuming " +
+                "KeySetWrite allowed a GroupKeySetID set to 0):",
+
+            xref: { document: "core", section: "11.18.6.8.1" }
         }),
 
-        Command({
+        Field({
+            name: "CaseAdminSubject", id: 0x3, type: "subject-id", conformance: "M",
+
+            details: "If the AddNOC command succeeds according to the semantics of the following subsections, then the " +
+                "Access Control SubjectID shall be used to atomically add an Access Control Entry enabling that " +
+                "Subject to subsequently administer the Node whose operational identity is being added by this " +
+                "command." +
+                "\n" +
+                "The format of the new Access Control Entry, created from this, shall be:" +
+                "\n" +
+                "NOTE" +
+                "\n" +
+                "Unless such an Access Control Entry is added atomically as described here, there would be no way " +
+                "for the caller on its given Fabric to eventually add another Access Control Entry for CASE " +
+                "authentication mode, to enable the new Administrator to administer the device, since the Fabric " +
+                "Scoping of the Access Control List prevents the current Node from being able to write new entries " +
+                "scoped to that Fabric, if the session is established from CASE. While a session established from " +
+                "PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide " +
+                "symmetry between both types of session establishment, both of which need to eventually add an " +
+                "\"Administer Node over CASE\" Access Control Entry to finalize new Fabric configuration and " +
+                "subsequently be able to call the CommissioningComplete command.",
+
+            xref: { document: "core", section: "11.18.6.8.2" }
+        }),
+
+        Field({
+            name: "AdminVendorId", id: 0x4, type: "vendor-id", conformance: "M",
+
+            details: "This field shall be set to the Vendor ID of the entity issuing the AddNOC command. This value shall " +
+                "NOT be one of the reserved Vendor ID values defined in Table 1, “Vendor ID Allocations”." +
+                "\n" +
+                "### Effect When Received" +
+                "\n" +
+                "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
+                "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
+                "initiator." +
+                "\n" +
+                "If a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, " +
+                "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
+                "\n" +
+                "If the prior CSRRequest state that preceded AddNOC had the IsForUpdateNOC field indicated as true, " +
+                "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
+                "\n" +
+                "If no prior AddTrustedRootCertificate command was successfully executed within the fail-safe timer " +
+                "period, then this command shall process an error by responding with a NOCResponse with a StatusCode " +
+                "of InvalidNOC as described in Section 11.18.6.7.2, “Handling Errors”. In other words, AddNOC always " +
+                "requires that the client provides the root of trust certificate within the same Fail- Safe context " +
+                "as the rest of the new fabric’s operational credentials, even if some other fabric already uses the " +
+                "exact same root of trust certificate." +
+                "\n" +
+                "If the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab" +
+                "\n" +
+                "ricID> pair already present on the device, then the device shall process the error by responding " +
+                "with a StatusCode of FabricConflict as described in Section 11.18.6.7.2, “Handling Errors”." +
+                "\n" +
+                "If the device already has the CommissionedFabrics attribute equal to the SupportedFabrics " +
+                "attribute, then the device’s operational credentials table is considered full and the device shall " +
+                "process the error by responding with a StatusCode of TableFull as described in Section 11.18.6.7.2, " +
+                "“Handling Errors”." +
+                "\n" +
+                "If the CaseAdminSubject field is not a valid ACL subject in the context of AuthMode set to CASE, " +
+                "such as not being in either the Operational or CASE Authenticated Tag range, then the device shall " +
+                "process the error by responding with a StatusCode of InvalidAdminSubject as described in Section " +
+                "11.18.6.7.2, “Handling Errors”." +
+                "\n" +
+                "Otherwise, the command is considered an addition of credentials, also known as \"joining a fabric\", " +
+                "and the following shall apply:" +
+                "\n" +
+                "  1. A new FabricIndex shall be allocated, taking the next valid fabric-index value in " +
+                "      monotonically incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is " +
+                "      reserved and using 255 (0xFF) would prevent cluster specifications from using nullable " +
+                "      fabric-idx fields." +
+                "\n" +
+                "  2. An entry within the Fabrics attribute table shall be added, reflecting the matter-fabric-id " +
+                "      RDN within the NOC’s subject, along with the public key of the trusted root of the chain and " +
+                "      the AdminVendorID field." +
+                "\n" +
+                "  3. The operational key pair associated with the incoming NOC from the NOCValue, and generated by " +
+                "      the prior CSRRequest command, shall be recorded for subsequent use during CASE within the " +
+                "      fail-safe timer period (see Section 5.5, “Commissioning Flows”)." +
+                "\n" +
+                "  4. The incoming NOCValue and ICACValue (if present) shall be stored under the FabricIndex " +
+                "      associated with the new Fabric Scope, along with the RootCACertificate provided with the " +
+                "      prior successful AddTrustedRootCertificate command invoked in the same fail-safe period." +
+                "\n" +
+                "    a. Implementation of certificate chain storage may separate or otherwise encode the components " +
+                "       of the array in implementation-specific ways, as long as they follow the correct format when " +
+                "       being read from the NOCs list or used within other protocols such as CASE." +
+                "\n" +
+                "  5. The NOCs list shall reflect the incoming NOC from the NOCValue field and ICAC from the " +
+                "      ICACValue field (if present)." +
+                "\n" +
+                "  6. The operational discovery service record shall immediately reflect the new Operational " +
+                "      Identifier, such that the Node immediately begins to exist within the Fabric and becomes " +
+                "      reachable over CASE under the new operational identity." +
+                "\n" +
+                "  7. The receiver shall create and add a new Access Control Entry using the CaseAdminSubject field " +
+                "      to grant subsequent Administer access to an Administrator member of the new Fabric. It is " +
+                "      recommended that the Administrator presented in CaseAdminSubject exist within the same entity " +
+                "      that is currently invoking the AddNOC command, within another of the Fabrics of which it is a " +
+                "      member." +
+                "\n" +
+                "  8. The incoming IPKValue shall be stored in the Fabric-scoped slot within the Group Key " +
+                "      Management cluster (see KeySetWrite), for subsequent use during CASE." +
+                "\n" +
+                "  9. The Fabric Index associated with the armed fail-safe context (see Section 11.10.6.2, " +
+                "      “ArmFailSafe Command”) shall be updated to match the Fabric Index just allocated." +
+                "\n" +
+                "  10. If the current secure session was established with PASE, the receiver shall:" +
+                "\n" +
+                "    a. Augment the secure session context with the FabricIndex generated above, such that " +
+                "       subsequent interactions have the proper accessing fabric." +
+                "\n" +
+                "  11. If the current secure session was established with CASE, subsequent configuration of the " +
+                "      newly installed Fabric requires the opening of a new CASE session from the Administrator from " +
+                "      the Fabric just installed. This Administrator is the one listed in the CaseAdminSubject " +
+                "      argument." +
+                "\n" +
+                "Thereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex " +
+                "field matching the FabricIndex under which the new Node Operational Certificate (NOC) is scoped.",
+
+            xref: { document: "core", section: "11.18.6.8.3" }
+        })
+    ),
+
+    Command(
+        {
             name: "UpdateNoc", id: 0x7, access: "F A", conformance: "M", direction: "request",
             response: "NocResponse",
 
@@ -474,15 +491,16 @@ export const OperationalCredentials = Cluster({
                 "Thereafter, the Node shall respond with an NOCResponse with a StatusCode of OK and a FabricIndex " +
                 "field matching the FabricIndex under which the updated NOC is scoped.",
 
-            xref: { document: "core", section: "11.18.6.9" },
-            children: [
-                Field({ name: "NocValue", id: 0x0, type: "octstr", access: "F", conformance: "M", constraint: "max 400" }),
-                Field({ name: "IcacValue", id: 0x1, type: "octstr", access: "F", conformance: "O", constraint: "max 400" }),
-                Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
-            ]
-        }),
+            xref: { document: "core", section: "11.18.6.9" }
+        },
 
-        Command({
+        Field({ name: "NocValue", id: 0x0, type: "octstr", access: "F", conformance: "M", constraint: "max 400" }),
+        Field({ name: "IcacValue", id: 0x1, type: "octstr", access: "F", conformance: "O", constraint: "max 400" }),
+        Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
+    ),
+
+    Command(
+        {
             name: "NocResponse", id: 0x8, conformance: "M", direction: "response",
 
             details: "This command shall be generated in response to the following commands:" +
@@ -497,33 +515,33 @@ export const OperationalCredentials = Cluster({
                 "\n" +
                 "It provides status information about the success or failure of those commands.",
 
-            xref: { document: "core", section: "11.18.6.10" },
-
-            children: [
-                Field({
-                    name: "StatusCode", id: 0x0, type: "NodeOperationalCertStatusEnum", conformance: "M",
-                    details: "This field shall contain an NOCStatus value representing the status of an operation involving a NOC.",
-                    xref: { document: "core", section: "11.18.6.10.1" }
-                }),
-
-                Field({
-                    name: "FabricIndex", id: 0x1, type: "fabric-idx", conformance: "O", constraint: "1 to 254",
-                    details: "This field shall be present whenever StatusCode has a value of OK. If present, it shall contain the " +
-                        "Fabric Index of the Fabric last added, removed or updated.",
-                    xref: { document: "core", section: "11.18.6.10.2" }
-                }),
-
-                Field({
-                    name: "DebugText", id: 0x2, type: "string", conformance: "O", constraint: "max 128",
-                    details: "This field may contain debugging textual information from the cluster implementation, which SHOULD " +
-                        "NOT be presented to user interfaces in any way. Its purpose is to help developers in " +
-                        "troubleshooting errors and the contents may go into logs or crash reports.",
-                    xref: { document: "core", section: "11.18.6.10.3" }
-                })
-            ]
+            xref: { document: "core", section: "11.18.6.10" }
+        },
+
+        Field({
+            name: "StatusCode", id: 0x0, type: "NodeOperationalCertStatusEnum", conformance: "M",
+            details: "This field shall contain an NOCStatus value representing the status of an operation involving a NOC.",
+            xref: { document: "core", section: "11.18.6.10.1" }
         }),
 
-        Command({
+        Field({
+            name: "FabricIndex", id: 0x1, type: "fabric-idx", conformance: "O", constraint: "1 to 254",
+            details: "This field shall be present whenever StatusCode has a value of OK. If present, it shall contain the " +
+                "Fabric Index of the Fabric last added, removed or updated.",
+            xref: { document: "core", section: "11.18.6.10.2" }
+        }),
+
+        Field({
+            name: "DebugText", id: 0x2, type: "string", conformance: "O", constraint: "max 128",
+            details: "This field may contain debugging textual information from the cluster implementation, which SHOULD " +
+                "NOT be presented to user interfaces in any way. Its purpose is to help developers in " +
+                "troubleshooting errors and the contents may go into logs or crash reports.",
+            xref: { document: "core", section: "11.18.6.10.3" }
+        })
+    ),
+
+    Command(
+        {
             name: "UpdateFabricLabel", id: 0x9, access: "F A", conformance: "M", direction: "request",
             response: "NocResponse",
 
@@ -540,38 +558,38 @@ export const OperationalCredentials = Cluster({
                 "be used by Administrators to provide additional per-fabric context when operations such as " +
                 "RemoveFabric are considered or used.",
 
-            xref: { document: "core", section: "11.18.6.11" },
-
-            children: [
-                Field({
-                    name: "Label", id: 0x0, type: "string", access: "F", conformance: "M", constraint: "max 32",
-
-                    details: "This field shall contain the label to set for the fabric associated with the current secure session." +
-                        "\n" +
-                        "Effect on Receipt" +
-                        "\n" +
-                        "If the Label field is identical to a Label already in use by a Fabric within the Fabrics list that " +
-                        "is not the accessing fabric, then an NOCResponse with a StatusCode of LabelConflict shall be " +
-                        "returned for the command and there shall NOT be any permanent changes to any Fabric data." +
-                        "\n" +
-                        "Otherwise, the Label field for the accessing fabric shall immediately be updated to reflect the " +
-                        "Label argument provided. Following the update, an NOCResponse with a StatusCode of OK shall be " +
-                        "returned." +
-                        "\n" +
-                        "If the command was invoked within a fail-safe context after a successful UpdateNOC command, then " +
-                        "the label update shall apply to the pending update state that will be reverted if fail-safe expires " +
-                        "prior to a CommissioningComplete command. In other words, label updates apply to the state of the " +
-                        "Fabrics Attribute as currently visible, even for an existing fabric currently in process of being " +
-                        "updated.",
-
-                    xref: { document: "core", section: "11.18.6.11.1" }
-                }),
-
-                Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
-            ]
+            xref: { document: "core", section: "11.18.6.11" }
+        },
+
+        Field({
+            name: "Label", id: 0x0, type: "string", access: "F", conformance: "M", constraint: "max 32",
+
+            details: "This field shall contain the label to set for the fabric associated with the current secure session." +
+                "\n" +
+                "Effect on Receipt" +
+                "\n" +
+                "If the Label field is identical to a Label already in use by a Fabric within the Fabrics list that " +
+                "is not the accessing fabric, then an NOCResponse with a StatusCode of LabelConflict shall be " +
+                "returned for the command and there shall NOT be any permanent changes to any Fabric data." +
+                "\n" +
+                "Otherwise, the Label field for the accessing fabric shall immediately be updated to reflect the " +
+                "Label argument provided. Following the update, an NOCResponse with a StatusCode of OK shall be " +
+                "returned." +
+                "\n" +
+                "If the command was invoked within a fail-safe context after a successful UpdateNOC command, then " +
+                "the label update shall apply to the pending update state that will be reverted if fail-safe expires " +
+                "prior to a CommissioningComplete command. In other words, label updates apply to the state of the " +
+                "Fabrics Attribute as currently visible, even for an existing fabric currently in process of being " +
+                "updated.",
+
+            xref: { document: "core", section: "11.18.6.11.1" }
         }),
 
-        Command({
+        Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
+    ),
+
+    Command(
+        {
             name: "RemoveFabric", id: 0xa, access: "A", conformance: "M", direction: "request",
             response: "NocResponse",
 
@@ -593,58 +611,60 @@ export const OperationalCredentials = Cluster({
                 "Domain’s party of the removal. Otherwise, users may only observe the removal of a Fabric " +
                 "association as persistently failing attempts to reach a Node operationally.",
 
-            xref: { document: "core", section: "11.18.6.12" },
-
-            children: [Field({
-                name: "FabricIndex", id: 0x0, type: "fabric-idx", conformance: "M", constraint: "1 to 254",
-
-                details: "This field shall contain the Fabric Index reference (see fabric-index) associated with the Fabric " +
-                    "which is to be removed from the device." +
-                    "\n" +
-                    "Effect on Receipt" +
-                    "\n" +
-                    "If the FabricIndex field does not match the FabricIndex of any entry within the Fabrics list, then " +
-                    "an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and there " +
-                    "shall NOT be any permanent changes to any device data." +
-                    "\n" +
-                    "Otherwise, one of the following outcomes shall occur:" +
-                    "\n" +
-                    "  1. If the FabricIndex matches the last remaining entry in the Fabrics list, then the device shall " +
-                    "     delete all Matter related data on the node which was created since it was commissioned. This" +
-                    "\n" +
-                    "includes all Fabric-Scoped data, including Access Control List, bindings, scenes, group keys, " +
-                    "operational certificates, etc. All Trusted Roots shall also be removed. If a time synchronization " +
-                    "cluster is present on the Node, the TrustedTimeSource and DefaultNtp shall be set to null. Any " +
-                    "Matter related data including logs, secure sessions, exchanges and interaction model constructs " +
-                    "shall also be removed. Since this operation involves the removal of the secure session data that " +
-                    "may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a " +
-                    "response before terminating its secure session with the target." +
-                    "\n" +
-                    "2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the " +
-                    "process of irrevocably deleting all associated Fabric-Scoped data, including Access Control List, " +
-                    "bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer " +
-                    "referenced by any operational certificate shall also be removed. If a time synchronization cluster " +
-                    "is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the " +
-                    "TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model " +
-                    "constructs related to the Operational Identity under the given Fabric shall also be removed. " +
-                    "Following the removal, an NOCResponse with a StatusCode of OK shall be returned." +
-                    "\n" +
-                    "3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process of " +
-                    "irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, bindings, " +
-                    "group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any " +
-                    "operational certificate shall also be removed. If a time synchronization cluster is present on the " +
-                    "Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource " +
-                    "shall be set to null. All secure sessions, exchanges and interaction model constructs related to " +
-                    "the Operational Identity under the given Fabric shall also be removed. Since this operation " +
-                    "involves the removal of the secure session data that may underpin the current set of exchanges, the " +
-                    "Node invoking the command SHOULD NOT expect a response before terminating its secure session with " +
-                    "the target.",
-
-                xref: { document: "core", section: "11.18.6.12.1" }
-            })]
-        }),
+            xref: { document: "core", section: "11.18.6.12" }
+        },
+
+        Field({
+            name: "FabricIndex", id: 0x0, type: "fabric-idx", conformance: "M", constraint: "1 to 254",
+
+            details: "This field shall contain the Fabric Index reference (see fabric-index) associated with the Fabric " +
+                "which is to be removed from the device." +
+                "\n" +
+                "Effect on Receipt" +
+                "\n" +
+                "If the FabricIndex field does not match the FabricIndex of any entry within the Fabrics list, then " +
+                "an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and there " +
+                "shall NOT be any permanent changes to any device data." +
+                "\n" +
+                "Otherwise, one of the following outcomes shall occur:" +
+                "\n" +
+                "  1. If the FabricIndex matches the last remaining entry in the Fabrics list, then the device shall " +
+                "     delete all Matter related data on the node which was created since it was commissioned. This" +
+                "\n" +
+                "includes all Fabric-Scoped data, including Access Control List, bindings, scenes, group keys, " +
+                "operational certificates, etc. All Trusted Roots shall also be removed. If a time synchronization " +
+                "cluster is present on the Node, the TrustedTimeSource and DefaultNtp shall be set to null. Any " +
+                "Matter related data including logs, secure sessions, exchanges and interaction model constructs " +
+                "shall also be removed. Since this operation involves the removal of the secure session data that " +
+                "may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a " +
+                "response before terminating its secure session with the target." +
+                "\n" +
+                "2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the " +
+                "process of irrevocably deleting all associated Fabric-Scoped data, including Access Control List, " +
+                "bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer " +
+                "referenced by any operational certificate shall also be removed. If a time synchronization cluster " +
+                "is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the " +
+                "TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model " +
+                "constructs related to the Operational Identity under the given Fabric shall also be removed. " +
+                "Following the removal, an NOCResponse with a StatusCode of OK shall be returned." +
+                "\n" +
+                "3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process of " +
+                "irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, bindings, " +
+                "group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any " +
+                "operational certificate shall also be removed. If a time synchronization cluster is present on the " +
+                "Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource " +
+                "shall be set to null. All secure sessions, exchanges and interaction model constructs related to " +
+                "the Operational Identity under the given Fabric shall also be removed. Since this operation " +
+                "involves the removal of the secure session data that may underpin the current set of exchanges, the " +
+                "Node invoking the command SHOULD NOT expect a response before terminating its secure session with " +
+                "the target.",
+
+            xref: { document: "core", section: "11.18.6.12.1" }
+        })
+    ),
 
-        Command({
+    Command(
+        {
             name: "AddTrustedRootCertificate", id: 0xb, access: "A", conformance: "M", direction: "request",
             response: "status",
 
@@ -675,160 +695,141 @@ export const OperationalCredentials = Cluster({
                 "Note that the only method of removing a trusted root is by removing the Fabric that uses it as its " +
                 "root of trust using the RemoveFabric command.",
 
-            xref: { document: "core", section: "11.18.6.13" },
-            children: [
-                Field({ name: "RootCaCertificate", id: 0x0, type: "octstr", conformance: "M", constraint: "max 400" })
-            ]
-        }),
+            xref: { document: "core", section: "11.18.6.13" }
+        },
 
-        Datatype({
+        Field({ name: "RootCaCertificate", id: 0x0, type: "octstr", conformance: "M", constraint: "max 400" })
+    ),
+
+    Datatype(
+        {
             name: "CertificateChainTypeEnum", type: "enum8",
             details: "This enumeration is used by the CertificateChainRequest command to convey which certificate from " +
                 "the device attestation certificate chain to transmit back to the client.",
-            xref: { document: "core", section: "11.18.4.2" },
-
-            children: [
-                Field({
-                    name: "DacCertificate", id: 0x1, conformance: "M",
-                    description: "Request the DER- encoded DAC certificate"
-                }),
-                Field({
-                    name: "PaiCertificate", id: 0x2, conformance: "M",
-                    description: "Request the DER- encoded PAI certificate"
-                })
-            ]
-        }),
+            xref: { document: "core", section: "11.18.4.2" }
+        },
 
-        Datatype({
+        Field({ name: "DacCertificate", id: 0x1, conformance: "M", description: "Request the DER- encoded DAC certificate" }),
+        Field({ name: "PaiCertificate", id: 0x2, conformance: "M", description: "Request the DER- encoded PAI certificate" })
+    ),
+
+    Datatype(
+        {
             name: "NodeOperationalCertStatusEnum", type: "enum8",
             details: "This enumeration is used by the NOCResponse common response command to convey detailed outcome of " +
                 "several of this cluster’s operations.",
-            xref: { document: "core", section: "11.18.4.3" },
-
-            children: [
-                Field({ name: "Ok", id: 0x0, conformance: "M", description: "OK, no error" }),
-                Field({
-                    name: "InvalidPublicKey", id: 0x1, conformance: "M",
-                    description: "Public Key in the NOC does not match the public key in the NOCSR"
-                }),
-                Field({
-                    name: "InvalidNodeOpId", id: 0x2, conformance: "M",
-                    description: "The Node Operational ID in the NOC is not formatted correctly."
-                }),
-                Field({
-                    name: "InvalidNoc", id: 0x3, conformance: "M",
-                    description: "Any other validation error in NOC chain"
-                }),
-                Field({
-                    name: "MissingCsr", id: 0x4, conformance: "M",
-                    description: "No record of prior CSR for which this NOC could match"
-                }),
-                Field({
-                    name: "TableFull", id: 0x5, conformance: "M",
-                    description: "NOCs table full, cannot add another one"
-                }),
-                Field({
-                    name: "InvalidAdminSubject", id: 0x6, conformance: "M",
-                    description: "Invalid CaseAdminSubject field for an AddNOC command."
-                }),
-                Field({
-                    name: "FabricConflict", id: 0x9, conformance: "M",
-                    description: "Trying to AddNOC instead of UpdateNOC against an existing Fabric."
-                }),
-                Field({
-                    name: "LabelConflict", id: 0xa, conformance: "M",
-                    description: "Label already exists on another Fabric."
-                }),
-                Field({
-                    name: "InvalidFabricIndex", id: 0xb, conformance: "M",
-                    description: "FabricIndex argument is invalid."
-                })
-            ]
+            xref: { document: "core", section: "11.18.4.3" }
+        },
+
+        Field({ name: "Ok", id: 0x0, conformance: "M", description: "OK, no error" }),
+        Field({
+            name: "InvalidPublicKey", id: 0x1, conformance: "M",
+            description: "Public Key in the NOC does not match the public key in the NOCSR"
+        }),
+        Field({
+            name: "InvalidNodeOpId", id: 0x2, conformance: "M",
+            description: "The Node Operational ID in the NOC is not formatted correctly."
+        }),
+        Field({ name: "InvalidNoc", id: 0x3, conformance: "M", description: "Any other validation error in NOC chain" }),
+        Field({
+            name: "MissingCsr", id: 0x4, conformance: "M",
+            description: "No record of prior CSR for which this NOC could match"
+        }),
+        Field({ name: "TableFull", id: 0x5, conformance: "M", description: "NOCs table full, cannot add another one" }),
+        Field({
+            name: "InvalidAdminSubject", id: 0x6, conformance: "M",
+            description: "Invalid CaseAdminSubject field for an AddNOC command."
+        }),
+        Field({
+            name: "FabricConflict", id: 0x9, conformance: "M",
+            description: "Trying to AddNOC instead of UpdateNOC against an existing Fabric."
         }),
+        Field({ name: "LabelConflict", id: 0xa, conformance: "M", description: "Label already exists on another Fabric." }),
+        Field({ name: "InvalidFabricIndex", id: 0xb, conformance: "M", description: "FabricIndex argument is invalid." })
+    ),
 
-        Datatype({
+    Datatype(
+        {
             name: "NOCStruct", type: "struct",
             details: "This encodes a fabric sensitive NOC chain, underpinning a commissioned Operational Identity for a " +
                 "given Node." +
                 "\n" +
                 "Note that the Trusted Root CA Certificate is not included in this structure. The roots are " +
                 "available in the TrustedRootCertificates attribute of the Node Operational Credentials cluster.",
-            xref: { document: "core", section: "11.18.4.4" },
-
-            children: [
-                Field({
-                    name: "Noc", id: 0x1, type: "octstr", access: "S", conformance: "M", constraint: "max 400",
-                    details: "This field shall contain the NOC for the struct’s associated fabric, encoded using Matter " +
-                        "Certificate Encoding.",
-                    xref: { document: "core", section: "11.18.4.4.1" }
-                }),
-
-                Field({
-                    name: "Icac", id: 0x2, type: "octstr", access: "S", conformance: "M", constraint: "max 400",
-                    quality: "X",
-                    details: "This field shall contain the ICAC or the struct’s associated fabric, encoded using Matter " +
-                        "Certificate Encoding. If no ICAC is present in the chain, this field shall be set to null.",
-                    xref: { document: "core", section: "11.18.4.4.2" }
-                }),
-
-                Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
-            ]
+            xref: { document: "core", section: "11.18.4.4" }
+        },
+
+        Field({
+            name: "Noc", id: 0x1, type: "octstr", access: "S", conformance: "M", constraint: "max 400",
+            details: "This field shall contain the NOC for the struct’s associated fabric, encoded using Matter " +
+                "Certificate Encoding.",
+            xref: { document: "core", section: "11.18.4.4.1" }
         }),
 
-        Datatype({
+        Field({
+            name: "Icac", id: 0x2, type: "octstr", access: "S", conformance: "M", constraint: "max 400",
+            quality: "X",
+            details: "This field shall contain the ICAC or the struct’s associated fabric, encoded using Matter " +
+                "Certificate Encoding. If no ICAC is present in the chain, this field shall be set to null.",
+            xref: { document: "core", section: "11.18.4.4.2" }
+        }),
+
+        Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
+    ),
+
+    Datatype(
+        {
             name: "FabricDescriptorStruct", type: "struct",
             details: "This structure encodes a Fabric Reference for a fabric within which a given Node is currently " +
                 "commissioned.",
-            xref: { document: "core", section: "11.18.4.5" },
-
-            children: [
-                Field({
-                    name: "RootPublicKey", id: 0x1, type: "octstr", access: "F", conformance: "M", constraint: "65",
-                    details: "This field shall contain the public key for the trusted root that scopes the fabric referenced by " +
-                        "FabricIndex and its associated operational credential (see Section 6.4.5.3, “Trusted Root CA " +
-                        "Certificates”). The format for the key shall be the same as that used in the ec-pub-key field of " +
-                        "the Matter Certificate Encoding for the root in the operational certificate chain.",
-                    xref: { document: "core", section: "11.18.4.5.1" }
-                }),
-
-                Field({
-                    name: "VendorId", id: 0x2, type: "vendor-id", access: "F", conformance: "M", constraint: "desc",
-                    details: "This field shall contain the value of AdminVendorID provided in the AddNOC command that led to the " +
-                        "creation of this FabricDescriptorStruct. The set of allowed values is defined in AdminVendorID." +
-                        "\n" +
-                        "The intent is to provide some measure of user transparency about which entities have Administer " +
-                        "privileges on the Node.",
-                    xref: { document: "core", section: "11.18.4.5.2" }
-                }),
-
-                Field({
-                    name: "FabricId", id: 0x3, type: "fabric-id", access: "F", conformance: "M",
-                    details: "This field shall contain the FabricID allocated to the fabric referenced by FabricIndex. This field " +
-                        "shall match the value found in the matter-fabric-id field from the operational certificate " +
-                        "providing the operational identity under this Fabric.",
-                    xref: { document: "core", section: "11.18.4.5.3" }
-                }),
-
-                Field({
-                    name: "NodeId", id: 0x4, type: "node-id", access: "F", conformance: "M",
-                    details: "This field shall contain the NodeID in use within the fabric referenced by FabricIndex. This field " +
-                        "shall match the value found in the matter-node-id field from the operational certificate providing " +
-                        "this operational identity.",
-                    xref: { document: "core", section: "11.18.4.5.4" }
-                }),
-
-                Field({
-                    name: "Label", id: 0x5, type: "string", access: "F", conformance: "M", constraint: "max 32",
-                    default: "",
-                    details: "This field shall contain a commissioner-set label for the fabric referenced by FabricIndex. This " +
-                        "label is set by the UpdateFabricLabel command.",
-                    xref: { document: "core", section: "11.18.4.5.5" }
-                }),
-
-                Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
-            ]
-        })
-    ]
-});
+            xref: { document: "core", section: "11.18.4.5" }
+        },
+
+        Field({
+            name: "RootPublicKey", id: 0x1, type: "octstr", access: "F", conformance: "M", constraint: "65",
+            details: "This field shall contain the public key for the trusted root that scopes the fabric referenced by " +
+                "FabricIndex and its associated operational credential (see Section 6.4.5.3, “Trusted Root CA " +
+                "Certificates”). The format for the key shall be the same as that used in the ec-pub-key field of " +
+                "the Matter Certificate Encoding for the root in the operational certificate chain.",
+            xref: { document: "core", section: "11.18.4.5.1" }
+        }),
+
+        Field({
+            name: "VendorId", id: 0x2, type: "vendor-id", access: "F", conformance: "M", constraint: "desc",
+            details: "This field shall contain the value of AdminVendorID provided in the AddNOC command that led to the " +
+                "creation of this FabricDescriptorStruct. The set of allowed values is defined in AdminVendorID." +
+                "\n" +
+                "The intent is to provide some measure of user transparency about which entities have Administer " +
+                "privileges on the Node.",
+            xref: { document: "core", section: "11.18.4.5.2" }
+        }),
+
+        Field({
+            name: "FabricId", id: 0x3, type: "fabric-id", access: "F", conformance: "M",
+            details: "This field shall contain the FabricID allocated to the fabric referenced by FabricIndex. This field " +
+                "shall match the value found in the matter-fabric-id field from the operational certificate " +
+                "providing the operational identity under this Fabric.",
+            xref: { document: "core", section: "11.18.4.5.3" }
+        }),
+
+        Field({
+            name: "NodeId", id: 0x4, type: "node-id", access: "F", conformance: "M",
+            details: "This field shall contain the NodeID in use within the fabric referenced by FabricIndex. This field " +
+                "shall match the value found in the matter-node-id field from the operational certificate providing " +
+                "this operational identity.",
+            xref: { document: "core", section: "11.18.4.5.4" }
+        }),
+
+        Field({
+            name: "Label", id: 0x5, type: "string", access: "F", conformance: "M", constraint: "max 32",
+            default: "",
+            details: "This field shall contain a commissioner-set label for the fabric referenced by FabricIndex. This " +
+                "label is set by the UpdateFabricLabel command.",
+            xref: { document: "core", section: "11.18.4.5.5" }
+        }),
+
+        Field({ name: "FabricIndex", id: 0xfe, type: "FabricIndex" })
+    )
+);
 
 MatterDefinition.children.push(OperationalCredentials);