Fixes issue: 65, 62

Modified tests: TC-G-2.2 TC-G-2.3 TC-G-2.4 TC-SC-5.3
project-chip · Nov 23, 2023 · cf17256 · cf17256
1 parent 6bdae2d
commit cf17256
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 33 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml
@@ -46,11 +46,12 @@ tests:
     - label:
           "Step 1a: TH sends KeySetWrite command in the GroupKeyManagement
           cluster to DUT on EP0 using a key that is pre-installed on the TH.
-          GroupKeySet fields are as follows: GroupKeySetID: 1
-          GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
-          0d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1:
-          0d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2:
-          0d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002"
+          GroupKeySet fields are as follows: GroupKeySetID: 1,
+          GroupKeySecurityPolicy: TrustFirst (0), EpochKey0:
+          d0d1d2d3d4d5d6d7d8d9dadbdcdddedf, EpochStartTime0: 1, EpochKey1:
+          d1d1d2d3d4d5d6d7d8d9dadbdcdddedf, EpochStartTime1:
+          18446744073709551613, EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf,
+          EpochStartTime2: 18446744073709551614"
       verification: |
           ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0
 

diff --git a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml
@@ -48,9 +48,10 @@ tests:
           cluster to DUT on EP0 using a key that is pre-installed on the TH.
           GroupKeySet fields are as follows: GroupKeySetID: 1
           GroupKeySecurityPolicy: TrustFirst (0) EpochKey0:
-          d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1:
-          d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2:
-          d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002"
+          d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 1 EpochKey1:
+          d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 18446744073709551613
+          EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2:
+          18446744073709551614"
       verification: |
           ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0
 

diff --git a/src/app/tests/suites/certification/Test_TC_G_2_4.yaml b/src/app/tests/suites/certification/Test_TC_G_2_4.yaml
@@ -70,11 +70,11 @@ tests:
                         GroupKeySetID: 1,
                         GroupKeySecurityPolicy: 0,
                         EpochKey0: "hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf",
-                        EpochStartTime0: 2220000,
+                        EpochStartTime0: 1,
                         EpochKey1: "hex:d1d1d2d3d4d5d6d7d8d9dadbdcdddedf",
-                        EpochStartTime1: 2220001,
+                        EpochStartTime1: 18446744073709551613,
                         EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf",
-                        EpochStartTime2: 2220002,
+                        EpochStartTime2: 18446744073709551614,
                     }
 
     - label:

diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml
@@ -350,8 +350,8 @@ tests:
           [1686319509.379782][8834:8834] CHIP:EM: Handling via exchange: 28261r, Delegate: 0x558cfb749be8
           [1686319509.379795][8834:8834] CHIP:DMG: InvokeRequestMessage =
           [1686319509.379797][8834:8834] CHIP:DMG: {
-          [1686319509.379800][8834:8834] CHIP:DMG:         suppressResponse = false,
-          [1686319509.379803][8834:8834] CHIP:DMG:         timedRequest = false,
+          [1686319509.379800][8834:8834] CHIP:DMG:         suppressResponse = false, 
+          [1686319509.379803][8834:8834] CHIP:DMG:         timedRequest = false, 
           [1686319509.379805][8834:8834] CHIP:DMG:         InvokeRequests =
           [1686319509.379810][8834:8834] CHIP:DMG:         [
           [1686319509.379813][8834:8834] CHIP:DMG:                 CommandDataIB =
@@ -361,16 +361,16 @@ tests:
           [1686319509.379825][8834:8834] CHIP:DMG:                                 ClusterId = 0x4,
           [1686319509.379828][8834:8834] CHIP:DMG:                                 CommandId = 0x0,
           [1686319509.379831][8834:8834] CHIP:DMG:                         },
-          [1686319509.379834][8834:8834] CHIP:DMG:
-          [1686319509.379837][8834:8834] CHIP:DMG:                         CommandFields =
+          [1686319509.379834][8834:8834] CHIP:DMG:                         
+          [1686319509.379837][8834:8834] CHIP:DMG:                         CommandFields = 
           [1686319509.379840][8834:8834] CHIP:DMG:                         {
-          [1686319509.379844][8834:8834] CHIP:DMG:                                 0x0 = 257,
-          [1686319509.379847][8834:8834] CHIP:DMG:                                 0x1 = "grp2" (4 chars),
+          [1686319509.379844][8834:8834] CHIP:DMG:                                 0x0 = 257, 
+          [1686319509.379847][8834:8834] CHIP:DMG:                                 0x1 = "grp2" (4 chars), 
           [1686319509.379851][8834:8834] CHIP:DMG:                         },
           [1686319509.379854][8834:8834] CHIP:DMG:                 },
