Updating endpoint to EP0

Author: r-recchia

src/python_testing/TC_DEM_2_2.py

@@ -174,7 +174,7 @@ async def test_TC_DEM_2_2(self):
         # Commission DUT - already done
 
         self.step("2")
-        # await self.validate_feature_map([Clusters.DeviceEnergyManagement.Bitmaps.Feature.kPowerAdjustment], [])
+        await self.validate_feature_map([Clusters.DeviceEnergyManagement.Bitmaps.Feature.kPowerAdjustment], [])
 
         self.step("3")
         # Subscribe to Events and when they are sent push them to a queue for checking later
@@ -184,7 +184,7 @@ async def test_TC_DEM_2_2(self):
                                     self.get_endpoint(default=1))
 
         self.step("4")
-        # await self.check_test_event_triggers_enabled()
+        await self.check_test_event_triggers_enabled()
 
         self.step("5")
         await self.send_test_event_trigger_power_adjustment()

src/python_testing/matter_testing_infrastructure/chip/testing/matter_testing.py

@@ -1309,10 +1309,9 @@ async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = N
 
         # What about --endpoing != 0 and legacy = True? Right now target endpoint is set to 0
 
+        target_endpoint = 0
         if not self.matter_test_config.legacy and self.matter_test_config.endpoint is not None:
             target_endpoint = self.matter_test_config.endpoint
-        else:
-            target_endpoint = 0
 
         print("")
         print("Target endpoint: ", target_endpoint)
@@ -1330,7 +1329,7 @@ async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = N
 
         try:
             # GeneralDiagnostics cluster is meant to be on Endpoint 0 (Root)
-            await self.send_single_cmd(endpoint=target_endpoint,
+            await self.send_single_cmd(endpoint=0,
                                        cmd=Clusters.GeneralDiagnostics.Commands.TestEventTrigger(
                                            enableKey,
                                            eventTrigger)