[OCPP] Configuration key mapping from 1.6 to 2.x by james-ctc · Pull Request #1771 · EVerest/everest-core

james-ctc · 2026-01-26T12:14:48Z

Describe your changes

This builds upon #1714 incorporating the mapping of OCPP 1.6 configuration keys into v2.x device model component and variables.

#1714 should be merged first.

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

james-ctc · 2026-01-26T12:15:24Z

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

This file is no longer needed

james-ctc · 2026-02-13T13:49:44Z

#1714 has been merged so ready for review

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

lib/everest/ocpp/include/ocpp/v2/ctrlr_component_variables.hpp

lib/everest/ocpp/lib/ocpp/v2/ctrlr_component_variables.cpp

lib/everest/ocpp/include/ocpp/v2/ctrlr_component_variables.hpp

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp

Pietfried · 2026-02-20T16:13:07Z

This PR provides a mapping overview: #1854 . I would also be fine if this is cherry-pick and incorporated as part of this PR.

I think we need to implement this mapping in parts of the ChargePointConfigurationDeviceModel (especially where configuration keys do not map to VariableAttribute but to VariableCharacteristics (valuesList and maxLimit)

james-ctc · 2026-02-26T08:47:49Z

I think I have addressed the PR comments - ready for re-review

Pietfried

Some variables now map to VariableCharacteristics. This should be adressed in the respective ChargePointConfigurationDeviceModel getters and setters.

Pietfried · 2026-03-02T14:31:18Z

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp

+    // VariableCharacteristics of valuesList are added to the set of they exist
+    if (entry.variableCharacteristics) {
+        std::optional<std::string> csl = entry.variableCharacteristics.value().valuesList;
+        auto vec = v16::utils::from_csl(csl.value());


Misses a check if opt has a value - could lead to bad optional access.

Pietfried · 2026-03-02T14:37:24Z

lib/everest/ocpp/lib/ocpp/v16/known_keys.cpp

+                              << cv.variable->name << '\'';
+            }
+        }
+        map.insert({v16, {&cv, attribute}});


This does not insert if the the key already exists. If we want to to replace we can use insert_or_assign or we can change the warning and ignore a duplicate.

OCPP 1.6 configuration keys are unique - the warnings are raised when there is a programming error and there is more than one mapping for a OCPP 1.6 configuration key.
Assuming that the code is correct then the errors/warnings should not occur.
switching to insert_or_assign so the code matches the text of the warning.

Pietfried · 2026-03-02T14:37:32Z

lib/everest/ocpp/lib/ocpp/v16/known_keys.cpp

+        if (const auto it = reverse_map.find(name); it != reverse_map.end()) {
+            EVLOG_error << "V2 " << name << ": '" << it->second << "' replaced with '" << v16 << '\'';
+        }
+        reverse_map.insert({std::move(name), v16});


same like above

Pietfried · 2026-03-02T14:43:57Z

lib/everest/ocpp/include/ocpp/v2/ctrlr_component_variables.hpp

+extern const RequiredComponentVariable GetConfigurationMaxKeys;
+extern const ComponentVariable LightIntensity;
+extern const ComponentVariable MinimumStatusDuration;
+extern const RequiredComponentVariable NumberOfConnectors;


Defined here and in line L131

Pietfried · 2026-03-02T14:49:33Z

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp

+                } else if (is_same(SampledDataTxStartedMeasurands, component, variable)) {
+                    add_to_list(valid_measurands, entry);
+                } else {
+                    // assume custom variable


This would add lots of custom configuration keys to OCPP1.6 . I am not sure if we actually want to expose them.

We decided to add a Custom16LegacyCtrlr for custom configuration keys.

Pietfried · 2026-03-02T14:52:51Z

lib/everest/ocpp/lib/ocpp/v16/utils.cpp

+        list.insert({std::move(s), count++});
+    }
+}
+std::vector<std::string> OrderedUniqueStringList::get() {


nit: could be const

Pietfried · 2026-03-02T14:53:24Z

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp

+            component.evse = std::move(evse);
+            auto value = get_optional<std::string>(*storage, component, variable, v2::AttributeEnum::Actual);
+            if (value) {
+                found = true; // atleast one instance exists


Suggested change

found = true; // atleast one instance exists

found = true; // at least one instance exists

Pietfried · 2026-03-02T15:54:03Z

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp

+    std::string result;
+    try {
+        auto profiles = json::parse(value);
+        result = profiles[0]["ocppCsmsUrl"];


This should be

Suggested change

result = profiles[0]["ocppCsmsUrl"];

result = profiles[0]["connectionData"]["ocppCsmsUrl"];

At a later point we should probably backport the functionality of multiple connection profiles to OCPP1.6

now a custom legacy key

Pietfried · 2026-03-02T16:09:44Z

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

+    mapping(AuthorizationKey, BasicAuthPassword, Actual) \
+    mapping(CertificateSignedMaxChainSize, MaxCertificateChainSize, Actual) \
+    mapping(CpoName, OrganizationName, Actual) \
+    mapping(SecurityProfile, SecurityProfile, Actual) \


For the SecurityProfile and the CentralSystemURI I'm not quite sure how to map those best. OCPP2.1 introduces a dedicated components for the NetworkConfiguration with the configurationSlot being the instance of the component (see chapter 2.1.8)

The OCPP1.6 SecurityProfile could also map to NetworkConnectionProfile[0]["connectionData"]["SecurityProfile"]. This property is used for the websocket connection in OCPP2.x.

The SecurityCtrlr.SecurityProfile CV is ready-only and just reports the SecurityProfile in use.

While OCPP2.x supports multiple connection profiles, OCPP1.6 does not do it so far. For now we could add CentralSystemURI and SecurityProfile to the 1.6 legacy controller and once we introduce the new NetworkConfiguration components we can add this to our migration. What do you think?

We decided to keep SecurityProfile, AuthorizationKey and CentralSystemURI in OCPP16LegacyCtrlr and to not add a mapping to those for now

Introduce mapping layer to reuse OCPP 2.x device model storage for OCPP 1.6 implementations. Adds OCPP16MavericksCtrlr component for 1.6 configuration keys without direct 2.x equivalents. Signed-off-by: Piet Gömpel <pietgoempel@gmail.com> feat: add mapping between OCPP V2 and V16 configuration keys Signed-off-by: James Chapman <james.chapman@pionix.de>

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

SecurityProfile, AuthorizationKey and CentralSystemURI now in OCPP16LegacyCtrlr Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc · 2026-03-05T16:51:41Z

@Pietfried I've addressed your latest comments - assuming the CI runs okay it is ready for re-review

james-ctc added the OCPP label Jan 26, 2026

james-ctc commented Jan 26, 2026

View reviewed changes

lib/everest/ocpp/include/ocpp/v16/config_key_mapping.hpp Outdated

Copy link

Member Author

james-ctc Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is no longer needed

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

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch from 9194945 to 6bdb50f Compare February 10, 2026 16:23

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

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch from ced68ca to 3fbb6a7 Compare February 12, 2026 09:02

Base automatically changed from jc/experimental-unified-config to main February 12, 2026 09:13

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch 2 times, most recently from 9705896 to b8e8ae6 Compare February 12, 2026 16:27

james-ctc marked this pull request as ready for review February 13, 2026 13:49

james-ctc requested review from Pietfried, SebaLukas, andistorm, cburandt, corneliusclaussen, djchhp, florinmihut, hikinggrass and mlitre as code owners February 13, 2026 13:49

Pietfried self-assigned this Feb 17, 2026

Pietfried requested changes Feb 20, 2026

View reviewed changes

Pietfried reviewed Feb 20, 2026

View reviewed changes

lib/everest/ocpp/lib/ocpp/v16/charge_point_configuration_devicemodel.cpp Show resolved Hide resolved

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch from 9431ea2 to d26910c Compare February 20, 2026 15:33

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch 4 times, most recently from 2283e27 to 055ce9a Compare February 25, 2026 15:06

james-ctc requested a review from Pietfried February 26, 2026 08:47

Pietfried requested changes Mar 2, 2026

View reviewed changes

james-ctc added 6 commits March 5, 2026 14:05

fix: remove redundant file

9969c0a

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

fix: compile & incorporate PR comments

1d742d1

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

fix: add write only parameter so that AuthorizationKey can be retrieved

f0e917b

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

feat: added checking for behind the scenes supported feature profiles

a3fc246

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

fix: addressed PR #1771 additional comments

50de8ec

SecurityProfile, AuthorizationKey and CentralSystemURI now in OCPP16LegacyCtrlr Signed-off-by: James Chapman <james.chapman@pionix.de>

james-ctc force-pushed the jc/ocpp-v2-v16-combined-config branch from 3fb3544 to 50de8ec Compare March 5, 2026 16:48

james-ctc requested a review from Pietfried March 5, 2026 16:51

	found = true; // atleast one instance exists
	found = true; // at least one instance exists

	result = profiles[0]["ocppCsmsUrl"];
	result = profiles[0]["connectionData"]["ocppCsmsUrl"];

Conversation

james-ctc commented Jan 26, 2026

Describe your changes

Issue ticket number and link

Checklist before requesting a review

Uh oh!

Choose a reason for hiding this comment

Uh oh!

james-ctc commented Feb 13, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Pietfried commented Feb 20, 2026

Uh oh!

james-ctc commented Feb 26, 2026

Uh oh!

Pietfried left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

james-ctc commented Mar 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants