apply some PR comments + rebase

Signed-off-by: Martin Litre <[email protected]>

Author: mlitre

.ci/build-kit/docker/Dockerfile

@@ -11,9 +11,6 @@ FROM ghcr.io/everest/everest-ci/build-kit-base:${BASE_IMAGE_TAG}
 #     && git checkout ${EVEREST_CMAKE_VERSION} \
 #     && rm -r .git
 
-# FIXME(kai): Install libsystemd-dev as a dependency of sdbus-c++
-RUN apt-get update && apt-get -y install libsystemd-dev
-ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
 ENV EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
 ENV EVEREST_CMAKE_VERSION=tmp/eebus
 RUN rm -rf ${EVEREST_CMAKE_PATH} \
@@ -22,6 +19,10 @@ RUN rm -rf ${EVEREST_CMAKE_PATH} \
     && git checkout ${EVEREST_CMAKE_VERSION} \
     && rm -r .git
 
+# FIXME(kai): Install libsystemd-dev as a dependency of sdbus-c++
+RUN apt-get update && apt-get -y install libsystemd-dev
+ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
+
 ARG GO_VERSION=1.24.2
 ADD https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz /tmp/go.tar.gz
 RUN if [ -d /usr/local/go ]; then \
@@ -86,13 +87,3 @@ RUN python3.13 -m pip install --break-system-packages \
     sphinxcontrib-svg2pdfconverter \
     git+https://github.com/EVerest/[email protected]#subdirectory=dependency_manager
 
-
-# Can be used to use an other version of everest-cmake
-ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
-ENV EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake
-ENV EVEREST_CMAKE_VERSION=tmp/eebus
-RUN rm -rf ${EVEREST_CMAKE_PATH} \
-    && git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \
-    && cd ${EVEREST_CMAKE_PATH} \
-    && git checkout ${EVEREST_CMAKE_VERSION} \
-    && rm -r .git

.ci/build-kit/scripts/create_ocpp_tests_image.sh

@@ -8,7 +8,7 @@ if [ $retVal -ne 0 ]; then
     exit $retVal
 fi
 
-python3 -m pip install --break-system-packages \
+pip install --break-system-packages \
     "$EXT_MOUNT"/wheels/everestpy-*.whl \
     "$EXT_MOUNT"/wheels/everest_testing-*.whl \
     "$EXT_MOUNT"/wheels/iso15118-*.whl \
@@ -20,6 +20,6 @@ if [ $retVal -ne 0 ]; then
     exit $retVal
 fi
 
-python3 -m pip install --break-system-packages -r tests/ocpp_tests/requirements.txt
+pip install --break-system-packages -r tests/ocpp_tests/requirements.txt
 
 $(cd ./tests/ocpp_tests/test_sets/everest-aux/ && ./install_certs.sh "$EXT_MOUNT/dist" && ./install_configs.sh "$EXT_MOUNT/dist")

.ci/e2e/scripts/run_integration_tests.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd tests
-python3 -m pytest \
+pytest \
   -rA \
   --junitxml="$EXT_MOUNT/result.xml" \
   --html="$EXT_MOUNT/report.html" \

.ci/e2e/scripts/run_ocpp_tests.sh

@@ -6,7 +6,7 @@ PARALLEL_TESTS=$(nproc)
 
 echo "Running $PARALLEL_TESTS ocpp tests in parallel"
 
-python3 -m pytest \
+pytest \
   -rA \
   -n "$PARALLEL_TESTS" \
   --dist=loadgroup \

CMakeLists.txt

@@ -21,7 +21,7 @@ if (NOT everest-cmake_FOUND)
     FetchContent_Declare(
         everest-cmake
         GIT_REPOSITORY https://github.com/EVerest/everest-cmake.git
-        GIT_TAG        v0.6.0
+        GIT_TAG        main
     )
     FetchContent_MakeAvailable(everest-cmake)
     set(everest-cmake_DIR "${everest-cmake_SOURCE_DIR}")

modules/EnergyManagement/EEBUS/ConfigValidator.cpp

@@ -72,11 +72,11 @@ std::string ConfigValidator::get_serial_number() const {
 }
 
 int ConfigValidator::get_failsafe_control_limit() const {
-    return this->config.failsafe_control_limit;
+    return this->config.failsafe_control_limit_W;
 }
 
 int ConfigValidator::get_max_nominal_power() const {
-    return this->config.max_nominal_power;
+    return this->config.max_nominal_power_W;
 }
 
 bool ConfigValidator::validate_eebus_service_port() const {
@@ -180,15 +180,15 @@ bool ConfigValidator::validate_serial_number() const {
 }
 
 bool ConfigValidator::validate_failsafe_control_limit() const {
-    if (this->config.failsafe_control_limit < 0) {
+    if (this->config.failsafe_control_limit_W < 0) {
         EVLOG_error << "failsafe_control_limit is negative";
         return false;
     }
     return true;
 }
 
 bool ConfigValidator::validate_max_nominal_power() const {
-    if (this->config.max_nominal_power < 0) {
+    if (this->config.max_nominal_power_W < 0) {
         EVLOG_error << "max_nominal_power is negative";
         return false;
     }

modules/EnergyManagement/EEBUS/EEBUS.hpp

@@ -38,8 +38,8 @@ struct Conf {
     std::string device_brand;
     std::string device_model;
     std::string serial_number;
-    int failsafe_control_limit;
-    int max_nominal_power;
+    int failsafe_control_limit_W;
+    int max_nominal_power_W;
 };
 
 class EEBUS : public Everest::ModuleBase {