Skip to content

Commit 060143e

Browse files
authored
OPCREDS: Remove all the PICS markers (#33336)
Everything in this cluster is mandatory, these steps do not need to be gated on the presence of a PICS, and if the PICS are set incorrectly, these tests will fail in unexpected and hard to debug ways.
1 parent f33c62b commit 060143e

5 files changed

+0
-35
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ tests:
177177
disabled: true
178178

179179
- label: "Step 6: From TH1 read the CurrentFabricIndex"
180-
PICS: OPCREDS.S.A0005
181180
verification: |
182181
./chip-tool operationalcredentials read current-fabric-index 1 0
183182

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

-13
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ tests:
7474
"Step 4: TH1 sends the UpdateNOC command to the Node Operational
7575
Credentials cluster with the following fields: NOCValue is set to
7676
noc_original ICACValue is to set icac_original"
77-
PICS: OPCREDS.S.C07.Rsp
7877
verification: |
7978
Verify that the DUT responds with FAILSAFE_REQUIRED
8079
@@ -135,7 +134,6 @@ tests:
135134
"Step 6: TH1 sends the UpdateNOC command to the Node Operational
136135
Credentials cluster with the following fields: NOCValue is set to
137136
noc_original ICACValue is to set icac_original"
138-
PICS: OPCREDS.S.C07.Rsp
139137
verification: |
140138
Verify that the DUT responds with a NOCResponse with the StatusCode field set to MissingCsr that is status code 4
141139
@@ -151,7 +149,6 @@ tests:
151149
- label:
152150
"Step 7: TH1 Sends CSRRequest command with the IsForUpdateNOC field
153151
set to false"
154-
PICS: OPCREDS.S.C04.Rsp
155152
verification: |
156153
Verify that the DUT returns a CSRResponse and save as csr_not_update
157154
@@ -182,15 +179,13 @@ tests:
182179
"Step 9: TH1 sends the UpdateNOC command to the Node Operational
183180
Credentials cluster with the following fields: NOCValue is set to
184181
noc_not_for_update ICACValue is to set icac_not_for_update"
185-
PICS: OPCREDS.S.C07.Rsp
186182
verification: |
187183
188184
disabled: true
189185

190186
- label:
191187
"Step 10: TH1 Sends CSRRequest command with the IsForUpdateNOC field
192188
set to true"
193-
PICS: OPCREDS.S.C04.Rsp
194189
verification: |
195190
196191
disabled: true
@@ -199,7 +194,6 @@ tests:
199194
"Step 11: TH1 sends the UpdateNOC command to the Node Operational
200195
Credentials cluster with the following fields: NOCValue is set to
201196
noc_original ICACValue is to set icac_original"
202-
PICS: OPCREDS.S.C07.Rsp
203197
verification: |
204198
205199
disabled: true
@@ -225,7 +219,6 @@ tests:
225219
"Step 14: TH1 sends the UpdateNOC command to the Node Operational
226220
Credentials cluster with the following fields: NOCValue is set to
227221
noc_update_new_root ICACValue is to set icac_update_new_root"
228-
PICS: OPCREDS.S.C07.Rsp
229222
verification: |
230223
231224
disabled: true
@@ -247,7 +240,6 @@ tests:
247240
Credentials cluster with the following fields: NOCValue is set to
248241
noc_update_bad_fabric_on_noc ICACValue is to set
249242
icac_update_bad_fabric_on_noc"
250-
PICS: OPCREDS.S.C07.Rsp
251243
verification: |
252244
253245
disabled: true
@@ -269,15 +261,13 @@ tests:
269261
Credentials cluster with the following fields: NOCValue is set to
270262
noc_update_bad_fabric_on_icac ICACValue is to set
271263
icac_update_bad_fabric_on_icac"
272-
PICS: OPCREDS.S.C07.Rsp
273264
verification: |
274265
275266
disabled: true
276267

277268
- label:
278269
"Step 19: TH1 sends AddTrustedRootCertificate command to DUT again
279270
with the RootCACertificate field set to new_root_cert"
280-
PICS: OPCREDS.S.C0b.Rsp
281271
verification: |
282272
283273
disabled: true
@@ -286,7 +276,6 @@ tests:
286276
"Step 20: TH1 sends the UpdateNOC command to the Node Operational
287277
Credentials cluster with the following fields: NOCValue is set to
288278
noc_update_new_root ICACValue is to set icac_update_new_root"
289-
PICS: OPCREDS.S.C07.Rsp
290279
verification: |
291280
292281
disabled: true
@@ -314,7 +303,6 @@ tests:
314303
- label:
315304
"Step 24: TH1 Sends CSRRequest command over PASE with the
316305
IsForUpdateNOC field set to true"
317-
PICS: OPCREDS.S.C04.Rsp
318306
verification: |
319307
320308
disabled: true
@@ -332,7 +320,6 @@ tests:
332320
"Step 26: TH1 sends the UpdateNOC command to the Node Operational
333321
Credentials cluster over PASE with the following fields: NOCValue is
334322
set to noc_pase ICACValue is to set icac_pase"
335-
PICS: OPCREDS.S.C07.Rsp
336323
verification: |
337324
338325
disabled: true

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

-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ tests:
8484
- label:
8585
"Step 5: TH1 Sends CSRRequest command with the IsForUpdateNOC field
8686
set to true"
87-
PICS: OPCREDS.S.C04.Rsp
8887
verification: |
8988
To get csr nonce give below command 2 times in TH(chip-tool)
9089
echo hex:$(hexdump -vn32 -e'4/4 "%08X" ' /dev/urandom)
@@ -116,7 +115,6 @@ tests:
116115
"Step 7: TH1 sends the UpdateNOC command to the Node Operational
117116
Credentials cluster with the following fields: NOCValue is set to
118117
noc_update1 ICACValue is to set icac_update1"
119-
PICS: OPCREDS.S.C07.Rsp
120118
verification: |
121119
122120
disabled: true
@@ -152,7 +150,6 @@ tests:
152150
- label:
153151
"Step 12: TH1 Sends CSRRequest command with the IsForUpdateNOC field
154152
set to true"
155-
PICS: OPCREDS.S.C04.Rsp
156153
verification: |
157154
158155
disabled: true
@@ -174,7 +171,6 @@ tests:
174171
"Step 14: TH1 sends the UpdateNOC command to the Node Operational
175172
Credentials cluster with the following fields: NOCValue is set to
176173
noc_update2 ICACValue is to set icac_update2"
177-
PICS: OPCREDS.S.C07.Rsp
178174
verification: |
179175
180176
disabled: true

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

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ tests:
3838
- label:
3939
"Step 2: TH1 sends RemoveFabric command with Fabric Index as
4040
FabricIndex_TH1 to DUT"
41-
PICS: OPCREDS.S.C0a.Rsp
4241
verification: |
4342
./chip-tool operationalcredentials remove-fabric 1 1 0
4443

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

-16
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ tests:
3939
- label:
4040
"Step 1: Factory Reset DUT (to ensure NOC list is empty at the
4141
beginning of the following steps)"
42-
PICS: OPCREDS.S.A0000
4342
# verification: ""
4443
# Disabling this step, because the test starts with a DUT device that has just been commissioned by the TH1 commissioner
4544
disabled: true
@@ -56,7 +55,6 @@ tests:
5655
- label:
5756
"Step 3.1: Save the FabricIndex for TH1 as TH1_Fabric_Index for future
5857
use."
59-
PICS: OPCREDS.S.A0001
6058
identity: "alpha"
6159
command: "readAttribute"
6260
cluster: "Operational Credentials"
@@ -68,7 +66,6 @@ tests:
6866
"Step 3.2: TH1 does a non-fabric-filtered read of the Fabrics
6967
attribute from the Node Operational Credentials cluster. Save the
7068
FabricIndex for TH1 as TH1_Fabric_Index for future use."
71-
PICS: OPCREDS.S.A0001
7269
identity: "alpha"
7370
command: "readAttribute"
7471
cluster: "Operational Credentials"
@@ -83,7 +80,6 @@ tests:
8380
- label:
8481
"Step 4: TH1 sends ArmFailSafe command to the DUT with the
8582
ExpiryLengthSeconds field set to 60 seconds"
86-
PICS: CGEN.S.C00.Rsp && CGEN.S.C01.Tx
8783
identity: "alpha"
8884
cluster: "General Commissioning"
8985
command: "ArmFailSafe"
@@ -100,7 +96,6 @@ tests:
10096

