Merge branch 'main' into cb/enable_and_fix_warnings

.ci/build-kit/run_unit_tests.sh

@@ -2,4 +2,6 @@
 
 set -e
 
+trap "cp $EXT_MOUNT/build/Testing/Temporary/LastTest.log $EXT_MOUNT/ctest-report" EXIT
+
 ninja -C "$EXT_MOUNT/build" test

.github/CODEOWNERS

@@ -13,13 +13,15 @@
 /lib/staging/gpio/ @corneliusclaussen @hikinggrass @hikinggrass
 /lib/staging/ocpp/ @hikinggrass @pietfried @corneliusclaussen
 /lib/staging/slac/ @a-w50 @corneliusclaussen @SebaLukas
+/lib/staging/tls/ @james-ctc @AssemblyJohn @corneliusclaussen @SebaLukas
 
 # modules
 /modules/API/ @hikinggrass @pietfried @corneliusclaussen
 /modules/Auth/ @pietfried @corneliusclaussen @hikinggrass
 /modules/Energymanager/ @corneliusclaussen @hikinggrass @pietfried
 /modules/EnergyNode/ @corneliusclaussen @hikinggrass @pietfried
 /modules/EvseManager/ @corneliusclaussen @SebaLukas @hikinggrass @pietfried
+/modules/EvManager/ @SebaLukas @pietfried @MarzellT
 /modules/EvseSecurity/ @AssemblyJohn @pietfried @hikinggrass
 /modules/EvseV2G/ @corneliusclaussen @SebaLukas @james-ctc
 /modules/EvseSlac/ @a-w50 @corneliusclaussen @SebaLukas

.github/workflows/bazel_build_and_test.yaml

@@ -15,9 +15,6 @@ jobs:
           key: ${{ runner.os }}-bazel-${{ hashFiles('dependencies.yaml', '.bazelversion', '.bazelrc', 'WORKSPACE.bazel', 'third-party/bazel/*') }}
           restore-keys: |
             ${{ runner.os }}-bazel-
-      - name: Setup edm
-        run: |
-          pip install git+https://github.com/Everest/everest-dev-environment.git#subdirectory=dependency_manager
       - name: Build all
         run: >
           bazelisk build //...

.github/workflows/build_and_test.yaml

@@ -94,6 +94,12 @@ jobs:
         with:
           path: dist-wheels
           name: wheels
+      - name: Archive unit test results
+        if: always()
+        uses: actions/[email protected]
+        with:
+          name: ctest-report
+          path: ${{ github.workspace }}/ctest-report
   integration-tests:
     name: Integration Tests
     needs: build

BUILD.bazel

@@ -7,4 +7,7 @@ filegroup(
     srcs = glob(["errors/**/*.yaml"]),
 )
 
-exports_files(["dependencies.yaml"])
+exports_files([
+    "dependencies.yaml",
+    "WORKSPACE.bazel",
+])

README.md

@@ -17,7 +17,7 @@ More CPU cores will optionally boost the build process, while requiring more RAM
 
 ```bash
 sudo apt update
-sudo apt install -y python3-pip git rsync wget cmake doxygen graphviz build-essential clang-tidy cppcheck openjdk-17-jdk npm docker docker-compose libboost-all-dev nodejs libssl-dev libsqlite3-dev clang-format curl rfkill libpcap-dev libevent-dev pkg-config libcap-dev
+sudo apt install -y python3-pip python3-venv git rsync wget cmake doxygen graphviz build-essential clang-tidy cppcheck openjdk-17-jdk npm docker docker-compose libboost-all-dev nodejs libssl-dev libsqlite3-dev clang-format curl rfkill libpcap-dev libevent-dev pkg-config libcap-dev
 ```
 
 #### OpenSuse

WORKSPACE.bazel

@@ -40,9 +40,6 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie
 
 crate_universe_dependencies()
 
-
-
-
 load("//third-party/bazel:repos.bzl", "everest_core_repos")
 
 everest_core_repos()
@@ -51,7 +48,6 @@ load("//third-party/bazel:defs.bzl", "everest_core_defs")
 
 everest_core_defs()
 
-
 load("@everest-framework//third-party/bazel:repos.bzl", "everest_framework_repos")
 
 everest_framework_repos()
@@ -62,4 +58,4 @@ everest_framework_deps()
 
 load("@everest-utils//third-party/bazel:defs.bzl", "everest_utils_defs")
 
-everest_utils_defs()
+everest_utils_defs()

cmake/assets/BUILD.bazel

@@ -0,0 +1,2 @@
+exports_files(["logging.ini"])
+

cmake/ev-project-bootstrap.cmake

@@ -4,11 +4,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/ev-cli.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/config-run-script.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/config-run-nodered-script.cmake)
 
-# dependencies
-setup_ev_cli()
-if(NOT ${${PROJECT_NAME}_INSTALL_EV_CLI_IN_PYTHON_VENV})
-    require_ev_cli_version("0.2.0")
-endif()
+set_property(
+    GLOBAL
+    PROPERTY EVEREST_REQUIRED_EV_CLI_VERSION "0.2.0"
+)
 
 # source generate scripts / setup
 include(${CMAKE_CURRENT_LIST_DIR}/everest-generate.cmake)

cmake/everest-generate.cmake

@@ -26,7 +26,7 @@ set_target_properties(generate_cpp_files
 #
 # out-of-tree interfaces/types/modules support
 #
-function(ev_add_project)
+function(_ev_add_project)
     # FIXME (aw): resort to proper argument handling!
     if (ARGC EQUAL 2)
         set (EVEREST_PROJECT_DIR ${ARGV0})
@@ -125,6 +125,35 @@ function(ev_add_project)
     )
 endfunction()
 
+macro(ev_add_project)
+    ev_setup_cmake_variables_python_wheel()
+    set(${PROJECT_NAME}_PYTHON_VENV_PATH "${CMAKE_BINARY_DIR}/venv" CACHE PATH "Path to python venv")
+
+    ev_setup_python_executable(
+        USE_PYTHON_VENV ${${PROJECT_NAME}_USE_PYTHON_VENV}
+        PYTHON_VENV_PATH ${${PROJECT_NAME}_PYTHON_VENV_PATH}
+    )
+
+    setup_ev_cli()
+    if(NOT ${${PROJECT_NAME}_USE_PYTHON_VENV})
+        message(STATUS "Using system ev-cli instead of installing it in the build venv.")
+        get_property(EVEREST_REQUIRED_EV_CLI_VERSION
+            GLOBAL
+            PROPERTY EVEREST_REQUIRED_EV_CLI_VERSION
+        )
+        require_ev_cli_version(${EVEREST_REQUIRED_EV_CLI_VERSION})
+    else()
+        message(STATUS "Installing ev-cli in the build venv.")
+    endif()
+
+    # FIXME (aw): resort to proper argument handling!
+    if (${ARGC} EQUAL 2)
+        _ev_add_project(${ARGV0} ${ARGV1})
+    else()
+        _ev_add_project()
+    endif ()
+endmacro()
+
 #
 # rust support
 #

config/CMakeLists.txt

@@ -3,6 +3,7 @@ generate_config_run_script(CONFIG sil-two-evse)
 generate_config_run_script(CONFIG sil-ocpp)
 generate_config_run_script(CONFIG sil-ocpp201)
 generate_config_run_script(CONFIG sil-dc)
+generate_config_run_script(CONFIG sil-dc-tls)
 generate_config_run_script(CONFIG sil-dc-sae-v2g)
 generate_config_run_script(CONFIG sil-dc-sae-v2h)
 generate_config_run_script(CONFIG sil-two-evse-dc)
