Feature/cost and price display message tests #975
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maaikez
requested review from
Pietfried,
hikinggrass and
corneliusclaussen
as code owners
4 tasks
maaikez
commented
Dec 4, 2024
dependencies.yaml
Outdated
| @@ -67,7 +67,7 @@ libevse-security: | |||
| # OCPP | |||
| libocpp: | |||
| git: https://github.com/EVerest/libocpp.git | |||
| git_tag: 9836ac4766e99a79555adb15c3001c8704f8b7a7 | |||
| git_tag: bugfix/meter-value-pricing-trigger | |||
There was a problem hiding this comment.
This should be set back to the correct version as soon as it the bugfix (EVerest/libocpp#899) is merged.
maaikez
force-pushed
the
feature/cost_and_price_display_message_tests
branch
2 times, most recently
from
cc61cbf to
2b40e7a
Compare
Pietfried
requested changes
Dec 5, 2024
There was a problem hiding this comment.
These tests should go into a seperate file like california_pricing.py like for ocpp201
Comment on lines
6608
to
6656
| @pytest_asyncio.fixture | ||
| async def chargepoint_with_pm(central_system: CentralSystem, probe_module: ProbeModule): | ||
| """Fixture for ChargePoint16. Requires central_system_v201 and test_controller. Starts test_controller immediately | ||
| """ | ||
| # wait for libocpp to go online | ||
| cp = await central_system.wait_for_chargepoint() | ||
| yield cp | ||
| await cp.stop() | ||
|
|
||
|
|
||
| class ProbeModuleCostAndPriceMetervaluesConfigurationAdjustment(EverestConfigAdjustmentStrategy): | ||
| """ | ||
| Probe module to be able to 'inject' metervalues | ||
| """ | ||
| def adjust_everest_configuration(self, everest_config: Dict): | ||
| adjusted_config = deepcopy(everest_config) | ||
|
|
||
| adjusted_config["active_modules"]["grid_connection_point"]["connections"]["powermeter"] = [ | ||
| {"module_id": "probe", "implementation_id": "ProbeModulePowerMeter"}] | ||
| adjusted_config["active_modules"]["evse_manager"]["connections"]["powermeter_grid_side"] = [ | ||
| {"module_id": "probe", "implementation_id": "ProbeModulePowerMeter"}] | ||
|
|
||
| return adjusted_config | ||
|
|
||
|
|
||
| class ProbeModuleCostAndPriceDisplayMessageConfigurationAdjustment(EverestConfigAdjustmentStrategy): | ||
| """ | ||
| Probe module to be able to mock display messages | ||
| """ | ||
| def adjust_everest_configuration(self, everest_config: Dict): | ||
| adjusted_config = deepcopy(everest_config) | ||
|
|
||
| adjusted_config["active_modules"]["ocpp"]["connections"]["display_message"] = [ | ||
| {"module_id": "probe", "implementation_id": "ProbeModuleDisplayMessage"}] | ||
|
|
||
| return adjusted_config | ||
|
|
||
|
|
||
| class ProbeModuleCostAndPriceSessionCostConfigurationAdjustment(EverestConfigAdjustmentStrategy): | ||
| """ | ||
| Probe module to be able to mock the session cost interface calls | ||
| """ | ||
| def adjust_everest_configuration(self, everest_config: Dict): | ||
| adjusted_config = deepcopy(everest_config) | ||
|
|
||
| adjusted_config["active_modules"]["probe"]["connections"]["session_cost"] = [ | ||
| {"module_id": "ocpp", "implementation_id": "session_cost"}] | ||
|
|
||
| return adjusted_config |
There was a problem hiding this comment.
These seem to be defined similar for ocpp16 and ocpp201 so I think they can be moved to some common file and the be imported
Comment on lines
239
to
244
| # probe_module.implement_command("ProbeModuleDisplayMessage", "set_display_message", | ||
| # probe_module_mock_fn) | ||
| # probe_module.implement_command("ProbeModuleDisplayMessage", "get_display_messages", | ||
| # probe_module_mock_fn) | ||
| # probe_module.implement_command("ProbeModuleDisplayMessage", "clear_display_message", | ||
| # probe_module_mock_fn) |
maaikez
force-pushed
the
feature/cost_and_price_display_message_tests
branch
2 times, most recently
from
5783a7e to
37f21a6
Compare
Pietfried
force-pushed
the
feature/cost_and_price_display_message_tests
branch
from
37f21a6 to
2db9d09
Compare
Pietfried
approved these changes
Dec 16, 2024
There was a problem hiding this comment.
you can just use the name california_pricing.py for this file since its inside the ocpp16 directory
maaikez
force-pushed
the
feature/cost_and_price_display_message_tests
branch
2 times, most recently
from
37f21a6 to
427dd02
Compare
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
…icing tests for 1.6 to a new file. Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
…licting test file names) Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
…st file names. Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
maaikez
force-pushed
the
feature/cost_and_price_display_message_tests
branch
from
d9b8c7e to
7508df8
Compare
Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Add python integration tests for california pricing and display message.
Bugfix found by adding the tests: EVerest/libocpp#899
Issue ticket number and link
Checklist before requesting a review