[OCPP 1.6] new interface to support OCPP 1.6 obtaining configuration from V2 data model by james-ctc · Pull Request #1714 · EVerest/everest-core

james-ctc · 2026-01-13T16:54:21Z

Describe your changes

OCPP 1.6 obtains configuration from JSON files.
This change creates a ChargePointConfigurationInterface that enables OCPP1.6 to either use the existing JSON files via ChargePointConfiguration or V2 device model (and database) via ChargePointConfigurationDeviceModel

Unit tests have been added to ensure that the same result occurs regardless of which implementation is used.

In addition there is a common ChargePointConfigurationBase base class where shared functionality between the implementations is located. This ensures where possible that the two implementations remain consistent.

Issue ticket number and link

Checklist before requesting a review

I have performed a self-review of my code
I have made corresponding changes to the documentation
I read the contribution documentation and made sure that my changes meet its requirements

lib/everest/ocpp/include/ocpp/v16/charge_point_configuration_base.hpp

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_base.cpp

lib/everest/ocpp/include/ocpp/v16/utils.hpp

lib/everest/ocpp/include/ocpp/v16/charge_point_configuration_interface.hpp

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_base.cpp

Pietfried · 2026-02-02T18:32:23Z

lib/everest/ocpp/include/ocpp/v16/charge_point_configuration_devicemodel.hpp

+    using MessagesSet = std::set<MessageType>;
+    using SetResult = v2::SetVariableStatusEnum;
+
+protected:


Is there any particular reason why this is not private ?

using protected supports testing of methods in unit tests

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration.cpp

Signed-off-by: James Chapman <james.chapman@pionix.de>

Pietfried

It looks like some integration tests with OCPP related configs fail:

FAILED core_tests/config_tests.py::TestConfigsInDirectory::test_config[config-sil-ocpp-custom-extension]
FAILED core_tests/config_tests.py::TestConfigsInDirectory::test_config[config-sil-ocpp-pnc]
FAILED core_tests/config_tests.py::TestConfigsInDirectory::test_config[config-sil-ocpp]
FAILED core_tests/config_tests.py::TestConfigsInDirectory::test_config[config-sil-ocpp-API]

https://github.com/EVerest/everest-core/actions/runs/21707219409/job/62603234701?pr=1714

This is also reproducable when running e.g. ./run-scripts/run-sil-ocpp.sh

Pietfried · 2026-02-06T11:47:33Z

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_base.cpp

