Skip to content

Commit 83cf341

Browse files
[Scenes] Yaml steps discrepancies (#32003)
* Updated the steps to match the comments in the chip test plan * Updated label for LasConfiguredBy attribute test * Applied comments about verification steps in S_2_5 and S_2_6
1 parent 14aac83 commit 83cf341

7 files changed

+1291
-693
lines changed

src/app/tests/suites/certification/Test_TC_S_1_1.yaml

+13-2
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,26 @@ tests:
6262
hasMasksSet: [0x1]
6363

6464
- label:
65-
"Step 4: TH reads AttributeList mandatory attributes(global attribute
65+
"Step 4a: TH reads AttributeList mandatory attributes(global attribute
6666
65531)"
6767
PICS: S.S
6868
command: "readAttribute"
6969
attribute: "AttributeList"
7070
response:
7171
constraints:
7272
type: list
73-
contains: [0, 1, 2, 65528, 65529, 65531, 65532, 65533]
73+
contains: [1, 2, 65528, 65529, 65531, 65532, 65533]
74+
75+
- label:
76+
"Step 4b: TH reads the LastConfiguredBy optional attribute from the
77+
AttributeList (global attribute 65531)"
78+
PICS: S.S.A0000
79+
command: "readAttribute"
80+
attribute: "AttributeList"
81+
response:
82+
constraints:
83+
type: list
84+
contains: [0]
7485

7586
- label: "Step 5: TH reads from the DUT the EventList attribute"
7687
PICS: PICS_EVENT_LIST_ENABLED

src/app/tests/suites/certification/Test_TC_S_2_1.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ name: 123.2.1. [TC-S-2.1] Attributes with DUT as Server
1717

1818
PICS:
1919
- S.S
20-
- S.S.AM
21-
- S.S.AO
2220

2321
config:
2422
nodeId: 0x12344321

src/app/tests/suites/certification/Test_TC_S_2_2.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ tests:
344344
type: int16u
345345

346346
- label: "Step 3d: TH reads attribute FabricSceneInfo from DUT"
347-
PICS: PICS_SDK_CI_ONLY
348347
command: "readAttribute"
349348
attribute: "FabricSceneInfo"
350349
response:
@@ -753,7 +752,7 @@ tests:
753752
set to G1, the SceneID field set to 0x01, the TransitionTime field set
754753
to 70 000 000 (70 000s) and no extension field sets. This should fail
755754
and return a status of 0x85 (INVALID_COMMAND)."
756-
PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY
755+
PICS: S.S.C00.Rsp
757756
command: "AddScene"
758757
arguments:
759758
values:
@@ -781,7 +780,7 @@ tests:
781780
set to G1, the SceneID field set to 0x01, the TransitionTime field set
782781
to 60 000 001 (60 000.001s) and no extension field sets. This should
783782
fail and return a status of 0x85 (INVALID_COMMAND)."
784-
PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY
783+
PICS: S.S.C00.Rsp
785784
command: "AddScene"
786785
arguments:
787786
values:

src/app/tests/suites/certification/Test_TC_S_2_3.yaml

+77-89
Original file line numberDiff line numberDiff line change
@@ -309,48 +309,19 @@ tests:
309309
to G1, the SceneID field set to 0x01, the TransitionTime field set to
310310
1000 (1s) and a set of extension fields appropriate to AC1."
311311
verification: |
312-
./chip-tool scenes add-scene GroupID SceneID TransitionTime "SceneName" '[{"clusterId": value, "attributeValueList":[{"attributeId": value, "attributeValue": value}]}' nodeId endpointId
312+
./chip-tool scenesmanagement add-scene GroupID SceneID TransitionTime "SceneName" '[{"clusterId": value, "attributeValueList":[{"attributeId": value, "attributeValue": value}]}' nodeId endpointId
313313
314314
Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
315315
316316
Verify the "status is success" on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
317-
[1670970505.887060][5742:5744] CHIP:DMG: InvokeResponseMessage =
318-
[1670970505.887118][5742:5744] CHIP:DMG: {
319-
[1670970505.887172][5742:5744] CHIP:DMG: suppressResponse = false,
320-
[1670970505.887231][5742:5744] CHIP:DMG: InvokeResponseIBs =
321-
[1670970505.887307][5742:5744] CHIP:DMG: [
322-
[1670970505.887366][5742:5744] CHIP:DMG: InvokeResponseIB =
323-
[1670970505.887444][5742:5744] CHIP:DMG: {
324-
[1670970505.887507][5742:5744] CHIP:DMG: CommandDataIB =
325-
[1670970505.887576][5742:5744] CHIP:DMG: {
326-
[1670970505.887713][5742:5744] CHIP:DMG: CommandPathIB =
327-
[1670970505.887804][5742:5744] CHIP:DMG: {
328-
[1670970505.887940][5742:5744] CHIP:DMG: EndpointId = 0x1,
329-
[1670970505.888093][5742:5744] CHIP:DMG: ClusterId = 0x5,
330-
[1670970505.888242][5742:5744] CHIP:DMG: CommandId = 0x0,
331-
[1670970505.888385][5742:5744] CHIP:DMG: },
332-
[1670970505.888692][5742:5744] CHIP:DMG:
333-
[1670970505.888769][5742:5744] CHIP:DMG: CommandFields =
334-
[1670970505.888852][5742:5744] CHIP:DMG: {
335-
[1670970505.889030][5742:5744] CHIP:DMG: 0x0 = 0,
336-
[1670970505.889183][5742:5744] CHIP:DMG: 0x1 = 1,
337-
[1670970505.889406][5742:5744] CHIP:DMG: 0x2 = 1,
338-
[1670970505.889515][5742:5744] CHIP:DMG: },
339-
[1670970505.889603][5742:5744] CHIP:DMG: },
340-
[1670970505.889684][5742:5744] CHIP:DMG:
341-
[1670970505.889745][5742:5744] CHIP:DMG: },
342-
[1670970505.889821][5742:5744] CHIP:DMG:
343-
[1670970505.889878][5742:5744] CHIP:DMG: ],
344-
[1670970505.889953][5742:5744] CHIP:DMG:
345-
[1670970505.890009][5742:5744] CHIP:DMG: InteractionModelRevision = 1
346-
[1670970505.890066][5742:5744] CHIP:DMG: },
347-
[1670970505.890212][5742:5744] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0005 Command=0x0000_0000
348-
[1670970505.890328][5742:5744] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0005 Command 0x0000_0000
349-
[1670970505.890458][5742:5744] CHIP:TOO: AddSceneResponse: {
350-
[1670970505.890551][5742:5744] CHIP:TOO: status: 0
351-
[1670970505.890608][5742:5744] CHIP:TOO: groupId: 257
352-
[1670970505.890717][5742:5744] CHIP:TOO: sceneId: 1
353-
[1670970505.890774][5742:5744] CHIP:TOO: }
317+
[1705680175.863785][5823:5825] CHIP:DMG: },
318+
[1705680175.863851][5823:5825] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0062 Command=0x0000_0000
319+
[1705680175.863880][5823:5825] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0062 Command 0x0000_0000
320+
[1705680175.863931][5823:5825] CHIP:TOO: AddSceneResponse: {
321+
[1705680175.863956][5823:5825] CHIP:TOO: status: 0
322+
[1705680175.863967][5823:5825] CHIP:TOO: groupID: 257
323+
[1705680175.863977][5823:5825] CHIP:TOO: sceneID: 1
324+
[1705680175.863986][5823:5825] CHIP:TOO: }
354325
cluster: "LogCommands"
355326
command: "UserPrompt"
356327
PICS: S.S.C00.Rsp && PICS_SKIP_SAMPLE_APP
@@ -405,15 +376,50 @@ tests:
405376
set to G1 and the SceneID field set to 0x01."
406377
PICS: S.S.C01.Rsp && PICS_SKIP_SAMPLE_APP
407378
verification: |
408-
./chip-tool scenes view-scene GroupId SceneId Node-Id EndpointId
379+
./chip-tool scenesmanagement view-scene GroupId SceneId Node-Id EndpointId
409380
410381
Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
411382
412-
Verify that the extension fields in the log match the ones expected and that
413-
Status = 0x00
414-
GroupID = G1
415-
SceneID = 0x01
416-
TransitionTime = 0x0001
383+
Verify that the extension fields in the log match the ones expected in the following log:
384+
[1705680224.968551][5827:5829] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0062 Command=0x0000_0001
385+
[1705680224.968559][5827:5829] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0062 Command 0x0000_0001
386+
CHIP:TOO: ViewSceneResponse: {
387+
CHIP:TOO: status: 0
388+
CHIP:TOO: groupID: 1
389+
CHIP:TOO: sceneID: 1
390+
CHIP:TOO: transitionTime: 1000
391+
CHIP:TOO: sceneName:
392+
CHIP:TOO: extensionFieldSets: 3 entries
393+
CHIP:TOO: [1]: {
394+
CHIP:TOO: ClusterID: XX
395+
CHIP:TOO: AttributeValueList: X entries
396+
CHIP:TOO: [1]: {
397+
CHIP:TOO: AttributeID: XX
398+
CHIP:TOO: AttributeValue:XX
399+
CHIP:TOO: }
400+
CHIP:TOO: }
401+
CHIP:TOO: [2]: {
402+
CHIP:TOO: ClusterID: XX
403+
CHIP:TOO: AttributeValueList: X entries
404+
CHIP:TOO: [1]: {
405+
CHIP:TOO: AttributeID: XX
406+
CHIP:TOO: AttributeValue: XX
407+
CHIP:TOO: }
408+
CHIP:TOO: }
409+
CHIP:TOO: [3]: {
410+
CHIP:TOO: ClusterID: XX
411+
CHIP:TOO: AttributeValueList: XX entries
412+
CHIP:TOO: [X]: {
413+
CHIP:TOO: AttributeID: XX
414+
CHIP:TOO: AttributeValue: XX
415+
CHIP:TOO: }
416+
...
417+
CHIP:TOO: [X]: {
418+
CHIP:TOO: AttributeID: XX
419+
CHIP:TOO: AttributeValue: XX
420+
CHIP:TOO: }
421+
CHIP:TOO: }
422+
CHIP:TOO: }
417423
cluster: "LogCommands"
418424
command: "UserPrompt"
419425
arguments:
@@ -449,7 +455,7 @@ tests:
449455

450456
- label:
451457
"Step 5a: TH configures AC2 on DUT for all implemented application
452-
clusters supporting scenes."
458+
clusters supporting scenesmanagement."
453459
cluster: "Level Control"
454460
PICS: PICS_SDK_CI_ONLY
455461
command: "MoveToLevelWithOnOff"
@@ -466,7 +472,7 @@ tests:
466472

467473
- label:
468474
"Step 5a: TH configures AC2 on DUT for all implemented application
469-
clusters supporting scenes."
475+
clusters supporting scenesmanagement."
470476
verification: |
471477
Is DUT configured with AC2?
472478
cluster: "LogCommands"
@@ -563,41 +569,8 @@ tests:
563569
field set to G1, the SceneID field set to 0x03, the TransitionTime
564570
field set to G1 and a set of extension fields appropriate to AC1."
565571
verification: |
566-
./chip-tool scenes add-scene GroupID SceneID TransitionTime "SceneName" '[{"clusterId": value, "attributeValueList":[{"attributeId": value, "attributeValue": value}]}' groupID endpointId
567-
568-
Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
569-
570-
Verify the "status is success" on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform:
571-
[1670970505.887060][5742:5744] CHIP:DMG: InvokeResponseMessage =
572-
[1670970505.887118][5742:5744] CHIP:DMG: {
573-
[1670970505.887172][5742:5744] CHIP:DMG: suppressResponse = false,
574-
[1670970505.887231][5742:5744] CHIP:DMG: InvokeResponseIBs =
575-
[1670970505.887307][5742:5744] CHIP:DMG: [
576-
[1670970505.887366][5742:5744] CHIP:DMG: InvokeResponseIB =
577-
[1670970505.887444][5742:5744] CHIP:DMG: {
578-
[1670970505.887507][5742:5744] CHIP:DMG: CommandDataIB =
579-
[1670970505.887576][5742:5744] CHIP:DMG: {
580-
[1670970505.887713][5742:5744] CHIP:DMG: CommandPathIB =
581-
[1670970505.887804][5742:5744] CHIP:DMG: {
582-
[1670970505.887940][5742:5744] CHIP:DMG: EndpointId = 0x1,
583-
[1670970505.888093][5742:5744] CHIP:DMG: ClusterId = 0x5,
584-
[1670970505.888242][5742:5744] CHIP:DMG: CommandId = 0x0,
585-
[1670970505.888385][5742:5744] CHIP:DMG: },
586-
[1670970505.888692][5742:5744] CHIP:DMG:
587-
[1670970505.888769][5742:5744] CHIP:DMG: CommandFields =
588-
[1670970505.888852][5742:5744] CHIP:DMG: {
589-
[1670970505.889030][5742:5744] CHIP:DMG: 0x0 = 0,
590-
[1670970505.889183][5742:5744] CHIP:DMG: 0x1 = 1,
591-
[1670970505.889406][5742:5744] CHIP:DMG: 0x2 = 1,
592-
[1670970505.889515][5742:5744] CHIP:DMG: },
593-
[1670970505.889603][5742:5744] CHIP:DMG: },
594-
[1670970505.889684][5742:5744] CHIP:DMG:
595-
[1670970505.889745][5742:5744] CHIP:DMG: },
596-
[1670970505.889821][5742:5744] CHIP:DMG:
597-
[1670970505.889878][5742:5744] CHIP:DMG: ],
598-
[1670970505.889953][5742:5744] CHIP:DMG:
599-
[1670970505.890009][5742:5744] CHIP:DMG: InteractionModelRevision = 1
600-
[1670970505.890066][5742:5744] CHIP:DMG: },
572+
./chip-tool scenesmanagement add-scene 0x0101 0x03 1 "scene name" '[{"clusterID": "0x0300", "attributeValueList":[{"attributeID": "0x4002", "attributeValue": "0x01"}]}]' 0xffffffffffff0101 1
573+
Note: As this is a multicast command, no log is expected.
601574
cluster: "LogCommands"
602575
command: "UserPrompt"
603576
PICS: S.S.C00.Rsp && PICS_SKIP_SAMPLE_APP
@@ -651,15 +624,30 @@ tests:
651624
set to G1 and the SceneID field set to 0x03."
652625
PICS: S.S.C01.Rsp && PICS_SKIP_SAMPLE_APP
653626
verification: |
654-
./chip-tool scenes view-scene GroupId SceneId Node-Id EndpointId
627+
./chip-tool scenesmanagement view-scene GroupId SceneId Node-Id EndpointId
655628
656629
Note: The number of ExtensionFieldSets, the value of clusterId of each ExtensionFieldSet, the number of attributes in attributeValueList and their values varies for each application
657630
658-
Verify that the extension fields in the log match the ones expected and that
659-
Status = 0x00
660-
GroupID = G1
661-
SceneID = 0x03
662-
TransitionTime = 0x03E8
631+
Verify that the extension fields in the log match the ones expected and that the log output is similar to the following:
632+
[1707285444.028460][13682:13684] CHIP:DMG: },
633+
[1707285444.028553][13682:13684] CHIP:DMG: Received Command Response Data, Endpoint=1 Cluster=0x0000_0062 Command=0x0000_0001
634+
[1707285444.028579][13682:13684] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0062 Command 0x0000_0001
635+
[1707285444.028670][13682:13684] CHIP:TOO: ViewSceneResponse: {
636+
[1707285444.028685][13682:13684] CHIP:TOO: status: 0
637+
[1707285444.028696][13682:13684] CHIP:TOO: groupID: 257
638+
[1707285444.028706][13682:13684] CHIP:TOO: sceneID: 3
639+
[1707285444.028717][13682:13684] CHIP:TOO: transitionTime: 1
640+
[1707285444.028728][13682:13684] CHIP:TOO: sceneName: scene name
641+
[1707285444.028766][13682:13684] CHIP:TOO: extensionFieldSets: XX entries
642+
[1707285444.028814][13682:13684] CHIP:TOO: [XX]: {
643+
[1707285444.028828][13682:13684] CHIP:TOO: ClusterID: XX
644+
[1707285444.028853][13682:13684] CHIP:TOO: AttributeValueList: XX entries
645+
[1707285444.028882][13682:13684] CHIP:TOO: [XX]: {
646+
[1707285444.028896][13682:13684] CHIP:TOO: AttributeID: XX
647+
[1707285444.028913][13682:13684] CHIP:TOO: AttributeValue: XX
648+
[1707285444.028925][13682:13684] CHIP:TOO: }
649+
[1707285444.028937][13682:13684] CHIP:TOO: }
650+
[1707285444.028950][13682:13684] CHIP:TOO: }
663651
cluster: "LogCommands"
664652
command: "UserPrompt"
665653
arguments:
@@ -676,7 +664,7 @@ tests:
676664
- label:
677665
"Step 6c: TH sends a ViewScene command to group G1 with the GroupID
678666
field set to G1 and the SceneID field set to 0x03."
679-
PICS: S.S.C01.Rsp && PICS_SDK_CI_ONLY
667+
PICS: S.S.C01.Rsp
680668
command: "ViewScene"
681669
groupId: G1
682670
arguments:
@@ -711,7 +699,7 @@ tests:
711699
- label:
712700
"Step 6e: TH sends a ViewScene command to DUT with the GroupID field
713701
set to G1 and the SceneID field set to 0x03."
714-
PICS: S.S.C01.Rsp && PICS_SDK_CI_ONLY
702+
PICS: S.S.C01.Rsp
715703
command: "ViewScene"
716704
arguments:
717705
values:

src/app/tests/suites/certification/Test_TC_S_2_4.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ tests:
296296
- label:
297297
"Step 6a: TH configures AC2 on DUT for all implemented application
298298
clusters supporting scenes."
299-
PICS: PICS_SDK_CI_ONLY
299+
PICS: S.S.C05.Rsp && PICS_SDK_CI_ONLY
300300
cluster: "Level Control"
301301
command: "MoveToLevelWithOnOff"
302302
arguments:
@@ -317,7 +317,7 @@ tests:
317317
Is DUT configured with AC2?
318318
cluster: "LogCommands"
319319
command: "UserPrompt"
320-
PICS: PICS_SKIP_SAMPLE_APP
320+
PICS: S.S.C05.Rsp && PICS_SKIP_SAMPLE_APP
321321
arguments:
322322
values:
323323
- name: "message"

0 commit comments

Comments
 (0)