Skip to content

Commit 4df0874

Browse files
committed
[Python] Use new commissioning error handling in matter_testing_support.py
1 parent 07aa8a9 commit 4df0874

File tree

1 file changed

+46
-26
lines changed

1 file changed

+46
-26
lines changed

src/python_testing/matter_testing_support.py

+46-26
Original file line numberDiff line numberDiff line change
@@ -1542,35 +1542,55 @@ def _commission_device(self, i) -> bool:
15421542
info.filter_value = conf.discriminators[i]
15431543

15441544
if conf.commissioning_method == "on-network":
1545-
return dev_ctrl.CommissionOnNetwork(
1546-
nodeId=conf.dut_node_ids[i],
1547-
setupPinCode=info.passcode,
1548-
filterType=info.filter_type,
1549-
filter=info.filter_value
1550-
)
1545+
try:
1546+
dev_ctrl.CommissionOnNetwork(
1547+
nodeId=conf.dut_node_ids[i],
1548+
setupPinCode=info.passcode,
1549+
filterType=info.filter_type,
1550+
filter=info.filter_value
1551+
)
1552+
return True
1553+
except ChipStackError as e:
1554+
logging.error("Commissioning failed: %s" % e)
1555+
return False
15511556
elif conf.commissioning_method == "ble-wifi":
1552-
return dev_ctrl.CommissionWiFi(
1553-
info.filter_value,
1554-
info.passcode,
1555-
conf.dut_node_ids[i],
1556-
conf.wifi_ssid,
1557-
conf.wifi_passphrase,
1558-
isShortDiscriminator=(info.filter_type == DiscoveryFilterType.SHORT_DISCRIMINATOR)
1559-
)
1557+
try:
1558+
dev_ctrl.CommissionWiFi(
1559+
info.filter_value,
1560+
info.passcode,
1561+
conf.dut_node_ids[i],
1562+
conf.wifi_ssid,
1563+
conf.wifi_passphrase,
1564+
isShortDiscriminator=(info.filter_type == DiscoveryFilterType.SHORT_DISCRIMINATOR)
1565+
)
1566+
return True
1567+
except ChipStackError as e:
1568+
logging.error("Commissioning failed: %s" % e)
1569+
return False
15601570
elif conf.commissioning_method == "ble-thread":
1561-
return dev_ctrl.CommissionThread(
1562-
info.filter_value,
1563-
info.passcode,
1564-
conf.dut_node_ids[i],
1565-
conf.thread_operational_dataset,
1566-
isShortDiscriminator=(info.filter_type == DiscoveryFilterType.SHORT_DISCRIMINATOR)
1567-
)
1571+
try:
1572+
dev_ctrl.CommissionThread(
1573+
info.filter_value,
1574+
info.passcode,
1575+
conf.dut_node_ids[i],
1576+
conf.thread_operational_dataset,
1577+
isShortDiscriminator=(info.filter_type == DiscoveryFilterType.SHORT_DISCRIMINATOR)
1578+
)
1579+
return True
1580+
except ChipStackError as e:
1581+
logging.error("Commissioning failed: %s" % e)
1582+
return False
15681583
elif conf.commissioning_method == "on-network-ip":
1569-
logging.warning("==== USING A DIRECT IP COMMISSIONING METHOD NOT SUPPORTED IN THE LONG TERM ====")
1570-
return dev_ctrl.CommissionIP(
1571-
ipaddr=conf.commissionee_ip_address_just_for_testing,
1572-
setupPinCode=info.passcode, nodeid=conf.dut_node_ids[i]
1573-
)
1584+
try:
1585+
logging.warning("==== USING A DIRECT IP COMMISSIONING METHOD NOT SUPPORTED IN THE LONG TERM ====")
1586+
dev_ctrl.CommissionIP(
1587+
ipaddr=conf.commissionee_ip_address_just_for_testing,
1588+
setupPinCode=info.passcode, nodeid=conf.dut_node_ids[i]
1589+
)
1590+
return True
1591+
except ChipStackError as e:
1592+
logging.error("Commissioning failed: %s" % e)
1593+
return False
15741594
else:
15751595
raise ValueError("Invalid commissioning method %s!" % conf.commissioning_method)
15761596

0 commit comments

Comments
 (0)