Skip to content

Commit

Permalink
Rename v201 to v2 for OCPP modules (#1058)
Browse files Browse the repository at this point in the history 
* Renamed all occuranced of v201 to v2 and V201 to V2 in modules/ and lib/ directories. This change is required because of the changed names in libocpp

Signed-off-by: Piet Gömpel <[email protected]>

---------

Signed-off-by: Piet Gömpel <[email protected]>
  • Loading branch information
@Pietfried
Pietfried authored Feb 26, 2025
1 parent d49814c commit 851eac5
Show file tree
Hide file tree
Showing 23 changed files with 895 additions and 918 deletions.
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ libevse-security:
# OCPP
libocpp:
git: https://github.com/EVerest/libocpp.git
git_tag: v0.23.0
git_tag: 04059e2cb6ea34029b661b6803dce49727ea65c3
cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP"
# Josev
Josev:
Expand Down
70 changes: 34 additions & 36 deletions lib/staging/ocpp/ocpp_conversions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,91 +6,89 @@

namespace ocpp_conversions {
types::display_message::MessagePriorityEnum
to_everest_display_message_priority(const ocpp::v201::MessagePriorityEnum& priority) {
to_everest_display_message_priority(const ocpp::v2::MessagePriorityEnum& priority) {
switch (priority) {
case ocpp::v201::MessagePriorityEnum::AlwaysFront:
case ocpp::v2::MessagePriorityEnum::AlwaysFront:
return types::display_message::MessagePriorityEnum::AlwaysFront;
case ocpp::v201::MessagePriorityEnum::InFront:
case ocpp::v2::MessagePriorityEnum::InFront:
return types::display_message::MessagePriorityEnum::InFront;
case ocpp::v201::MessagePriorityEnum::NormalCycle:
case ocpp::v2::MessagePriorityEnum::NormalCycle:
return types::display_message::MessagePriorityEnum::NormalCycle;
}
throw std::out_of_range(
"Could not convert ocpp::v201::MessagePriorityEnum to types::display_message::MessagePriorityEnum");
"Could not convert ocpp::v2::MessagePriorityEnum to types::display_message::MessagePriorityEnum");
}

ocpp::v201::MessagePriorityEnum
ocpp::v2::MessagePriorityEnum
to_ocpp_201_message_priority(const types::display_message::MessagePriorityEnum& priority) {
switch (priority) {
case types::display_message::MessagePriorityEnum::AlwaysFront:
return ocpp::v201::MessagePriorityEnum::AlwaysFront;
return ocpp::v2::MessagePriorityEnum::AlwaysFront;
case types::display_message::MessagePriorityEnum::InFront:
return ocpp::v201::MessagePriorityEnum::InFront;
return ocpp::v2::MessagePriorityEnum::InFront;
case types::display_message::MessagePriorityEnum::NormalCycle:
return ocpp::v201::MessagePriorityEnum::NormalCycle;
return ocpp::v2::MessagePriorityEnum::NormalCycle;
}
throw std::out_of_range(
"Could not convert types::display_message::MessagePriorityEnum to ocpp::v201::MessagePriorityEnum");
"Could not convert types::display_message::MessagePriorityEnum to ocpp::v2::MessagePriorityEnum");
}

types::display_message::MessageStateEnum to_everest_display_message_state(const ocpp::v201::MessageStateEnum& state) {
types::display_message::MessageStateEnum to_everest_display_message_state(const ocpp::v2::MessageStateEnum& state) {
switch (state) {
case ocpp::v201::MessageStateEnum::Charging:
case ocpp::v2::MessageStateEnum::Charging:
return types::display_message::MessageStateEnum::Charging;
case ocpp::v201::MessageStateEnum::Faulted:
case ocpp::v2::MessageStateEnum::Faulted:
return types::display_message::MessageStateEnum::Faulted;
case ocpp::v201::MessageStateEnum::Idle:
case ocpp::v2::MessageStateEnum::Idle:
return types::display_message::MessageStateEnum::Idle;
case ocpp::v201::MessageStateEnum::Unavailable:
case ocpp::v2::MessageStateEnum::Unavailable:
return types::display_message::MessageStateEnum::Unavailable;
}
throw std::out_of_range(
"Could not convert ocpp::v201::MessageStateEnum to types::display_message::MessageStateEnum");
throw std::out_of_range("Could not convert ocpp::v2::MessageStateEnum to types::display_message::MessageStateEnum");
}

ocpp::v201::MessageStateEnum to_ocpp_201_display_message_state(const types::display_message::MessageStateEnum& state) {
ocpp::v2::MessageStateEnum to_ocpp_201_display_message_state(const types::display_message::MessageStateEnum& state) {
switch (state) {
case types::display_message::MessageStateEnum::Charging:
return ocpp::v201::MessageStateEnum::Charging;
return ocpp::v2::MessageStateEnum::Charging;
case types::display_message::MessageStateEnum::Faulted:
return ocpp::v201::MessageStateEnum::Faulted;
return ocpp::v2::MessageStateEnum::Faulted;
case types::display_message::MessageStateEnum::Idle:
return ocpp::v201::MessageStateEnum::Idle;
return ocpp::v2::MessageStateEnum::Idle;
case types::display_message::MessageStateEnum::Unavailable:
return ocpp::v201::MessageStateEnum::Unavailable;
return ocpp::v2::MessageStateEnum::Unavailable;
}
throw std::out_of_range(
"Could not convert types::display_message::MessageStateEnum to ocpp::v201::MessageStateEnum");
throw std::out_of_range("Could not convert types::display_message::MessageStateEnum to ocpp::v2::MessageStateEnum");
}

types::display_message::MessageFormat
to_everest_display_message_format(const ocpp::v201::MessageFormatEnum& message_format) {
to_everest_display_message_format(const ocpp::v2::MessageFormatEnum& message_format) {
switch (message_format) {
case ocpp::v201::MessageFormatEnum::ASCII:
case ocpp::v2::MessageFormatEnum::ASCII:
return types::display_message::MessageFormat::ASCII;
case ocpp::v201::MessageFormatEnum::HTML:
case ocpp::v2::MessageFormatEnum::HTML:
return types::display_message::MessageFormat::HTML;
case ocpp::v201::MessageFormatEnum::URI:
case ocpp::v2::MessageFormatEnum::URI:
return types::display_message::MessageFormat::URI;
case ocpp::v201::MessageFormatEnum::UTF8:
case ocpp::v2::MessageFormatEnum::UTF8:
return types::display_message::MessageFormat::UTF8;
}
throw std::out_of_range("Could not convert ocpp::v201::MessageFormat to types::display_message::MessageFormatEnum");
throw std::out_of_range("Could not convert ocpp::v2::MessageFormat to types::display_message::MessageFormatEnum");
}

ocpp::v201::MessageFormatEnum to_ocpp_201_message_format_enum(const types::display_message::MessageFormat& format) {
ocpp::v2::MessageFormatEnum to_ocpp_201_message_format_enum(const types::display_message::MessageFormat& format) {
switch (format) {
case types::display_message::MessageFormat::ASCII:
return ocpp::v201::MessageFormatEnum::ASCII;
return ocpp::v2::MessageFormatEnum::ASCII;
case types::display_message::MessageFormat::HTML:
return ocpp::v201::MessageFormatEnum::HTML;
return ocpp::v2::MessageFormatEnum::HTML;
case types::display_message::MessageFormat::URI:
return ocpp::v201::MessageFormatEnum::URI;
return ocpp::v2::MessageFormatEnum::URI;
case types::display_message::MessageFormat::UTF8:
return ocpp::v201::MessageFormatEnum::UTF8;
return ocpp::v2::MessageFormatEnum::UTF8;
}

throw std::out_of_range("Could not convert types::display_message::MessageFormat to ocpp::v201::MessageFormatEnum");
throw std::out_of_range("Could not convert types::display_message::MessageFormat to ocpp::v2::MessageFormatEnum");
}

ocpp::IdentifierType to_ocpp_identifiertype_enum(const types::display_message::Identifier_type identifier_type) {
Expand Down
15 changes: 7 additions & 8 deletions lib/staging/ocpp/ocpp_conversions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@
#include <generated/types/reservation.hpp>
#include <generated/types/session_cost.hpp>
#include <ocpp/common/types.hpp>
#include <ocpp/v201/ocpp_enums.hpp>
#include <ocpp/v2/ocpp_enums.hpp>

namespace ocpp_conversions {
types::display_message::MessagePriorityEnum
to_everest_display_message_priority(const ocpp::v201::MessagePriorityEnum& priority);
ocpp::v201::MessagePriorityEnum
to_ocpp_201_message_priority(const types::display_message::MessagePriorityEnum& priority);
types::display_message::MessageStateEnum to_everest_display_message_state(const ocpp::v201::MessageStateEnum& state);
ocpp::v201::MessageStateEnum to_ocpp_201_display_message_state(const types::display_message::MessageStateEnum& state);
to_everest_display_message_priority(const ocpp::v2::MessagePriorityEnum& priority);
ocpp::v2::MessagePriorityEnum to_ocpp_201_message_priority(const types::display_message::MessagePriorityEnum& priority);
types::display_message::MessageStateEnum to_everest_display_message_state(const ocpp::v2::MessageStateEnum& state);
ocpp::v2::MessageStateEnum to_ocpp_201_display_message_state(const types::display_message::MessageStateEnum& state);

types::display_message::MessageFormat
to_everest_display_message_format(const ocpp::v201::MessageFormatEnum& message_format);
ocpp::v201::MessageFormatEnum to_ocpp_201_message_format_enum(const types::display_message::MessageFormat& format);
to_everest_display_message_format(const ocpp::v2::MessageFormatEnum& message_format);
ocpp::v2::MessageFormatEnum to_ocpp_201_message_format_enum(const types::display_message::MessageFormat& format);

ocpp::IdentifierType to_ocpp_identifiertype_enum(const types::display_message::Identifier_type identifier_type);
types::display_message::Identifier_type to_everest_identifier_type_enum(const ocpp::IdentifierType identifier_type);
Expand Down
4 changes: 2 additions & 2 deletions modules/OCPP/OCPP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,8 @@ void OCPP::ready() {
[this](bool is_connected) { this->p_ocpp_generic->publish_is_connected(is_connected); });

this->charge_point->register_get_15118_ev_certificate_response_callback(
[this](const int32_t connector_id, const ocpp::v201::Get15118EVCertificateResponse& certificate_response,
const ocpp::v201::CertificateActionEnum& certificate_action) {
[this](const int32_t connector_id, const ocpp::v2::Get15118EVCertificateResponse& certificate_response,
const ocpp::v2::CertificateActionEnum& certificate_action) {
types::iso15118::ResponseExiStreamStatus response;
response.status = conversions::to_everest_iso15118_status(certificate_response.status);
response.certificate_action = conversions::to_everest_certificate_action_enum(certificate_action);
Expand Down
2 changes: 1 addition & 1 deletion modules/OCPP/OCPP.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <ocpp/common/types.hpp>
#include <ocpp/v16/charge_point.hpp>
#include <ocpp/v16/types.hpp>
#include <ocpp/v201/ocpp_types.hpp>
#include <ocpp/v2/ocpp_types.hpp>

using EvseConnectorMap = std::map<int32_t, std::map<int32_t, int32_t>>;
using ClearedErrorId = std::string;
Expand Down
20 changes: 10 additions & 10 deletions modules/OCPP/auth_validator/auth_token_validatorImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <conversions.hpp>
#include <ocpp/common/types.hpp>
#include <ocpp/v16/ocpp_enums.hpp>
#include <ocpp/v201/ocpp_types.hpp>
#include <ocpp/v2/ocpp_types.hpp>

namespace module {
namespace auth_validator {
Expand All @@ -29,18 +29,18 @@ types::authorization::ValidationResult
auth_token_validatorImpl::validate_pnc_request(const types::authorization::ProvidedIdToken& provided_token) {

// preparing payload for data_transfer_pnc_authorize
std::optional<std::vector<ocpp::v201::OCSPRequestData>> iso15118_certificate_hash_data_opt;
std::optional<std::vector<ocpp::v2::OCSPRequestData>> iso15118_certificate_hash_data_opt;
if (provided_token.iso15118CertificateHashData.has_value()) {
std::vector<ocpp::v201::OCSPRequestData> iso15118_certificate_hash_data;
std::vector<ocpp::v2::OCSPRequestData> iso15118_certificate_hash_data;
for (const auto& certificate_hash_data : provided_token.iso15118CertificateHashData.value()) {
ocpp::v201::OCSPRequestData v201_certificate_hash_data;
v201_certificate_hash_data.hashAlgorithm =
ocpp::v2::OCSPRequestData v2_certificate_hash_data;
v2_certificate_hash_data.hashAlgorithm =
conversions::to_ocpp_hash_algorithm_enum(certificate_hash_data.hashAlgorithm);
v201_certificate_hash_data.issuerKeyHash = certificate_hash_data.issuerKeyHash;
v201_certificate_hash_data.issuerNameHash = certificate_hash_data.issuerNameHash;
v201_certificate_hash_data.responderURL = certificate_hash_data.responderURL;
v201_certificate_hash_data.serialNumber = certificate_hash_data.serialNumber;
iso15118_certificate_hash_data.push_back(v201_certificate_hash_data);
v2_certificate_hash_data.issuerKeyHash = certificate_hash_data.issuerKeyHash;
v2_certificate_hash_data.issuerNameHash = certificate_hash_data.issuerNameHash;
v2_certificate_hash_data.responderURL = certificate_hash_data.responderURL;
v2_certificate_hash_data.serialNumber = certificate_hash_data.serialNumber;
iso15118_certificate_hash_data.push_back(v2_certificate_hash_data);
}
iso15118_certificate_hash_data_opt.emplace(iso15118_certificate_hash_data);
}
Expand Down
Loading

0 comments on commit 851eac5

Please sign in to comment.