From 5c0201af6a05dbd163ff2844ddcf0e38071e80dd Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Mon, 21 Jul 2025 12:28:20 -0600 Subject: [PATCH 1/2] adding dt to test code Signed-off-by: Abby Wheelis --- .../core_utils/controller/everest_test_controller.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py b/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py index 0082472..6613512 100644 --- a/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py +++ b/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py @@ -50,15 +50,15 @@ def plug_in(self, connector_id=1): f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", "sleep 1;iec_wait_pwr_ready;sleep 1;draw_power_regulated 32,1;sleep 200;unplug") - def plug_in_ac_iso(self, connector_id=1): + def plug_in_ac_iso(self, connector_id=1, departure_time=86400 e_amount=0): self._mqtt_client.publish( f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", - "sleep 1;iso_wait_slac_matched;iso_start_v2g_session AC;iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 20;iso_stop_charging;iso_wait_v2g_session_stopped;unplug") + f"sleep 1;iso_wait_slac_matched;iso_start_v2g_session AC {departure_time} {e_amount};iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 20;iso_stop_charging;iso_wait_v2g_session_stopped;unplug") - def plug_in_dc_iso(self, connector_id=1): + def plug_in_dc_iso(self, connector_id=1, departure_time=86400 e_amount=0): self._mqtt_client.publish( f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", - "sleep 1;iso_wait_slac_matched;iso_start_v2g_session DC;iso_wait_pwr_ready;iso_wait_for_stop 20;iso_wait_v2g_session_stopped;unplug" + f"sleep 1;iso_wait_slac_matched;iso_start_v2g_session DC {departure_time} {e_amount};iso_wait_pwr_ready;iso_wait_for_stop 20;iso_wait_v2g_session_stopped;unplug" ) def plug_out(self, connector_id=1): From 3778e59a7dfc2b29a2a050b99cfa4640e3e68b81 Mon Sep 17 00:00:00 2001 From: Abby Wheelis Date: Mon, 21 Jul 2025 13:58:42 -0600 Subject: [PATCH 2/2] add commas Signed-off-by: Abby Wheelis --- .../testing/core_utils/controller/everest_test_controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py b/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py index 6613512..7c8e27e 100644 --- a/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py +++ b/everest-testing/src/everest/testing/core_utils/controller/everest_test_controller.py @@ -50,12 +50,12 @@ def plug_in(self, connector_id=1): f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", "sleep 1;iec_wait_pwr_ready;sleep 1;draw_power_regulated 32,1;sleep 200;unplug") - def plug_in_ac_iso(self, connector_id=1, departure_time=86400 e_amount=0): + def plug_in_ac_iso(self, connector_id=1, departure_time=86400, e_amount=0): self._mqtt_client.publish( f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", f"sleep 1;iso_wait_slac_matched;iso_start_v2g_session AC {departure_time} {e_amount};iso_wait_pwr_ready;iso_draw_power_regulated 16,3;sleep 20;iso_stop_charging;iso_wait_v2g_session_stopped;unplug") - def plug_in_dc_iso(self, connector_id=1, departure_time=86400 e_amount=0): + def plug_in_dc_iso(self, connector_id=1, departure_time=86400, e_amount=0): self._mqtt_client.publish( f"{self._mqtt_external_prefix}everest_external/nodered/{connector_id}/carsim/cmd/execute_charging_session", f"sleep 1;iso_wait_slac_matched;iso_start_v2g_session DC {departure_time} {e_amount};iso_wait_pwr_ready;iso_wait_for_stop 20;iso_wait_v2g_session_stopped;unplug"