-          [1686319509.379858][8834:8834] CHIP:DMG:
+          [1686319509.379858][8834:8834] CHIP:DMG:                 
           [1686319509.379860][8834:8834] CHIP:DMG:         ],
-          [1686319509.379865][8834:8834] CHIP:DMG:
+          [1686319509.379865][8834:8834] CHIP:DMG:         
           [1686319509.379867][8834:8834] CHIP:DMG:         InteractionModelRevision = 1
           [1686319509.379870][8834:8834] CHIP:DMG: },
           [1686319509.379881][8834:8834] CHIP:DMG: Rec
@@ -389,18 +389,19 @@ tests:
           [1684167429.421129][29723:29723] CHIP:IN:   Joined multicast group on interface wlp0s20f3
 
           Verify the DSIZ flag is set to Group On TH(Reference app) log:
-          (Here in below log the value recived is 0X04 = 0100 (decimal) - Here the bit 2 is enabled then DSIZ flag is set to group)
-
-          [1686317564.742205][7679:7679] CHIP:DMG: Header Flags =
-          [1686317564.742207][7679:7679] CHIP:DMG: {
-          [1686317564.742212][7679:7679] CHIP:DMG:     Message (0x04) =
-          [1686317564.742214][7679:7679] CHIP:DMG:     {
-          [1686317564.742217][7679:7679] CHIP:DMG:         SourceNodeId = C831420E9B16886B
-          [1686317564.742219][7679:7679] CHIP:DMG:     }
-          [1686317564.742224][7679:7679] CHIP:DMG:     Exchange (0x03) =
-          [1686317564.742226][7679:7679] CHIP:DMG:     {
-          [1686317564.742228][7679:7679] CHIP:DMG:         Initiator = true
-          [1686317564.742231][7679:7679] CHIP:DMG:         AckMsg = 48718950
-          [1686317564.742233][7679:7679] CHIP:DMG:     }
-          [1686317564.742237][7679:7679] CHIP:DMG: }
+          (Here in below log the value received is 0X06 = 0110 (binary) - Here the S Flag (1 bit, position 2) is enabled as SourceNodeID is present and DISZ has a value 2(10) as the Destination Node ID field is present as a 16-bit Group 
+          [1700720496.175477][40754:40754] CHIP:DMG: Header Flags =
+          [1700720496.175481][40754:40754] CHIP:DMG: {
+          [1700720496.175485][40754:40754] CHIP:DMG:     Security (0x01) =
+          [1700720496.175489][40754:40754] CHIP:DMG:     {
+          [1700720496.175492][40754:40754] CHIP:DMG:     }
+          [1700720496.175497][40754:40754] CHIP:DMG:     Message (0x06) =
+          [1700720496.175500][40754:40754] CHIP:DMG:     {
+          [1700720496.175505][40754:40754] CHIP:DMG:         SourceNodeId = 000000000001B669
+          [1700720496.175508][40754:40754] CHIP:DMG:         DestinationGroupIdPresent = 0x0103
+          [1700720496.175512][40754:40754] CHIP:DMG:     }
+          [1700720496.175519][40754:40754] CHIP:DMG:     Exchange (0x01) =
+          [1700720496.175523][40754:40754] CHIP:DMG:     {
+          [1700720496.175525][40754:40754] CHIP:DMG:         Initiator = true
+          [1700720496.175529][40754:40754] CHIP:DMG:     }
       disabled: true