removed CertsPath from config that is not required anymore. Fixed id_…

…token publish of everest_test_controller (#127) Signed-off-by: pietfried <[email protected]>
EVerest · Apr 9, 2024 · 32d336f · 32d336f
1 parent 921b243
commit 32d336f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...ils/_configuration/everest_configuration_strategies/ocpp_module_configuration_strategy.py b/...ils/_configuration/everest_configuration_strategies/ocpp_module_configuration_strategy.py
@@ -11,7 +11,6 @@
 class OCPPModuleConfigurationBase:
     ChargePointConfigPath: str
     MessageLogPath: str
-    CertsPath: str
 
 @dataclass
 class OCPPModulePaths16(OCPPModuleConfigurationBase):

diff --git a/everest-testing/src/everest/testing/core_utils/_configuration/everest_environment_setup.py b/everest-testing/src/everest/testing/core_utils/_configuration/everest_environment_setup.py
@@ -168,15 +168,13 @@ def _create_ocpp_module_configuration_strategy(self,
             ocpp_paths = OCPPModulePaths16(
                 ChargePointConfigPath=str(temporary_paths.ocpp_config_file),
                 MessageLogPath=str(temporary_paths.ocpp_message_log_directory),
-                CertsPath=str(temporary_paths.certs_dir),
                 UserConfigPath=str(temporary_paths.ocpp_user_config_file),
                 DatabasePath=str(temporary_paths.ocpp_database_dir)
             )
         elif self._ocpp_config.ocpp_version == OCPPVersion.ocpp201:
             ocpp_paths = OCPPModulePaths201(
                 ChargePointConfigPath=str(temporary_paths.ocpp_config_file),
                 MessageLogPath=str(temporary_paths.ocpp_message_log_directory),
-                CertsPath=str(temporary_paths.certs_dir),
                 CoreDatabasePath=str(temporary_paths.ocpp_database_dir),
                 DeviceModelDatabasePath=str(temporary_paths.ocpp_database_dir / "device_model_storage.db"),
             )

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
@@ -58,7 +58,10 @@ def plug_out(self, connector_id=1):
     def swipe(self, token, connectors=None):
         connectors = connectors if connectors is not None else [1]
         provided_token = {
-            "id_token": token,
+            "id_token": {
+                "value": token,
+                "type": "ISO14443"
+            },
             "authorization_type": "RFID",
             "connectors": connectors
         }