@@ -1542,35 +1542,55 @@ def _commission_device(self, i) -> bool:
1542
1542
info .filter_value = conf .discriminators [i ]
1543
1543
1544
1544
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
1551
1556
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
1560
1570
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
1568
1583
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
1574
1594
else :
1575
1595
raise ValueError ("Invalid commissioning method %s!" % conf .commissioning_method )
1576
1596
0 commit comments