[MatterYamlTests][darwin-framework-tool] Get GetCommissionerNodeId me…

…thod to work and update TestAccessControlConstraints.yaml to use it
project-chip · Sep 21, 2023 · 1752381 · 1752381
1 parent 82a3e3d
commit 1752381
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 35 deletions.
diff --git a/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.h b/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.h
@@ -31,5 +31,6 @@ CHIP_ERROR LogAttributeAsJSON(NSNumber * endpointId, NSNumber * clusterId, NSNum
 CHIP_ERROR LogCommandAsJSON(NSNumber * endpointId, NSNumber * clusterId, NSNumber * commandId, id result);
 CHIP_ERROR LogAttributeErrorAsJSON(NSNumber * endpointId, NSNumber * clusterId, NSNumber * attributeId, NSError * error);
 CHIP_ERROR LogCommandErrorAsJSON(NSNumber * endpointId, NSNumber * clusterId, NSNumber * commandId, NSError * error);
+CHIP_ERROR LogGetCommissionerNodeId(NSNumber * nodeId);
 void SetDelegate(RemoteDataModelLoggerDelegate * delegate);
 }; // namespace RemoteDataModelLogger
diff --git a/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm b/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm
@@ -34,6 +34,7 @@
 constexpr const char * kErrorIdKey = "error";
 constexpr const char * kClusterErrorIdKey = "clusterError";
 constexpr const char * kValueKey = "value";
+constexpr const char * kNodeIdKey = "nodeId";
 
 constexpr const char kBase64Header[] = "base64:";
 
@@ -191,5 +192,17 @@ CHIP_ERROR LogCommandErrorAsJSON(NSNumber * endpointId, NSNumber * clusterId, NS
     return LogError(value, status);
 }
 
+CHIP_ERROR LogGetCommissionerNodeId(NSNumber * value)
+{
+    VerifyOrReturnError(gDelegate != nullptr, CHIP_NO_ERROR);
+
+    Json::Value rootValue;
+    rootValue[kValueKey] = Json::Value();
+    rootValue[kValueKey][kNodeIdKey] = [value unsignedLongLongValue];
+
+    auto valueStr = JsonToString(rootValue);
+    return gDelegate->LogJSON(valueStr.c_str());
+}
+
 void SetDelegate(RemoteDataModelLoggerDelegate * delegate) { gDelegate = delegate; }
 }; // namespace RemoteDataModelLogger
diff --git a/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm b/examples/darwin-framework-tool/commands/pairing/GetCommissionerNodeIdCommand.mm
@@ -19,15 +19,17 @@
 #import <Matter/Matter.h>
 
 #include "GetCommissionerNodeIdCommand.h"
+#include "RemoteDataModelLogger.h"
 
 CHIP_ERROR GetCommissionerNodeIdCommand::RunCommand()
 {
     auto * controller = CurrentCommissioner();
     VerifyOrReturnError(nil != controller, CHIP_ERROR_INCORRECT_STATE);
 
-    ChipLogProgress(
-        chipTool, "Commissioner Node Id 0x" ChipLogFormatX64, ChipLogValueX64(controller.controllerNodeId.unsignedLongLongValue));
+    auto controllerNodeId = controller.controllerNodeId;
+    ChipLogProgress(chipTool, "Commissioner Node Id 0x" ChipLogFormatX64, ChipLogValueX64(controllerNodeId.unsignedLongLongValue));
 
+    ReturnErrorOnFailure(RemoteDataModelLogger::LogGetCommissionerNodeId(controllerNodeId));
     SetCommandExitStatus(CHIP_NO_ERROR);
     return CHIP_NO_ERROR;
 }
diff --git a/src/app/tests/suites/TestAccessControlConstraints.yaml b/src/app/tests/suites/TestAccessControlConstraints.yaml
@@ -28,21 +28,36 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Read the fabric index from the alpha fabric"
+      cluster: "Operational Credentials"
+      command: "readAttribute"
+      attribute: "CurrentFabricIndex"
+      response:
+          saveAs: alphaIndex
+
+    - label: "Read the commissioner node ID from the alpha fabric"
+      cluster: "CommissionerCommands"
+      command: "GetCommissionerNodeId"
+      response:
+          values:
+              - name: "nodeId"
+                saveAs: commissionerNodeIdAlpha
+
     - label: "Constraint error: PASE reserved for future (TC-ACL-2.4 step 29)"
       cluster: "Access Control"
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3,
                       AuthMode: 1, # PASE
                       Subjects: [],
@@ -61,14 +76,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 3, # Group
                       Subjects: [],
@@ -89,14 +104,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 6,
                       AuthMode: 2,
                       Subjects: null,
@@ -113,14 +128,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3,
                       AuthMode: 4, # INVALID
                       Subjects: [],
@@ -137,14 +152,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3,
                       AuthMode: 2,
                       Subjects: [0],
@@ -161,14 +176,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3,
                       AuthMode: 2,
                       Subjects: null,
@@ -189,14 +204,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3,
                       AuthMode: 2,
                       Subjects: null,
@@ -215,14 +230,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 6, # INVALID
                       AuthMode: 2, # CASE
                       Subjects: null,
@@ -241,14 +256,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3, # Operate
                       AuthMode: 2, # CASE
                       Subjects: ["18446744073709551615"],
@@ -269,14 +284,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3, # Operate
                       AuthMode: 2, # CASE
                       Subjects: ["18446744060824649728"],
@@ -295,14 +310,14 @@ tests:
       arguments:
           value: [
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 5, # Administer
                       AuthMode: 2, # CASE
-                      Subjects: [112233],
+                      Subjects: [commissionerNodeIdAlpha],
                       Targets: null,
                   },
                   {
-                      FabricIndex: 1,
+                      FabricIndex: alphaIndex,
                       Privilege: 3, # Operate
                       AuthMode: 2, # CASE
                       Subjects: ["18446744073709486080"],