10197
# verification: "Verify that the DUT sends ArmFailSafeResponse command to TH1 with field ErrorCode as OK(0)"
10298
- label: "Step 5: TH1 Sends CSRRequest command with a random 32-byte nonce."
103-
PICS: OPCREDS.S.C04.Rsp
10499
identity: "alpha"
105100
command: "CSRRequest"
106101
cluster: "Operational Credentials"
@@ -119,7 +114,6 @@ tests:
119114
- label:
120115
"Step 6.1: Read the commissioner root certificate from TH2's fabric.
121116
Save RCAC as Root_CA_Certificate_TH2"
122-
# PICS:
123117
identity: "beta"
124118
cluster: "CommissionerCommands"
125119
command: "GetCommissionerRootCertificate"
@@ -135,7 +129,6 @@ tests:
135129
TH2. Save ICAC as Intermediate_Certificate_TH2. Save NOC as
136130
Node_Operational_Certificate_TH2. Save IPK as IPK_TH2. Extract the
137131
RCAC public key and save as Root_Public_Key_TH2."
138-
# PICS:
139132
identity: "beta"
140133
cluster: "CommissionerCommands"
141134
command: "IssueNocChain"
@@ -156,7 +149,6 @@ tests:
156149

157150
# verification: ""
158151
- label: "Step 7.1: Read the commissioner node ID from TH2"
159-
# PICS:
160152
identity: "beta"
161153
cluster: "CommissionerCommands"
162154
command: "GetCommissionerNodeId"
@@ -169,7 +161,6 @@ tests:
169161
- label:
170162
"Step 7.2: TH1 sends AddTrustedRootCertificate command to DUT with
171163
RootCACertificate set to Root_CA_Certificate_TH2"
172-
PICS: OPCREDS.S.C0b.Rsp
173164
identity: "alpha"
174165
command: "AddTrustedRootCertificate"
175166
cluster: "Operational Credentials"
@@ -184,7 +175,6 @@ tests:
184175
fields: NOCValue as Node_Operational_Certificate_TH2. ICACValue as
185176
Intermediate_Certificate_TH2. IpkValue as IPK_TH2. CaseAdminSubject as
186177
the NodeID of TH2. AdminVendorId as the Vendor ID of TH2."
187-
PICS: OPCREDS.S.C06.Rsp && OPCREDS.S.C08.Tx
188178
identity: "alpha"
189179
command: "AddNOC"
190180
cluster: "Operational Credentials"
@@ -207,14 +197,12 @@ tests:
207197

