Skip to content

Commit

Permalink
Set up a separate PICS for event list enabling (and hoping to default…
Browse files Browse the repository at this point in the history
… thist to false until we have event list finalized) (#28275)

* Add pics to all EventList reads

* Update AttributeList validation based on event list enabled pics

* Define the pics

* zap regen

* Restyle

* Update ci-pics-values

* Enable PICS event list to pass CI. Separate PR to disable the pics and fix our example apps

* zap regen

---------

Co-authored-by: Andrei Litvin <[email protected]>
  • Loading branch information
andy31415 and andreilitvin authored Jul 28, 2023
1 parent 471f098 commit f4f9bfb
Show file tree
Hide file tree
Showing 80 changed files with 10,529 additions and 4,913 deletions.
34 changes: 34 additions & 0 deletions src/app/tests/suites/TestBasicInformation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ tests:
value: "XX"

- label: "Read AttributeList value"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
Expand Down Expand Up @@ -85,6 +86,39 @@ tests:
0xFFFD, # ClusterRevision
]

- label: "Read AttributeList value"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
value: [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
18,
19,
20,
0xFFF8, # GeneratedCommandList
0xFFF9, # AcceptedCommandList
0xFFFB, # AttributeList
0xFFFC, # FeatureMap
0xFFFD, # ClusterRevision
]

- label: "Read NodeLabel"
command: "readAttribute"
attribute: "NodeLabel"
Expand Down
5 changes: 5 additions & 0 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ PICS:
- label: "Run steps in SDK and CI only"
id: PICS_SDK_CI_ONLY

- label:
"EventList attribute enabled (default to false while EventList is
provisional)"
id: PICS_EVENT_LIST_ENABLED

#
# Base Details
#
Expand Down
11 changes: 11 additions & 0 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,13 +82,23 @@ 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:
constraints:
type: list
contains: [2, 65528, 65529, 65531, 65532, 65533]

- label:
"Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in
AttributeList"
Expand All @@ -112,6 +122,7 @@ tests:
contains: [3]

- label: "Step 5: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
13 changes: 11 additions & 2 deletions src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,23 @@ tests:
type: bitmap32

- label: "Step 4a: TH reads AttributeList attribute from DUT"
PICS: ACL.S.Afffb
PICS: PICS_EVENT_LIST_ENABLED && ACL.S.Afffb
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 && ACL.S.Afffb"
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]

- label: "Step 4b: TH reads optional attribute (Extension) in AttributeList"
PICS: ACL.S.A0001 && ACL.S.Afffb
command: "readAttribute"
Expand Down Expand Up @@ -108,7 +117,7 @@ tests:
value: "y"

- label: "Step 5a: TH reads EventList attribute from DUT"
PICS: ACL.S.Afffa
PICS: PICS_EVENT_LIST_ENABLED && ACL.S.Afffa
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
10 changes: 10 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,13 +48,23 @@ 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:
constraints:
type: list
contains: [0, 1, 65528, 65529, 65531, 65532, 65533]

- label: "Step 4b: Read the optional attribute(SetupURL) in AttributeList"
PICS: ACT.S.A0002
command: "readAttribute"
Expand Down
11 changes: 11 additions & 0 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,14 +94,25 @@ tests:
hasMasksSet: [0x8]

- label: "Step 4: 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 4: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 65528, 65529, 65531, 65532, 65533]

- label: "Step 5: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
11 changes: 11 additions & 0 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,13 +50,23 @@ 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:
constraints:
type: list
contains: [65528, 65529, 65531, 65532, 65533]

- label: "Step 4: Read the global attribute: AcceptedCommandList"
command: "readAttribute"
attribute: "AcceptedCommandList"
Expand All @@ -74,6 +84,7 @@ tests:
contains: [1]

- label: "Step 6: TH reads EventList attribute from DUT"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
11 changes: 11 additions & 0 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,7 @@ tests:
type: bitmap32

- label: "Step 3a: Read the global attribute: AttributeList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "AttributeList"
response:
Expand All @@ -58,6 +59,15 @@ tests:
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:
constraints:
type: list
contains: [2, 4, 5, 6, 7, 65528, 65529, 65531, 65532, 65533]

- label: "Step 3b: Read the optional attribute(VendorName) in AttributeList"
PICS: APBSC.S.A0000
command: "readAttribute"
Expand Down Expand Up @@ -102,6 +112,7 @@ tests:
type: list

- label: "Step 6: Read the global attribute: EventList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
11 changes: 11 additions & 0 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,13 +60,23 @@ 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:
constraints:
type: list
contains: [65528, 65529, 65531, 65532, 65533]

- label:
"Step 3b: Read the optional attribute(CatalogList) in AttributeList"
PICS: APPLAUNCHER.S.A0000
Expand Down Expand Up @@ -103,6 +113,7 @@ tests:
contains: [3]

- label: "Step 6: Read the global attribute: EventList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
11 changes: 11 additions & 0 deletions src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,23 @@ tests:
hasMasksClear: [0x2]

- label: "Step 3: 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 3: Read the global attribute: AttributeList"
PICS: "!PICS_EVENT_LIST_ENABLED"
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 1, 65528, 65529, 65531, 65532, 65533]

- label: "Step 4: Read the global attribute: AcceptedCommandList"
command: "readAttribute"
attribute: "AcceptedCommandList"
Expand All @@ -84,6 +94,7 @@ tests:
type: list

- label: "Step 6: Read the global attribute: EventList"
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
Expand Down
12 changes: 11 additions & 1 deletion src/app/tests/suites/certification/Test_TC_BIND_1_1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,24 @@ tests:
type: bitmap32

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

#List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
- label: "Step 4a: TH reads AttributeList from DUT"
PICS: "!PICS_EVENT_LIST_ENABLED && BIND.S.Afffb"
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [0, 65528, 65529, 65531, 65532, 65533]

#List values range check support https://github.com/project-chip/connectedhomeip/issues/26570
- label:
"Step 4b: TH reads AttributeList attribute from DUT. 1.The list SHALL
Expand Down
Loading

0 comments on commit f4f9bfb

Please sign in to comment.