From 2bfb41ed6b4bfa576bcd40bf35f651f71c138664 Mon Sep 17 00:00:00 2001
From: Terence Hampson <thampson@google.com>
Date: Tue, 13 Feb 2024 09:26:16 -0500
Subject: [PATCH] Update DGGEN_1_1 and DGGEN_2_3 to match latest testplan spec
 (#31998)

* Update DGGEN_1_1 and DGGEN_2_3 to match latest testplan spec

* Fix CI

* Fix CI

* Restyled by whitespace

* Restyled by prettier-yaml

* Fix CI

* Fix CI

* Quick fix

* Update based on PR comments

* Restyled by whitespace

---------

Co-authored-by: Restyled.io <commits@restyled.io>
---
 src/app/tests/suites/certification/PICS.yaml  | 10 +++
 .../certification/Test_TC_DGGEN_1_1.yaml      | 11 +++
 .../certification/Test_TC_DGGEN_2_3.yaml      | 68 ++++++++++++++++++-
 .../tests/suites/certification/ci-pics-values |  2 +
 4 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 2022b27bd22f12..d8bc862ba6c62c 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -3628,6 +3628,9 @@ PICS:
     - label: "Indicates that node is configured for test event triggers."
       id: DGGEN.S.C00.Rsp
 
+    - label: "Indicates cluster supports Payload Test Request."
+      id: DGGEN.S.C03.Rsp
+
     #
     # server / Events
     #
@@ -3649,6 +3652,13 @@ PICS:
     - label: "Indicates the reason that caused the device to reboot start-up."
       id: DGGEN.S.E03
 
+    #
+    # server / features
+    #
+    - label:
+          "Support specific commands needed for extended Data Model features."
+      id: DGGEN.S.F00
+
     #
     # client / attributes
     #
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
index fc10b3d02eeaba..6641fcf879939c 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml
@@ -40,9 +40,20 @@ tests:
               type: int16u
 
     - label: "Step 3: TH reads from the DUT the FeatureMap attribute."
+      PICS: "!DGGEN.S.F00"
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
+          value: 0
+          constraints:
+              type: bitmap32
+
+    - label: "Step 3: TH reads from the DUT the FeatureMap attribute."
+      PICS: DGGEN.S.F00
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 1
           constraints:
               type: bitmap32
 
diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
index 9690cafcf66c73..ba5ba54b9c22d7 100644
--- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_3.yaml
@@ -78,7 +78,21 @@ tests:
 
     - label:
           "Step 4: Invoke the TestEventTrigger command with EnableKey field set
-          to PIXIT.DGGEN.ENABLEKEY and EventTrigger field set to 0."
+          to all zeros and EventTrigger field set to 0."
+      PICS: DGGEN.S.C00.Rsp
+      command: "TestEventTrigger"
+      arguments:
+          values:
+              - name: "EnableKey"
+                value: "hex:00000000000000000000000000000000"
+              - name: "EventTrigger"
+                value: 0
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Step 5: Invoke the TestEventTrigger command with EnableKey field set
+          to 8-bytes to zeros and EventTrigger field set to 0."
       PICS: DGGEN.S.C00.Rsp
       command: "TestEventTrigger"
       arguments:
@@ -89,3 +103,55 @@ tests:
                 value: 0
       response:
           error: CONSTRAINT_ERROR
+
+    - label:
+          "Step 6: Invoke the PayloadTestRequest command with EnableKey field
+          set to PIXIT.DGGEN.ENABLEKEY, Value field set to 0x1 and Count set to
+          1."
+      runIf: IsExpectedValue
+      PICS: DGGEN.S.C03.Rsp
+      command: "PayloadTestRequest"
+      arguments:
+          values:
+              - name: "EnableKey"
+                value: PIXIT.DGGEN.ENABLEKEY
+              - name: "Value"
+                value: 0x1
+              - name: "Count"
+                value: 1
+      response:
+          - values:
+                - name: "Payload"
+                  value: "hex:01"
+
+    - label:
+          "Step 7: Invoke the PayloadTestRequest command with EnableKey field
+          set to all zeros, Value field set to 0x1 and Count set to 1."
+      PICS: DGGEN.S.C03.Rsp
+      command: "PayloadTestRequest"
+      arguments:
+          values:
+              - name: "EnableKey"
+                value: "hex:00000000000000000000000000000000"
+              - name: "Value"
+                value: 0x1
+              - name: "Count"
+                value: 1
+      response:
+          error: CONSTRAINT_ERROR
+
+    - label:
+          "Step 8: Invoke the PayloadTestRequest command with EnableKey field
+          set to 8-bytes to zeros, Value field set to 0x1 and Count set to 1."
+      PICS: DGGEN.S.C03.Rsp
+      command: "PayloadTestRequest"
+      arguments:
+          values:
+              - name: "EnableKey"
+                value: "hex:00000000000000000000000000000000"
+              - name: "Value"
+                value: 0x1
+              - name: "Count"
+                value: 1
+      response:
+          error: CONSTRAINT_ERROR
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 055a8101fc1f0f..edc5c30faea79d 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -931,10 +931,12 @@ DGGEN.S.A0006=1
 DGGEN.S.A0007=1
 DGGEN.S.A0008=1
 DGGEN.S.C00.Rsp=1
+DGGEN.S.C03.Rsp=1
 DGGEN.S.E00=1
 DGGEN.S.E01=1
 DGGEN.S.E02=1
 DGGEN.S.E03=1
+DGGEN.S.F00=1
 
 DGGEN.C=1
 DGGEN.C.A0000=1