Skip to content

Commit bc6337d

Browse files
authored
TC-CNET-4.10 and 4.16: Set endpoint to 0 for general commissioning cluster commands (#41719)
* Change arm failsafe to be run on ep0 * Commissioning complete too * fix breadcrumb
1 parent cc93907 commit bc6337d

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

src/python_testing/TC_CNET_4_10.py

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ async def test_TC_CNET_4_10(self):
209209

210210
# Step 4: Arm failsafe and verify response
211211
self.step(4)
212-
await self.send_single_cmd(
213-
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
214-
)
212+
await self.send_single_cmd(endpoint=0,
213+
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
214+
)
215215
# Successful command execution is implied if no exception is raised.
216216

217217
# Step 5: Read Networks and verify thread network
@@ -280,6 +280,7 @@ async def test_TC_CNET_4_10(self):
280280
# Step 10: Verify breadcrumb
281281
self.step(10)
282282
breadcrumb = await self.read_single_attribute_check_success(
283+
endpoint=0,
283284
cluster=gen_comm,
284285
attribute=gen_comm.Attributes.Breadcrumb
285286
)
@@ -299,16 +300,17 @@ async def test_TC_CNET_4_10(self):
299300
# Step 12: Verify breadcrumb unchanged
300301
self.step(12)
301302
breadcrumb = await self.read_single_attribute_check_success(
303+
endpoint=0,
302304
cluster=gen_comm,
303305
attribute=gen_comm.Attributes.Breadcrumb
304306
)
305307
asserts.assert_equal(breadcrumb, 1)
306308

307309
# Step 13: Disable failsafe
308310
self.step(13)
309-
await self.send_single_cmd(
310-
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0)
311-
)
311+
await self.send_single_cmd(endpoint=0,
312+
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0)
313+
)
312314
# Successful command execution is implied if no exception is raised.
313315

314316
# Step 14: Verify network restored
@@ -329,9 +331,9 @@ async def test_TC_CNET_4_10(self):
329331

330332
# Step 15: Re-arm failsafe
331333
self.step(15)
332-
await self.send_single_cmd(
333-
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
334-
)
334+
await self.send_single_cmd(endpoint=0,
335+
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
336+
)
335337
# Successful command execution is implied if no exception is raised.
336338

337339
# Step 16: Remove network again
@@ -348,16 +350,16 @@ async def test_TC_CNET_4_10(self):
348350

349351
# Step 17: Complete commissioning
350352
self.step(17)
351-
await self.send_single_cmd(
352-
cmd=gen_comm.Commands.CommissioningComplete()
353-
)
353+
await self.send_single_cmd(endpoint=0,
354+
cmd=gen_comm.Commands.CommissioningComplete()
355+
)
354356
# Successful command execution is implied if no exception is raised.
355357

356358
# Step 18: Verify failsafe disabled
357359
self.step(18)
358-
await self.send_single_cmd(
359-
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0)
360-
)
360+
await self.send_single_cmd(endpoint=0,
361+
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0)
362+
)
361363
# Successful command execution is implied if no exception is raised.
362364

363365
# Step 19: Verify network remains removed
@@ -380,9 +382,9 @@ async def test_TC_CNET_4_10(self):
380382
operational_dataset = self.matter_test_config.thread_operational_dataset
381383

382384
# Need to re-arm failsafe to add network
383-
await self.send_single_cmd(
384-
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
385-
)
385+
await self.send_single_cmd(endpoint=0,
386+
cmd=gen_comm.Commands.ArmFailSafe(expiryLengthSeconds=900, breadcrumb=0)
387+
)
386388

387389
# Use AddOrUpdateThreadNetwork with the dataset
388390
add_resp = await self.send_single_cmd(
@@ -395,9 +397,9 @@ async def test_TC_CNET_4_10(self):
395397
"Failed to add/update Thread network during cleanup")
396398

397399
# Commit the change by completing commissioning
398-
await self.send_single_cmd(
399-
cmd=gen_comm.Commands.CommissioningComplete()
400-
)
400+
await self.send_single_cmd(endpoint=0,
401+
cmd=gen_comm.Commands.CommissioningComplete()
402+
)
401403

402404
# Verify network added and is the one we intended to add
403405
networks_after_add = await self.read_single_attribute_check_success(

src/python_testing/TC_CNET_4_16.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ async def test_TC_CNET_4_16(self):
7777
self.step(1)
7878

7979
cmd = Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=900)
80-
res = await self.send_single_cmd(cmd=cmd)
80+
res = await self.send_single_cmd(endpoint=0, cmd=cmd)
8181
# Verify that DUT sends ArmFailSafeResponse command to the TH
8282
asserts.assert_equal(
8383
res.errorCode,

0 commit comments

Comments
 (0)