@@ -25,7 +26,7 @@ install(
 install(
     DIRECTORY "certs"
     DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/everest"
-    FILES_MATCHING PATTERN "*.pem" PATTERN "*.key" PATTERN "*.der" PATTERN "*.txt" PATTERN "*.jks" PATTERN "*.p12" 
+    FILES_MATCHING PATTERN "*.pem" PATTERN "*.key" PATTERN "*.der" PATTERN "*.txt" PATTERN "*.jks" PATTERN "*.p12"
 )
 
 install(

config/config-sil-dc-sae-v2g.yaml

@@ -48,7 +48,7 @@ active_modules:
         - module_id: imd
           implementation_id: main
   powersupply_dc:
-    module: JsDCSupplySimulator
+    module: DCSupplySimulator
   yeti_driver:
     module: JsYetiSimulator
     config_module:
@@ -61,7 +61,7 @@ active_modules:
       main:
         selftest_success: true
   ev_manager:
-    module: JsEvManager
+    module: EvManager
     config_module:
       connector_id: 1
       auto_enable: true

config/config-sil-dc-sae-v2h.yaml

@@ -48,7 +48,7 @@ active_modules:
         - module_id: imd
           implementation_id: main
   powersupply_dc:
-    module: JsDCSupplySimulator
+    module: DCSupplySimulator
   yeti_driver:
     module: JsYetiSimulator
     config_module:
@@ -61,7 +61,7 @@ active_modules:
       main:
         selftest_success: true
   ev_manager:
-    module: JsEvManager
+    module: EvManager
     config_module:
       connector_id: 1
       auto_enable: true

config/config-sil-dc-tls.yaml

@@ -0,0 +1,147 @@
+active_modules:
+  iso15118_charger:
+    module: EvseV2G
+    config_module:
+      device: auto
+      tls_security: force
+    connections:
+      security:
+        - module_id: evse_security
+          implementation_id: main
+  iso15118_car:
+    module: PyEvJosev
+    config_module:
+      device: auto
+      supported_DIN70121: false
+      supported_ISO15118_2: true
+      tls_active: true
+      enforce_tls: true
+  evse_manager:
+    module: EvseManager
+    config_module:
+      connector_id: 1
+      country_code: DE
+      evse_id: DE*PNX*E12345*1
+      evse_id_din: 49A80737A45678
+      session_logging: true
+      session_logging_xml: false
+      session_logging_path: /tmp/everest-logs
+      charge_mode: DC
+      hack_allow_bpt_with_iso2: true
+      payment_enable_contract: false
+    connections:
+      bsp:
+        - module_id: yeti_driver
+          implementation_id: board_support
+      powermeter_car_side:
+        - module_id: powersupply_dc
+          implementation_id: powermeter
+      slac:
+        - module_id: slac
+          implementation_id: evse
+      hlc:
+        - module_id: iso15118_charger
+          implementation_id: charger
+      powersupply_DC:
+        - module_id: powersupply_dc
+          implementation_id: main
+      imd:
+        - module_id: imd
+          implementation_id: main
+  powersupply_dc:
+    module: DCSupplySimulator
+  yeti_driver:
+    module: JsYetiSimulator
+    config_module:
+      connector_id: 1
+  slac:
+    module: JsSlacSimulator
+  imd:
+    config_implementation:
+      main:
+        selftest_success: true
+    module: IMDSimulator
+  ev_manager:
+    module: EvManager
+    config_module:
+      connector_id: 1
+      auto_enable: true
+      auto_exec: false
+      auto_exec_commands: sleep 1;iec_wait_pwr_ready;sleep 1;draw_power_regulated 16,3;sleep 30;unplug
+      dc_target_current: 20
+      dc_target_voltage: 400
+    connections:
+      ev_board_support:
+        - module_id: yeti_driver
+          implementation_id: ev_board_support
+      ev:
+        - module_id: iso15118_car
+          implementation_id: ev
+      slac:
+        - module_id: slac
+          implementation_id: ev
+  auth:
+    module: Auth
+    config_module:
+      connection_timeout: 10
+      selection_algorithm: FindFirst
+    connections:
+      token_provider:
+        - module_id: token_provider
+          implementation_id: main
+      token_validator:
+        - module_id: token_validator
+          implementation_id: main
+      evse_manager:
+        - module_id: evse_manager
+          implementation_id: evse
+  token_provider:
+    module: DummyTokenProvider
+    config_implementation:
+      main:
+        token: TOKEN1
+    connections:
+      evse:
+        - module_id: evse_manager
+          implementation_id: evse
+  token_validator:
+    module: DummyTokenValidator
+    config_implementation:
+      main:
+        validation_result: Accepted
+        validation_reason: Token seems valid
+        sleep: 0.25
+  evse_security:
+    module: EvseSecurity
+    config_module:
+      private_key_password: "123456"
+  energy_manager:
+    module: EnergyManager
+    config_module:
+      schedule_total_duration: 1
+      schedule_interval_duration: 60
+      debug: false
+    connections:
+      energy_trunk:
+        - module_id: grid_connection_point
+          implementation_id: energy_grid
+  grid_connection_point:
+    module: EnergyNode
+    config_module:
+      fuse_limit_A: 40.0
+      phase_count: 3
+    connections:
+      price_information: []
+      energy_consumer:
+        - module_id: evse_manager
+          implementation_id: energy_grid
+      powermeter:
+        - module_id: yeti_driver
+          implementation_id: powermeter
+  api:
+    module: API
+    connections:
+      evse_manager:
+        - module_id: evse_manager
+          implementation_id: evse
+x-module-layout: {}

config/config-sil-dc.yaml

@@ -46,7 +46,7 @@ active_modules:
         - module_id: imd
           implementation_id: main
   powersupply_dc:
-    module: JsDCSupplySimulator
+    module: DCSupplySimulator
   yeti_driver:
     module: JsYetiSimulator
     config_module:
@@ -59,7 +59,7 @@ active_modules:
         selftest_success: true
     module: IMDSimulator
   ev_manager:
-    module: JsEvManager
+    module: EvManager
     config_module:
       connector_id: 1
       auto_enable: true

config/config-sil-energy-management.yaml

@@ -76,7 +76,7 @@ active_modules:
   slac:
     module: JsSlacSimulator
   ev_manager_1:
-    module: JsEvManager
+    module: EvManager
     config_module:
       connector_id: 1
       auto_enable: true
@@ -93,7 +93,7 @@ active_modules:
         - module_id: slac
           implementation_id: ev
   ev_manager_2:
-    module: JsEvManager
+    module: EvManager
     config_module:
       connector_id: 2
       auto_enable: true