@@ -609,7 +609,7 @@ class MatterTestConfig:
609
609
# path to device attestation revocation set json file
610
610
dac_revocation_set_path : Optional [pathlib .Path ] = None
611
611
612
- legacy : Optional [ bool ] = None
612
+ legacy : bool = False
613
613
614
614
615
615
class ClusterMapper :
@@ -1224,26 +1224,17 @@ async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = N
1224
1224
else :
1225
1225
enableKey = self .matter_test_config .global_test_params ['enableKey' ]
1226
1226
1227
- # What about --endpoing != 0 and legacy = True? Right now target endpoint is set to 0
1228
-
1229
1227
target_endpoint = 0
1230
- if not self .matter_test_config .legacy and self .matter_test_config .endpoint is not None :
1231
- target_endpoint = self .matter_test_config .endpoint
1232
-
1233
- print ("" )
1234
- print ("Target endpoint: " , target_endpoint )
1235
- print ("" )
1236
1228
1237
- print ("" )
1238
- print ("Event trigger: " , hex (eventTrigger ))
1239
- print ("" )
1229
+ if self .matter_test_config .legacy :
1230
+ logger .info ("Legacy test event trigger activated" )
1231
+ else :
1232
+ logger .info ("Legacy test event trigger deactivated" )
1233
+ target_endpoint = self .get_endpoint ()
1240
1234
1235
+ # Sets endpoint in eventTrigger
1241
1236
eventTrigger = eventTrigger | (target_endpoint << 32 )
1242
1237
1243
- print ("" )
1244
- print ("Event trigger: " , hex (eventTrigger ))
1245
- print ("" )
1246
-
1247
1238
try :
1248
1239
# GeneralDiagnostics cluster is meant to be on Endpoint 0 (Root)
1249
1240
general_diagnostics_result = await self .send_single_cmd (endpoint = 0 ,
@@ -1252,10 +1243,6 @@ async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = N
1252
1243
eventTrigger )
1253
1244
)
1254
1245
1255
- print ("" )
1256
- logger .info (general_diagnostics_result )
1257
- print ("" )
1258
-
1259
1246
except InteractionModelError as e :
1260
1247
asserts .fail (
1261
1248
f"Sending TestEventTrigger resulted in Unexpected error. Are they enabled in DUT? Command returned - { e .status } " )
0 commit comments