Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ocpp/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

from ocpp.exceptions import (
FormatViolationError,
NotImplementedError,
OCPPError,
PropertyConstraintViolationError,
ProtocolError,
Expand Down Expand Up @@ -230,10 +229,14 @@ def _validate_payload(message: Union[Call, CallResult], ocpp_version: str) -> No
validator = get_validator(
message.message_type_id, message.action, ocpp_version
)
except (OSError, json.JSONDecodeError):
raise NotImplementedError(
details={"cause": f"Failed to validate action: {message.action}"}
)
except OSError as e:
raise ValidationError(
f"JSON validation schema not found for action: {message.action}"
) from e
except json.JSONDecodeError as e:
raise ValidationError(
f"Error in decoding JSON validation schema for action: {message.action}"
) from e

try:
validator.validate(message.payload)
Expand Down
3 changes: 1 addition & 2 deletions tests/test_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import ocpp
from ocpp.exceptions import (
FormatViolationError,
NotImplementedError,
PropertyConstraintViolationError,
ProtocolError,
TypeConstraintViolationError,
Expand Down Expand Up @@ -258,7 +257,7 @@ def test_validate_payload_with_non_existing_schema():
payload={"invalid_key": True},
)

with pytest.raises(NotImplementedError):
with pytest.raises(ValidationError):
_validate_payload(message, ocpp_version="1.6")


Expand Down
Loading