Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/890 move reservations callbacks and handlers to new functional block #979

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Feature/890 move reservations callbacks and handlers to new functional block #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f60262
Change test because of a changed behaviour for the reservations imple…
maaikez Dec 3, 2024
bc92ff0
Remove todo.
maaikez Dec 4, 2024
6f1ed08
Change libocpp dependency to the correct branch
maaikez Dec 10, 2024
1571152
Change libocpp dependency
maaikez Dec 17, 2024
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
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
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: e52ac969095804144af4896af1984cedaf45a3f8
git_tag: c66383782a32827920af80314165843deed63c98
cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP"
# Josev
Josev:
Expand Down
13 changes: 4 additions & 9 deletions tests/ocpp_tests/test_sets/ocpp201/reservations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from ocpp.v201.datatypes import *
from ocpp.v201 import call as call_201
from ocpp.v201 import call_result as call_result201
from validations import validate_remote_start_stop_transaction
from validations import (validate_remote_start_stop_transaction, wait_for_callerror_and_validate)
from ocpp.routing import on, create_route_map


Expand Down Expand Up @@ -629,7 +629,6 @@ async def test_reservation_connector_occupied(
# start charging session
test_controller.plug_in()

# TODO mz fix comments everywhere in this file!!!
# expect StatusNotification with status occupied
assert await wait_for_and_validate(
test_utility,
Expand Down Expand Up @@ -735,13 +734,9 @@ async def test_reservation_connector_rejected(
evse_id=1
)

# expect ReserveNow response with status rejected
assert await wait_for_and_validate(
test_utility,
charge_point_v201,
"ReserveNow",
call_result201.ReserveNowPayload(ReserveNowStatusType.rejected),
)
assert await wait_for_callerror_and_validate(test_utility,
charge_point_v201,
"NotImplemented")


@pytest.mark.asyncio
Expand Down