OCPP 2.1 messages #845
OCPP 2.1 messages #845
Conversation
Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
…more Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
…rator Signed-off-by: Kai-Uwe Hermann <[email protected]>
…c-draft-messages # Conflicts: # include/ocpp/v201/messages/Get15118EVCertificate.hpp # lib/ocpp/v201/profile.cpp # src/code_generator/common/generate_cpp.py
| @@ -74,8 +74,8 @@ struct Callbacks { | |||
| /// \return True if evse is reserved for the given id token / group id token, false if it is reserved for another | |||
| /// one. | |||
| /// | |||
| std::function<bool(const int32_t evse_id, const CiString<36> idToken, | |||
| const std::optional<CiString<36>> groupIdToken)> | |||
| std::function<bool(const int32_t evse_id, const CiString<255> idToken, | |||
There was a problem hiding this comment.
This isn't really a backwards-compatible change in the 2.1 schemas. Changes like this happened in a few different messages/types and need case-by-case handling. Either by adding additional conversion functions or different message generation for 2.0.1 and 2.1
There was a problem hiding this comment.
Should be ok to accept larger tokens here. This is only an issue if e.g. OCTT tests for OCPP2.0.1 if we accept larger tokens.
| @@ -19,7 +19,7 @@ namespace v201 { | |||
| struct AuthorizeRequest : public ocpp::Message { | |||
| IdToken idToken; | |||
| std::optional<CustomData> customData; | |||
| std::optional<CiString<5500>> certificate; | |||
| std::optional<CiString<10000>> certificate; | |||
There was a problem hiding this comment.
This could probably be reported via FieldLength variable for the AuthorizeRequest.certificate instance which should make this change backwards-compatible with 2.0.1
| @@ -20,8 +20,10 @@ namespace v201 { | |||
| struct Get15118EVCertificateRequest : public ocpp::Message { | |||
| CiString<50> iso15118SchemaVersion; | |||
| CertificateActionEnum action; | |||
| CiString<5600> exiRequest; | |||
| CiString<11000> exiRequest; | |||
There was a problem hiding this comment.
Adding a FieldLength variable for Get15118EVCertificateRequest.exiRequest should make this backwards-compatible with 2.0.1
| @@ -40,7 +40,7 @@ struct GetCertificateStatusResponse : public ocpp::Message { | |||
| GetCertificateStatusEnum status; | |||
| std::optional<CustomData> customData; | |||
| std::optional<StatusInfo> statusInfo; | |||
| std::optional<CiString<5500>> ocspResult; | |||
| std::optional<CiString<18000>> ocspResult; | |||
There was a problem hiding this comment.
Adding a FieldLength variable for GetCertificateStatusResponse.ocspResult should make this backwards-compatible with 2.0.1
| @@ -18,7 +18,7 @@ namespace v201 { | |||
| /// \brief Contains a OCPP InstallCertificate message | |||
| struct InstallCertificateRequest : public ocpp::Message { | |||
| InstallCertificateUseEnum certificateType; | |||
| CiString<5500> certificate; | |||
| CiString<10000> certificate; | |||
There was a problem hiding this comment.
Adding a FieldLength variable for InstallCertificateRequest.certificate should make this backwards-compatible with 2.0.1
| @@ -17,7 +17,7 @@ namespace v201 { | |||
|
|
|||
| /// \brief Contains a OCPP PublishFirmware message | |||
| struct PublishFirmwareRequest : public ocpp::Message { | |||
| CiString<512> location; | |||
| CiString<2000> location; | |||
There was a problem hiding this comment.
Adding a FieldLength variable for PublishFirmwareRequest.location should make this backwards-compatible with 2.0.1
| @@ -19,8 +19,9 @@ namespace v201 { | |||
| struct PublishFirmwareStatusNotificationRequest : public ocpp::Message { | |||
| PublishFirmwareStatusEnum status; | |||
| std::optional<CustomData> customData; | |||
| std::optional<std::vector<CiString<512>>> location; | |||
| std::optional<std::vector<CiString<2000>>> location; | |||
There was a problem hiding this comment.
Adding a FieldLength variable for PublishFirmwareStatusNotificationRequest.location should make this backwards-compatible with 2.0.1
| std::optional<std::vector<MeterValue>> meterValue; | ||
| std::optional<bool> offline; | ||
| std::optional<int32_t> numberOfPhasesUsed; | ||
| std::optional<int32_t> cableMaxCurrent; | ||
| std::optional<float> cableMaxCurrent; |
There was a problem hiding this comment.
This isn't strictly backwards compatible with 2.0.1 and probably needs additional handling
There was a problem hiding this comment.
This change doesnt seem to make a lot of sense. In transaction_event_req we could continue to use an int and make an implicit cast to float
We should make sure that the float is serialized to an int in 2.0.1 when transmitting to the CSMS.
include/ocpp/v201/ocpp_types.hpp
Outdated
| struct AdditionalInfo { | ||
| CiString<36> additionalIdToken; | ||
| CiString<255> additionalIdToken; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
There was a problem hiding this comment.
Our best chance is to allow 255 here since we can then try to send to the CSMS. If the CSMS can handle it - fine. If it cant, we have at least tried and the CSMS will likely respond with a CALLERROR
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -34,8 +64,8 @@ void from_json(const json& j, AdditionalInfo& k); | |||
| std::ostream& operator<<(std::ostream& os, const AdditionalInfo& k); | |||
|
|
|||
| struct IdToken { | |||
| CiString<36> idToken; | |||
| IdTokenEnum type; | |||
| CiString<255> idToken; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
There was a problem hiding this comment.
Our best chance is to allow 255 here since we can then try to send to the CSMS. If the CSMS can handle it - fine. If it cant, we have at least tried and the CSMS will likely respond with a CALLERROR
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -54,7 +84,7 @@ struct OCSPRequestData { | |||
| CiString<128> issuerNameHash; | |||
| CiString<128> issuerKeyHash; | |||
| CiString<40> serialNumber; | |||
| CiString<512> responderURL; | |||
| CiString<2000> responderURL; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
There was a problem hiding this comment.
Same argument like with the id token. Lets allow the larger value here.
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -69,7 +99,7 @@ std::ostream& operator<<(std::ostream& os, const OCSPRequestData& k); | |||
|
|
|||
| struct MessageContent { | |||
| MessageFormatEnum format; | |||
| CiString<512> content; | |||
| CiString<1024> content; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
There was a problem hiding this comment.
Allow since its from CSMS
include/ocpp/v201/ocpp_types.hpp
Outdated
| std::optional<CustomData> customData; | ||
| std::optional<float> limit; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
This was required in 2.0.1 and is optional now in 2.1
There was a problem hiding this comment.
Thats ok as long as we make sure that we always set this limit for v201 (which we do because it was required before).
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -285,7 +893,7 @@ void from_json(const json& j, CertificateHashDataChain& k); | |||
| std::ostream& operator<<(std::ostream& os, const CertificateHashDataChain& k); | |||
|
|
|||
| struct LogParameters { | |||
| CiString<512> remoteLocation; | |||
| CiString<2000> remoteLocation; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
include/ocpp/v201/ocpp_types.hpp
Outdated
| std::optional<CiString<50>> signingMethod; | ||
| std::optional<CiString<2500>> publicKey; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
These two fields were required in 2.0.1 and are now optional in 2.1
There was a problem hiding this comment.
Here we should implement different handling for 2.0.1 and 2.1 in the respective message handling
include/ocpp/v201/ocpp_types.hpp
Outdated
| float energyAmount; | ||
| float evMinCurrent; | ||
| float evMaxCurrent; | ||
| float evMaxVoltage; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
type change from int to float
There was a problem hiding this comment.
Accept the change. We dont have any handling in libocpp with this type. We should implement different handling for 2.0.1 and 2.1 and make sure that the float is serialized to an int in 2.0.1 when transmitting to the CSMS.
include/ocpp/v201/ocpp_types.hpp
Outdated
| float evMaxCurrent; | ||
| float evMaxVoltage; | ||
| std::optional<CustomData> customData; | ||
| std::optional<int32_t> energyAmount; | ||
| std::optional<int32_t> evMaxPower; | ||
| std::optional<float> evMaxPower; | ||
| std::optional<float> evEnergyCapacity; | ||
| std::optional<float> energyAmount; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
type change from int to float
There was a problem hiding this comment.
Accept the change. We dont have any handling in libocpp with this type. We should implement different handling for 2.0.1 and 2.1 and make sure that the float is serialized to an int in 2.0.1 when transmitting to the CSMS.
include/ocpp/v201/ocpp_types.hpp
Outdated
| CiString<255> key; | ||
| VPNEnum type; | ||
| std::optional<CustomData> customData; | ||
| std::optional<CiString<20>> group; | ||
| std::optional<CiString<50>> group; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
include/ocpp/v201/ocpp_types.hpp
Outdated
| int32_t messageTimeout; | ||
| CiString<2000> ocppCsmsUrl; |
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -890,7 +1992,7 @@ void from_json(const json& j, SetMonitoringResult& k); | |||
| std::ostream& operator<<(std::ostream& os, const SetMonitoringResult& k); | |||
|
|
|||
| struct SetVariableData { | |||
| CiString<1000> attributeValue; | |||
| CiString<2500> attributeValue; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
include/ocpp/v201/ocpp_types.hpp
Outdated
| @@ -943,7 +2132,7 @@ void from_json(const json& j, Transaction& k); | |||
| std::ostream& operator<<(std::ostream& os, const Transaction& k); | |||
|
|
|||
| struct Firmware { | |||
| CiString<512> location; | |||
| CiString<2000> location; | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
include/ocpp/v201/types.hpp
Outdated
| namespace ChargingLimitSourceEnumStringType { | ||
| inline const CiString<20> EMS = "EMS"; | ||
| inline const CiString<20> OTHER = "Other"; | ||
| inline const CiString<20> SO = "SO"; | ||
| inline const CiString<20> CSO = "CSO"; | ||
| } // namespace ChargingLimitSourceEnumStringType | ||
|
|
||
| namespace IdTokenEnumStringType { | ||
| inline const CiString<20> Value = "Value"; | ||
| inline const CiString<20> Central = "Central"; | ||
| inline const CiString<20> DirectPayment = "DirectPayment"; | ||
| inline const CiString<20> eMAID = "eMAID"; | ||
| inline const CiString<20> EVCCID = "EVCCID"; | ||
| inline const CiString<20> ISO14443 = "ISO14443"; | ||
| inline const CiString<20> ISO15693 = "ISO15693"; | ||
| inline const CiString<20> KeyCode = "KeyCode"; | ||
| inline const CiString<20> Local = "Local"; | ||
| inline const CiString<20> MacAddress = "MacAddress"; | ||
| inline const CiString<20> NEMA = "NEMA"; | ||
| inline const CiString<20> NoAuthorization = "NoAuthorization"; | ||
| inline const CiString<20> VIN = "VIN"; | ||
| } // namespace IdTokenEnumStringType |
There was a problem hiding this comment.
TODO: move this to constants.hpp
lib/ocpp/v201/charge_point.cpp
Outdated
| @@ -792,7 +792,7 @@ std::optional<std::string> ChargePoint::get_evse_transaction_id(int32_t evse_id) | |||
| return evse.get_transaction()->transactionId.get(); | |||
| } | |||
|
|
|||
| AuthorizeResponse ChargePoint::validate_token(const IdToken id_token, const std::optional<CiString<5500>>& certificate, | |||
| AuthorizeResponse ChargePoint::validate_token(const IdToken id_token, const std::optional<CiString<10000>>& certificate, | |||
There was a problem hiding this comment.
TODO: find out implications for backwards compatibility with 2.0.1
Signed-off-by: Piet Gömpel <[email protected]>
NotifyPeriodicEventStream is a "SEND" message, this means it has no Request or Response postfixes Signed-off-by: Kai-Uwe Hermann <[email protected]>
…c-draft-messages # Conflicts: # .ci/build-kit/install_and_test.sh # include/ocpp/v201/charge_point.hpp Signed-off-by: Kai-Uwe Hermann <[email protected]>
…c-draft-messages # Conflicts: # include/ocpp/v201/charge_point_callbacks.hpp # lib/ocpp/v201/charge_point.cpp # tests/lib/ocpp/v201/test_charge_point.cpp Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Kai-Uwe Hermann <[email protected]>
…c-draft-messages # Conflicts: # include/ocpp/v201/evse.hpp # lib/ocpp/v201/charge_point.cpp # lib/ocpp/v201/evse.cpp # tests/lib/ocpp/v201/mocks/evse_mock.hpp Signed-off-by: Kai-Uwe Hermann <[email protected]>
* * Added internal variable SupportedOcppVersions that allows to specify the supported protocol versions in order of preference * Added member variable ocpp_version to ChargePoint to indicate the selected version * ConnectivityManager now uses the configured value to set up the WebsocketConnectionOptions Signed-off-by: Piet Gömpel <[email protected]> * Fix supported ocpp versions in config Signed-off-by: Piet Gömpel <[email protected]> --------- Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
…sions for it Signed-off-by: Piet Gömpel <[email protected]>
…mas (#932) * Implemented code generator for EVerest yaml types from OCPP JSON Schemas --------- Signed-off-by: Piet Gömpel <[email protected]> Signed-off-by: Kai-Uwe Hermann <[email protected]> Co-authored-by: Kai-Uwe Hermann <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
* seperated smart_charging_test_utils into hpp and cpp * moved redundant definitions of test cpp files into smart_charging_test_utils * implemented a couple operator== overloads for v21 types Signed-off-by: Piet Gömpel <[email protected]>
* Extended RequiredComponentVariable with additional property to specify for which ocpp version a variable is required. This is the base to continue implementing a device model integrity check inside libocpps DeviceModel class * Aligned data ctrlr and sampled data ctrlr must always be available and the required variables are really always required. * Check for 'optional required' variables (only required when a component is available) and if they are not used while the whole ctrlr is not available. --------- Signed-off-by: Piet Gömpel <[email protected]> Signed-off-by: Maaike Zijderveld, iolar <[email protected]> Co-authored-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Signed-off-by: Piet Gömpel <[email protected]>
Describe your changes
This PR includes OCPP2.1 messages.
At the moment this contains certain (arguably a bit hacky) code generator changes to generate new 2.1 messages in their own namespace, while changing 2.0.1 message definitions based on the 2.1 schemas. Here we need a bit more fine-grained handling
Issue ticket number and link
Checklist before requesting a review