+                        result = true;
+                    }
+                }
+            } catch (const std::invalid_argument&) {


We should catch out_of_range too

james-ctc · 2026-02-06T13:06:05Z

Re integration tests - I've been looking into this and it looks to be an issue with unique_ptr and base classes.
updating to use references - but that does mean that users of libocpp will always need to provide a configuration handler reference when creating a ChargePoint object.

lib/everest/ocpp/tests/lib/ocpp/v16/v2config/evse_security_stub.hpp

ChargePointConfiguration now inherits from ChargePointConfigurationInterface. The ChargePointConfigurationInterface implementation can be selected by the OCPP module in the ChargePoint constructor. Signed-off-by: James Chapman <james.chapman@pionix.de>

Moved from DeviceModelStorageInterface to DeviceModelInterface Signed-off-by: James Chapman <james.chapman@pionix.de>

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: setting JSON configuration to include schema validation (#1782) Moved validation function to base class and added checks to V2 device model storage (OCPP 1.6) Additional tests to ensure that schema validation on set works for both JSON and database implemantations. Signed-off-by: James Chapman <james.chapman@pionix.de>

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc requested review from Pietfried, SebaLukas, andistorm, corneliusclaussen, djchhp, hikinggrass and mlitre as code owners January 13, 2026 16:54

james-ctc assigned Pietfried Jan 13, 2026

Pietfried added the OCPP label Jan 14, 2026

james-ctc force-pushed the jc/experimental-unified-config branch from 27f9de5 to c78e403 Compare January 26, 2026 11:13

james-ctc requested review from cburandt and florinmihut as code owners January 26, 2026 11:13

james-ctc mentioned this pull request Jan 26, 2026

[OCPP] Configuration key mapping from 1.6 to 2.x #1771

Open

3 tasks

Pietfried requested changes Feb 2, 2026

View reviewed changes

james-ctc added a commit that referenced this pull request Feb 4, 2026

fix: addressed PR #1714 improvements

b43148f

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc added a commit that referenced this pull request Feb 4, 2026

fix: addressed PR #1714 improvements

2ac9f95

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc force-pushed the jc/experimental-unified-config branch from b43148f to 2ac9f95 Compare February 4, 2026 10:30

james-ctc added a commit that referenced this pull request Feb 4, 2026

fix: addressed PR #1714 improvements

3f667b7

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc force-pushed the jc/experimental-unified-config branch from 2ac9f95 to 3f667b7 Compare February 4, 2026 10:52

james-ctc added a commit that referenced this pull request Feb 4, 2026

fix: addressed PR #1714 improvements

bd298e9

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc force-pushed the jc/experimental-unified-config branch 3 times, most recently from 3608e0a to 2b4c1a3 Compare February 5, 2026 10:04

Pietfried requested changes Feb 6, 2026

View reviewed changes

james-ctc force-pushed the jc/experimental-unified-config branch from 95078a9 to ea0842b Compare February 6, 2026 13:01

james-ctc force-pushed the jc/experimental-unified-config branch 2 times, most recently from b7b9c91 to 1333c3e Compare February 9, 2026 10:13

james-ctc requested a review from Pietfried February 9, 2026 12:37

james-ctc force-pushed the jc/experimental-unified-config branch from 6bdb50f to 1333c3e Compare February 10, 2026 16:20

Pietfried previously approved these changes Feb 11, 2026

View reviewed changes

lib/everest/ocpp/tests/lib/ocpp/v16/v2config/evse_security_stub.hpp Outdated Show resolved Hide resolved

james-ctc dismissed Pietfried’s stale review via 1770eba February 11, 2026 14:29

james-ctc enabled auto-merge February 11, 2026 14:30

Pietfried previously approved these changes Feb 11, 2026

View reviewed changes

james-ctc added 10 commits February 11, 2026 15:59

feat: OCPP V16 configuration now uses DeviceModelInterface

344786f

Moved from DeviceModelStorageInterface to DeviceModelInterface Signed-off-by: James Chapman <james.chapman@pionix.de>

clang-format

26cd814

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: addressed PR #1714 improvements

56f3ef1

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: bad alloc when using uniqueptr

211c755

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: catch additional exception

8a285fa

Signed-off-by: James Chapman <james.chapman@pionix.de>

clang-format

6439213

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: added missing parameter

3064930

Signed-off-by: James Chapman <james.chapman@pionix.de>

fix: OCPP test failure (test_initiate_message_in_pending)

db755f0

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc dismissed Pietfried’s stale review via 18e6fc8 February 11, 2026 16:09

james-ctc force-pushed the jc/experimental-unified-config branch from 1770eba to 18e6fc8 Compare February 11, 2026 16:09

Pietfried approved these changes Feb 11, 2026

View reviewed changes

james-ctc force-pushed the jc/experimental-unified-config branch from 18e6fc8 to f649cff Compare February 12, 2026 07:56

fix: add additional delay in unit test to improve successful test runs

1eed492

Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc force-pushed the jc/experimental-unified-config branch from f649cff to 1eed492 Compare February 12, 2026 08:30

james-ctc added this pull request to the merge queue Feb 12, 2026

Merged via the queue into main with commit 0a2c98d Feb 12, 2026
11 of 12 checks passed

james-ctc deleted the jc/experimental-unified-config branch February 12, 2026 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[OCPP 1.6] new interface to support OCPP 1.6 obtaining configuration from V2 data model#1714

[OCPP 1.6] new interface to support OCPP 1.6 obtaining configuration from V2 data model#1714
james-ctc merged 11 commits intomainfrom
jc/experimental-unified-config

james-ctc commented Jan 13, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Pietfried Feb 2, 2026

Uh oh!

james-ctc Feb 4, 2026

Uh oh!

Uh oh!

Uh oh!

Pietfried left a comment

Uh oh!

Pietfried Feb 6, 2026

Uh oh!

james-ctc commented Feb 6, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

james-ctc commented Jan 13, 2026

Describe your changes

Issue ticket number and link

Checklist before requesting a review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Pietfried Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

james-ctc Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Pietfried left a comment

Choose a reason for hiding this comment

Uh oh!

Pietfried Feb 6, 2026

Choose a reason for hiding this comment

Uh oh!

james-ctc commented Feb 6, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants