Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add oven mode yaml #31547

Merged
merged 74 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from 73 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
281247f
Oven mode yaml scripts and updated ciTests.json file
prakashece Dec 6, 2023
f6d20ad
format checked
prakashece Dec 6, 2023
d34bb33
Restyled by whitespace
restyled-commits Dec 6, 2023
0325152
Restyled by prettier-json
restyled-commits Dec 6, 2023
9221714
Restyled by prettier-yaml
restyled-commits Dec 6, 2023
8bbbfc9
Updated ciTests.json
prakashece Dec 6, 2023
bb44bad
added and modified the files
prakashece Dec 18, 2023
223505e
Delete src/app/tests/suites/certification/Test_TC_OM_1_1.yml
prakashece Dec 18, 2023
525d7a5
Delete src/app/tests/suites/certification/Test_TC_OM_1_2.yml
prakashece Dec 18, 2023
ddd3b56
Delete src/app/tests/suites/certification/Test_TC_OM_2_1.yml
prakashece Dec 18, 2023
be9f7c6
Delete src/app/tests/suites/certification/Test_TC_OM_3_1.yml
prakashece Dec 18, 2023
a2ff8b0
Delete src/app/tests/suites/certification/Test_TC_OM_3_2.yml
prakashece Dec 18, 2023
9df1d69
Delete src/app/tests/suites/certification/Test_TC_OM_3_3.yml
prakashece Dec 18, 2023
e0a41a1
Restyled by whitespace
restyled-commits Dec 18, 2023
c94de44
Restyled by prettier-json
restyled-commits Dec 18, 2023
03daa2f
Restyled by prettier-yaml
restyled-commits Dec 18, 2023
85e85e4
Restyled by autopep8
restyled-commits Dec 18, 2023
2a15df1
Merge branch 'add-oven-mode-yaml' of https://github.com/prakashece/co…
prakashece Dec 18, 2023
e118f69
Merge branch 'master' into add-oven-mode-yaml
prakashece Dec 18, 2023
a3f33b2
Update src/app/tests/suites/certification/Test_TC_OM_1_1.yaml
prakashece Dec 19, 2023
a84513c
Update src/app/tests/suites/certification/Test_TC_OM_2_1.yaml
prakashece Dec 19, 2023
a29309e
upadted based on the comments from Cecille
prakashece Dec 19, 2023
2a881cb
Merge branch 'add-oven-mode-yaml' of https://github.com/prakashece/co…
prakashece Dec 19, 2023
3ee8fbc
updated TC_2_1
prakashece Dec 19, 2023
2e4836f
Restyled by whitespace
restyled-commits Dec 19, 2023
d5f78a6
Restyled by prettier-yaml
restyled-commits Dec 19, 2023
21148b7
updated the files based on correct PICS code
prakashece Dec 20, 2023
919d177
Restyled by whitespace
restyled-commits Dec 20, 2023
ad6bc54
Restyled by prettier-json
restyled-commits Dec 20, 2023
0ee1903
Restyled by prettier-yaml
restyled-commits Dec 20, 2023
8cd3e36
Delete src/app/tests/suites/certification/Test_TC_OM_1_1.yaml
prakashece Dec 20, 2023
fd29b7e
Delete src/app/tests/suites/certification/Test_TC_OM_2_1.yaml
prakashece Dec 20, 2023
5c1677a
Delete src/app/tests/suites/certification/Test_TC_OM_3_1.yaml
prakashece Dec 20, 2023
d1330d6
Delete src/app/tests/suites/certification/Test_TC_OM_3_2.yaml
prakashece Dec 20, 2023
f5816e6
Delete src/app/tests/suites/certification/Test_TC_OM_3_3.yaml
prakashece Dec 20, 2023
a0fc766
Merge branch 'master' into add-oven-mode-yaml
prakashece Dec 20, 2023
64188b1
Delete src/app/tests/suites/certification/Test_TC_OM_1_2.yaml
prakashece Dec 20, 2023
4122a4f
updated Test_TC_OTCCM_2_1.yaml
prakashece Dec 20, 2023
ca4d9d0
Merge branch 'add-oven-mode-yaml' of https://github.com/prakashece/co…
prakashece Dec 20, 2023
a957f89
Merge branch 'master' into add-oven-mode-yaml
prakashece Dec 20, 2023
d24947f
updated test scripts and PICS values
prakashece Jan 9, 2024
55e69b5
Restyled by whitespace
restyled-commits Jan 9, 2024
22c5949
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 9, 2024
be6c609
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 12, 2024
67ee8fb
updating init.py
prakashece Jan 12, 2024
7acb8a0
updated PICS.yaml
prakashece Jan 12, 2024
6769ed6
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 12, 2024
69bdf06
updated init.py
prakashece Jan 12, 2024
a9ece9e
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 12, 2024
4e89402
updated init.py
prakashece Jan 12, 2024
b3abc6e
Restyled by whitespace
restyled-commits Jan 12, 2024
bdce070
updated files and ran zap_regen
prakashece Jan 13, 2024
0b7b178
Restyled by whitespace
restyled-commits Jan 13, 2024
7d172d7
Restyled by prettier-json
restyled-commits Jan 13, 2024
4140cbb
Restyled by prettier-yaml
restyled-commits Jan 13, 2024
9e2a4bd
Restyled by autopep8
restyled-commits Jan 13, 2024
389f972
updated ci-pics-values
prakashece Jan 13, 2024
842c8e0
updated __init__.py
prakashece Jan 14, 2024
2f038c4
commented 4b 4c in TC_1_1 and ran zap
prakashece Jan 14, 2024
68c6c91
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 14, 2024
ac428dc
updated 1_1
prakashece Jan 14, 2024
a6da5cb
Restyled by prettier-yaml
restyled-commits Jan 14, 2024
9ed1aef
updated manualtest.json and ran zapregen
prakashece Jan 15, 2024
8b0f25d
Restyled by prettier-json
restyled-commits Jan 15, 2024
04b0fa0
Restyled by prettier-yaml
restyled-commits Jan 15, 2024
138e535
updated ci-pics-values
prakashece Jan 15, 2024
b579bbc
updated pics-value file
prakashece Jan 15, 2024
19e0f45
Merge branch 'master' into add-oven-mode-yaml
prakashece Jan 16, 2024
fabd3e5
upidated ci-pics-values
prakashece Jan 16, 2024
f31abc4
Merge branch 'master' into add-oven-mode-yaml
beckerzito Jan 18, 2024
9e4a8f3
Fixes for test cases
beckerzito Jan 19, 2024
cda6335
Merge branch 'master' into add-oven-mode-yaml
beckerzito Jan 19, 2024
6dd7dea
Restyled by prettier-yaml
restyled-commits Jan 19, 2024
a2ff610
Merge branch 'master' into add-oven-mode-yaml
beckerzito Jan 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7650,6 +7650,9 @@ endpoint 1 {
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;

handle command ChangeToMode;
handle command ChangeToModeResponse;
}