208198
# verification: "Verify that DUT responds with NOCResponse with status code OK"
209199
- label: "Step 9: TH2 starts discovery of DUT using Operational Discovery"
210-
# PICS: ""
211200
# verification: ""
212201
# Disabling this step as this occurs from the AddNOC command being run
213202
disabled: true
214203

215204
- label:
216205
"Step 10: TH2 opens a CASE session with DUT over operational network."
217-
# PICS: ""
218206
identity: "beta"
219207
cluster: "DelayCommands"
220208
command: "WaitForCommissionee"
@@ -225,7 +213,6 @@ tests:
225213

226214
# verification: "DUT is able to open the CASE session with TH2"
227215
- label: "Step 11: TH2 sends CommissioningComplete command"
228-
PICS: CGEN.S.C05.Tx
229216
nodeId: 0x43211234
230217
identity: "beta"
231218
cluster: "General Commissioning"
@@ -240,7 +227,6 @@ tests:
240227
"Step 12: TH2 reads the Current Fabric Index attribute from the Node
241228
Operational Credentials cluster. Save the FabricIndex for TH2 as
242229
TH2_Fabric_Index."
243-
PICS: OPCREDS.S.A0001
244230
identity: "beta"
245231
nodeId: 0x43211234
246232
command: "readAttribute"
@@ -253,7 +239,6 @@ tests:
253239
- label:
254240
"Step 13: TH2 does a non-fabric-filtered read of the Fabrics attribute
255241
from the Node Operational Credentials cluster"
256-
PICS: OPCREDS.S.A0001
257242
identity: "beta"
258243
nodeId: 0x43211234
259244
command: "readAttribute"
@@ -273,7 +258,6 @@ tests:
273258
- label:
274259
"Step 14: TH1 sends RemoveFabric command to DUT with the FabricIndex
275260
field set to TH2_Fabric_Index."
276-
PICS: OPCREDS.S.C0a.Rsp
277261
identity: "alpha"
278262
command: "RemoveFabric"
279263
cluster: "Operational Credentials"

0 commit comments

Comments
 (0)