Skip to content

Commit

Permalink
Revert back EventList changes
Browse files Browse the repository at this point in the history
  • Loading branch information
manjunath-grl committed Aug 16, 2023
1 parent 08f3df2 commit 26a8c9e
Show file tree
Hide file tree
Showing 84 changed files with 18,388 additions and 6,051 deletions.
55 changes: 47 additions & 8 deletions src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ tests:
hasMasksSet: [0x3]

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [2, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -177,14 +187,43 @@ tests:
- name: "expectedValue"
value: "y"

# EventList disabled for 1.2
# - label: "Step 5: TH reads EventList attribute from DUT"
# command: "readAttribute"
# attribute: "EventList"
# response:
# value: []
# constraints:
# type: list
- label: "Step 5a: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list

#List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
- label:
"Step 5b: TH reads from the DUT the EventList attribute. 1.The list
SHALL NOT contain any additional values in the standard or scoped
range: (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 - 0x0000_FFFE) 2.
The list MAY contain values in the Manufacturer Extensible Identifier
(MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where XXXX is the allowed
MEI range (0x0001 - 0xFFF1), these values SHALL be ignored. 3. The
list SHALL NOT contain any values in the Test Vendor or invalid range:
(0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF), (0xXXXX_5000 -
0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where XXXX is the
allowed MEI range (0x0001 - 0xFFF1)"
verification: |
./chip-tool activatedcarbonfiltermonitoring read event-list 1 1
Via the TH (chip-tool), verify that the EventList attribute. Below mentioned log is based on the RPI implementation, Value may vary on real DUT
[1685958846.723249][11454:11456] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0072 Attribute 0x0000_FFFA DataVersion: 403478864
[1685958846.723431][11454:11456] CHIP:TOO: EventList: 0 entries
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
arguments:
values:
- name: "message"
value: "Please enter 'y' for success"
- name: "expectedValue"
value: "y"

- label: "Step 6a: Read the global attribute: AcceptedCommandList"
PICS: "!ACFREMON.S.C00.Rsp"
Expand Down
60 changes: 52 additions & 8 deletions src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ tests:
type: bitmap32

- label: "Step 4a: TH reads AttributeList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 2, 3, 4, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 4a: TH reads AttributeList attribute from DUT"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -104,14 +114,48 @@ tests:
- name: "expectedValue"
value: "y"

# EventList disabled for 1.2
# - label: "Step 5a: TH reads EventList attribute from DUT"
# command: "readAttribute"
# attribute: "EventList"
# response:
# constraints:
# type: list
# contains: [0, 1]
- label: "Step 5a: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
constraints:
type: list
contains: [0, 1]

- label:
"Step 5b: TH reads EventList attribute from DUT. 1.The list SHALL NOT
contain any additional values in the standard or scoped range:
(0x0000_0000 - 0x0000_00FF). 2.The list MAY contain values in the
Manufacturer Extensible Identifier (MEI) range: (0xXXXX_0000 -
0xXXXX_00FF), where XXXX is the allowed MEI range (0x0001 - 0xFFF1),
these values SHALL be ignored. 3.The list SHALL NOT contain any values
in the Test Vendor or invalid range: (0x0000_0100 - 0x0000_FFFF),
(0xXXXX_0100 - 0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where
XXXX is the allowed MEI range (0x0001 - 0xFFF1)"
verification: |
./chip-tool accesscontrol read event-list 1 0
Via the TH (chip-tool), verify:
-that EventList attribute contains list of supported events.
-that list has two entries as value of 0 and 1 (if SAccessControlEntryChanged and AccessControlExtensionChanged event is supported).
[1676456597.556478][24006:24008] CHIP:DMG: }
[1676456597.556640][24006:24008] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_FFFA DataVersion: 3448736795
[1676456597.556677][24006:24008] CHIP:TOO: EventList: 2 entries
[1676456597.556687][24006:24008] CHIP:TOO: [1]: 0
[1676456597.556693][24006:24008] CHIP:TOO: [2]: 1
[1676456597.556763][24006:24008] CHIP:EM: <<< [E:51140i S:1376 M:55400435 (Ack:189635613)] (S) Msg TX to 1:0000000000000001 [110F] --- Type 0000:10 (SecureChannel:StandaloneAck)
[1676456597.556778][24006:24008] CHIP:IN: (S) Sending msg 55400435 on secure session with LSID: 1376
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
arguments:
values:
- name: "message"
value: "Please enter 'y' for success"
- name: "expectedValue"
value: "y"

# List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
- label:
Expand Down
31 changes: 31 additions & 0 deletions src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ tests:
type: bitmap32

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 1, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand All @@ -64,6 +74,27 @@ tests:
type: list
contains: [2]

- label: "Step 5: TH reads EventList attribute from DUT"
verification: |
./chip-tool actions read event-list 1 1
Via the TH (chip-tool), verify:
-that EventList attribute contains list of supported events.
-that list has 1 entry(0) for this cluster.
[1676460741.103254][37023:37025] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0025 Attribute 0x0000_FFFA DataVersion: 928273128
[1676460741.103303][37023:37025] CHIP:TOO: EventList: 1 entries
[1676460741.103320][37023:37025] CHIP:TOO: [1]: 0
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
arguments:
values:
- name: "message"
value: "Please enter 'y' for success"
- name: "expectedValue"
value: "y"

# Checking only type check all commands are optional
- label: "Step 6: Read the global attribute: AcceptedCommandList"
command: "readAttribute"
Expand Down
57 changes: 48 additions & 9 deletions src/app/tests/suites/certification/Test_TC_AIRQUAL_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ tests:
hasMasksSet: [0x8]

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 4a: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -139,16 +149,45 @@ tests:
- name: "expectedValue"
value: "y"

# EventList disabled for 1.2
# - label: "Step 5: TH reads EventList attribute from DUT"
# command: "readAttribute"
# attribute: "EventList"
# response:
# value: []
# constraints:
# type: list
- label: "Step 5a: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list

- label:
"Step 5b: TH reads from the DUT the EventList attribute. 1.The list
SHALL NOT contain any additional values in the standard or scoped
range: (0x0000_0000 - 0x0000_4FFF) and (0x0000_F000 - 0x0000_FFFE) 2.
The list MAY contain values in the Manufacturer Extensible Identifier
(MEI) range: (0xXXXX_0000 - 0xXXXX_4FFF), where XXXX is the allowed
MEI range (0x0001 - 0xFFF1), these values SHALL be ignored. 3. The
list SHALL NOT contain any values in the Test Vendor or invalid range:
(0x0000_5000 - 0x0000_EFFF and 0x0000_FFFF), (0xXXXX_5000 -
0xXXXX_FFFF) and (0xFFF1_0000 - 0xFFFF_FFFF), where XXXX is the
allowed MEI range (0x0001 - 0xFFF1)"
verification: |
./chip-tool airquality read event-list 1 1
On TH(Chip-tool), verify the Event-list value is 0 entries
[1685259470.356105][111277:111279] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_005B Attribute 0x0000_FFFA DataVersion: 3241788930
[1685259470.356143][111277:111279] CHIP:TOO: EventList: 0 entries
[1685259470.356213][111277:111279] CHIP:EM: <<< [E:2990i S:55081 M:20552289 (Ack:224151602)] (S) Msg TX to 1:0000000000000001 [BFD3] --- Type 0000:10 (SecureChannel:StandaloneAck)
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_USER_PROMPT && PICS_EVENT_LIST_ENABLED
arguments:
values:
- name: "message"
value: "Please enter 'y' for success"
- name: "expectedValue"
value: "y"

- label: "Step 6:a Read the global attribute: AcceptedCommandList"
- label: "Step 6a: Read the global attribute: AcceptedCommandList"
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
Expand Down
27 changes: 19 additions & 8 deletions src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,16 @@ tests:
type: bitmap32

- label: "Step 3: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 3: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand All @@ -72,11 +82,12 @@ tests:
constraints:
type: list
contains: [1]
# EventList disabled for 1.2
# - label: "Step 6: TH reads EventList attribute from DUT"
# command: "readAttribute"
# attribute: "EventList"
# response:
# value: []
# constraints:
# type: list

- label: "Step 6: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list
28 changes: 20 additions & 8 deletions src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ tests:
type: bitmap32

- label: "Step 3a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains:
[2, 4, 5, 6, 7, 65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 3a: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -99,11 +110,12 @@ tests:
value: []
constraints:
type: list
# EventList disabled for 1.2
# - label: "Step 6: Read the global attribute: EventList"
# command: "readAttribute"
# attribute: "EventList"
# response:
# value: []
# constraints:
# type: list

- label: "Step 6: Read the global attribute: EventList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list
27 changes: 19 additions & 8 deletions src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@ tests:
type: bitmap32

- label: "Step 3a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [65528, 65529, 65530, 65531, 65532, 65533]

- label: "Step 3a: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -101,11 +111,12 @@ tests:
constraints:
type: list
contains: [3]
# EventList disabled for 1.2
# - label: "Step 6: Read the global attribute: EventList"
# command: "readAttribute"
# attribute: "EventList"
# response:
# value: []
# constraints:
# type: list

- label: "Step 6: Read the global attribute: EventList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list
Loading

0 comments on commit 26a8c9e

Please sign in to comment.