server cluster LaundryDryerControls {
Expand Down
18 changes: 18 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -8326,6 +8326,24 @@
"side": "server",
"enabled": 1,
"apiMaturity": "provisional",
"commands": [
{
"name": "ChangeToMode",
"code": 0,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "ChangeToModeResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
{
"name": "SupportedModes",
Expand Down
4 changes: 4 additions & 0 deletions examples/darwin-framework-tool/templates/tests/ciTests.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
"Test_TC_LWM_3_1",
"Test_TC_LWM_3_2",
"Test_TC_LWM_3_3",
"Test_TC_OTCCM_2_1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test does not use EqualityCommands? Why is it disabled, and why is the disabling claiming it's because of lack of support for EqualityCommands?

"Test_TC_OTCCM_3_1",
"Test_TC_OTCCM_3_2",
"Test_TC_OTCCM_3_3",
"Disabled because darwin-framework-tool does not support constraints arithmetic operations",
"Test_TC_FLW_2_1",
"Test_TC_RH_2_1",
Expand Down
3 changes: 3 additions & 0 deletions scripts/tests/chiptest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
"Test_TC_LWM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_LWM_3_2.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_LWM_3_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_OTCCM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_OTCCM_3_2.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_OTCCM_3_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_G_2_4.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_RVCRUNM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_RVCCLEANM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
Expand Down
57 changes: 57 additions & 0 deletions src/app/tests/suites/certification/PICS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8921,6 +8921,63 @@ PICS:
- label: "Can the device be controlled manually?"
id: DRYERCTRL.S.M.ManuallyControlled

# Oven Mode Cluster

- label: "Does the device implement the OM cluster as a server?"
id: OTCCM.S

- label: "Does the DUT support testing the failed ChangeToMode command?"
id: OTCCM.S.M.CAN_TEST_MODE_FAILURE

- label:
"Id of mode the device will fail to transition to, given its current
state"
id: PIXIT.OTCCM.MODE_CHANGE_FAIL

- label:
"Id of mode the device will successfully transition to, given its
current state"
id: PIXIT.OTCCM.MODE_CHANGE_OK

#
# server / features
#
- label:
"Does the device support depending on an On/Off cluster implemented on
the same endpoint?"
id: OTCCM.S.F00

#
# server / attributes
#
- label: "Does the device implement the SupportedModes attribute?"
id: OTCCM.S.A0000

- label: "Does the device implement the CurrentMode attribute?"
id: OTCCM.S.A0001

- label: "Does the device implement the StartUpMode attribute?"
id: OTCCM.S.A0002

- label: "Does the device implement the OnMode attribute?"
id: OTCCM.S.A0003

#
# server / Commands received
#
- label: "Does the device implement receiving the ChangeToMode command?"
id: OTCCM.S.C00.Rsp

#
# server / Commands generated
#
- label:
"Does the device implement sending the ChangeToModeResponse command?"
id: OTCCM.S.C01.Tx

- label: "Can the device be controlled manually?"
id: OTCCM.S.M.CAN_MANUALLY_CONTROLLED

# RVC Clean Mode Cluster

- label: "Does the device implement the RVCCLEANM cluster as a server?"
Expand Down
124 changes: 124 additions & 0 deletions src/app/tests/suites/certification/Test_TC_OTCCM_1_1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# Copyright (c) 2023 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: 3.1 [TC-OTCCM-1.1] Global attributes with server as DUT

PICS:
- OTCCM.S

config:
nodeId: 0x12344321
cluster: "Oven Mode"
endpoint: 1

tests:
- label: "Step 1: Wait for the commissioned device to be retrieved"
cluster: "DelayCommands"
command: "WaitForCommissionee"
arguments:
values:
- name: "nodeId"
value: nodeId

- label: "Step 2: TH reads from the DUT the ClusterRevision attribute."
command: "readAttribute"
attribute: "ClusterRevision"
response:
value: 1
constraints:
type: int16u

- label:
"Step 3: TH reads from the DUT the FeatureMap attribute, bit 0: SHALL
be 1 if and only if OTCCM.S.F00(DEPONOFF)"
command: "readAttribute"
attribute: "FeatureMap"
PICS: OTCCM.S.F00
response:
constraints:
type: bitmap32
hasMasksSet: [0x1]

- label: "Step 3: TH reads from the DUT the FeatureMap attribute."
command: "readAttribute"
attribute: "FeatureMap"
PICS: "!OTCCM.S.F00"
response:
value: 0
constraints:
type: bitmap32

- label: "Step 4a: TH reads from the DUT the AttributeList attribute."
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: TH reads from the DUT the AttributeList attribute."
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(StartUpMode) in AttributeList"
PICS: OTCCM.S.A0002
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [2]

- label:
"Step 4c: Read the Feature dependent attribute(DEPONOFF) in
AttributeList"
PICS: OTCCM.S.F00
command: "readAttribute"
attribute: "AttributeList"
response:
constraints:
type: list
contains: [3]

- label: "Step 5: TH reads from the DUT the EventList attribute."
PICS: PICS_EVENT_LIST_ENABLED
command: "readAttribute"
attribute: "EventList"
response:
value: []
constraints:
type: list

- label: "Step 6: TH reads from the DUT the AcceptedCommandList attribute."
command: "readAttribute"
attribute: "AcceptedCommandList"
response:
constraints:
type: list
contains: [0]

- label: "Step 7: TH reads from the DUT the GeneratedCommandList attribute."
command: "readAttribute"
attribute: "GeneratedCommandList"
response:
constraints:
type: list
contains: [1]
70 changes: 70 additions & 0 deletions src/app/tests/suites/certification/Test_TC_OTCCM_1_2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Copyright (c) 2023 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: 3.2 [TC-OTCCM-1.2] Cluster attributes with DUT as Server

PICS:
- OTCCM.S

config:
nodeId: 0x12344321
cluster: "Oven Mode"
endpoint: 1

tests:
- label:
"Step 1: Commission DUT to TH (can be skipped if done in a preceding
test)."
verification: |

disabled: true

- label: "Step 2: TH reads from the DUT the SupportedModes attribute."
PICS: OTCCM.S.A0000
verification: |
./chip-tool Ovenmode read supported-modes 1 1

Verify that the DUT response contains list of ModeOptionsStruct entries.
- Verify that the list has at least 2 and at most 255 entries
- Verify that each ModeOptionsStruct entry has a unique Mode field value and Label field value
- If ModeOptionsStruct entry’s ModeTags field is not empty, then Verify the values of the Value fields that are not larger than 16 bits, for each Value field: Is the mode tag value a defined common tag value ( Auto(0x0000), Quick(0x0001), Quiet(0x0002), LowNoise(0x0003), LowEnergy(0x0004), Vacation(0x0005), Min(0x0006), Max(0x0007), Night(0x0008), Day(0x0009)) or a defined cluster derived tag value ( Normal, Delicate, Heavy, Whites) or in the MfgTags (0x8000 to 0xBFFF) range
- If the Value field is in the MfgTags (0x8000 to 0xBFFF) range, the TagName field is a string with a length between 1 and 64
- Verify that at least one ModeOptionsStruct entry includes the Normal mode tag
- Save the Mode field values as supported_modes_dut on the TH (Chip-tool)
disabled: true

- label: "Step 3: TH reads from the DUT the CurrentMode attribute."
PICS: OTCCM.S.A0001
verification: |
./chip-tool Ovenmode read current-mode 1 1

Verify on TH(chip-tool) logs, CurrentMode attribute value is an integer value from supported_modes_dut

disabled: true

- label: "Step 4: TH reads from the DUT the OnMode attribute."
PICS: OTCCM.S.A0003
verification: |
./chip-tool Ovenmode read on-mode 1 1

Verify on TH(chip-tool) logs, OnMode attribute value is an integer value from supported_modes_dut or null
disabled: true

- label: "Step 5: TH reads from the DUT the StartUpMode attribute."
PICS: OTCCM.S.A0002
verification: |
./chip-tool Ovenmode read start-up-mode 1 1

Verify on TH(chip-tool) logs, StartUpMode attribute value is an integer value from supported_modes_dut or null
disabled: true
Loading
Loading