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.

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

Fix of the several messages that misuse the List type #4

Merged
merged 27 commits into from
Jan 4, 2022

Conversation

tropxy
Copy link
Contributor

@tropxy tropxy commented Dec 10, 2021

No description provided.

@tropxy tropxy requested a review from MarcMueltin December 10, 2021 02:17
@tropxy tropxy self-assigned this Dec 10, 2021
@tropxy tropxy added bug Something isn't working enhancement New feature or request labels Dec 10, 2021
@tropxy tropxy requested a review from shalinnijel2 December 10, 2021 09:09
@tropxy tropxy force-pushed the fix_messages_datatypes branch from c0c1163 to 08857fd Compare December 14, 2021 18:49
@tropxy tropxy marked this pull request as ready for review December 21, 2021 13:24
@tropxy tropxy force-pushed the fix_messages_datatypes branch from 6a198d5 to f0e9a50 Compare December 23, 2021 16:11
Copy link
Contributor

@MarcMueltin MarcMueltin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please have a look

iso15118/evcc/controller/simulator.py Show resolved Hide resolved
iso15118/evcc/states/iso15118_2_states.py Show resolved Hide resolved
iso15118/evcc/states/iso15118_2_states.py Outdated Show resolved Hide resolved
iso15118/secc/states/iso15118_2_states.py Outdated Show resolved Hide resolved
iso15118/secc/states/iso15118_2_states.py Outdated Show resolved Hide resolved
iso15118/shared/messages/iso15118_2/datatypes.py Outdated Show resolved Hide resolved
iso15118/shared/messages/iso15118_2/datatypes.py Outdated Show resolved Hide resolved
iso15118/shared/messages/iso15118_2/datatypes.py Outdated Show resolved Hide resolved
iso15118/shared/messages/xmldsig.py Outdated Show resolved Hide resolved
iso15118/shared/security.py Show resolved Hide resolved
@tropxy tropxy force-pushed the fix_messages_datatypes branch from f0e9a50 to dd3e726 Compare December 29, 2021 13:21
@tropxy tropxy requested a review from MarcMueltin December 30, 2021 10:31
… of ProfileEntry to a ProfileEntry object containing a list of ProfileEntryDetails
…lasses over the different custom exception classes
…nature creation in CertificateInstallationRes; created constrained type eMAID
@tropxy tropxy force-pushed the fix_messages_datatypes branch from e5022d2 to 045f7ac Compare December 30, 2021 15:53
Copy link
Contributor

@MarcMueltin MarcMueltin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for you. Just a few refactorings are .necessary. And you can delete some of your TODO comments

iso15118/evcc/states/iso15118_2_states.py Show resolved Hide resolved
iso15118/secc/comm_session_handler.py Show resolved Hide resolved
iso15118/secc/failed_responses.py Show resolved Hide resolved
iso15118/shared/exi_codec.py Outdated Show resolved Hide resolved
iso15118/shared/messages/iso15118_2/body.py Outdated Show resolved Hide resolved
iso15118/shared/messages/xmldsig.py Outdated Show resolved Hide resolved
iso15118/shared/messages/xmldsig.py Outdated Show resolved Hide resolved
iso15118/shared/messages/xmldsig.py Outdated Show resolved Hide resolved
@tropxy tropxy requested a review from MarcMueltin January 4, 2022 13:02
Copy link
Contributor

@MarcMueltin MarcMueltin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check the unresolved conversation items

@tropxy tropxy requested a review from MarcMueltin January 4, 2022 17:11
MarcMueltin
MarcMueltin previously approved these changes Jan 4, 2022
Copy link
Contributor

@MarcMueltin MarcMueltin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge!

@tropxy tropxy merged commit 33cd07f into master Jan 4, 2022
tropxy added a commit that referenced this pull request Apr 1, 2022
* ability to add existing EVSEController

* Separate config validataion in order to have another way to configure iso15118

* Added some some abstract methods for DC-Charging

* Completed State CableCheck. But is not tested

* Added State Precharge

* Implemented CableCheck in EVCC states.
Reached State Precharge with EVCC/EVSE simulation

* simulatin with SECC/EVCC works until beginning of CurrentDemand

* simulatin with SECC/EVCC works until beginning of CurrentDemand

* Simulation with SECC/EVCC reaches CurrentDemand and is constantly sending CurrendDemandReq/Res

* Just Layout changes and some comments. No changes in productive Code

* First sucessfull unittest

* wip DC_state current_demand and pytests

* DC-States until Welding-Detection.

* Added some pytests

* added timeouts for CableCheck and Precharge

* some changes in interface

* implemented feedback from André

* review from Shalin

* improvements #2 from Pullrequest

* improvements # from Pullrequest

* improvements #4 from pullrequest

* reformat code to fullfill black and flake8

* Decreased the number of Precharge cycles to avoid the Timeout. Reformated a few error messages around the code

* Reformated the Exi Codec class creation as its former use complicated testing; fixed the tests

* reformated the code

* fixed flake8 issues

* Revert "Reformated the Exi Codec class creation as its former use complicated testing; fixed the tests"

This reverts commit 1b6e798.

* fixed bugs inserted after the git reverse

* fixed the tests by patching the to_exi method

* flaked 8 the code

* marked tests as async for future compatability and added  mode on the pytest init config as specified here: https://github.com/pytest-dev/pytest-asyncio\#modes

* added conftest

* fixed flake eror

Co-authored-by: Martin Bachmann <martin.bachmann@designwerk.com>
Co-authored-by: tropxy <andre14x@gmail.com>
tropxy added a commit that referenced this pull request Apr 12, 2022
* Updated branch to use jar with DINSpec support

* Updated timeout values for DINSpec. Minor formatting to stop black from complaining.

* Added reference schema files.

* DIN SPEC schema representation - first draft

* Updated din_spec/datatypes.py

* Updated comm_session.py and exi_codec to accept DINSPEC message types.

* Updated abstract method definition in states.py and updated associated implementations in -2 and -20 on both secc and evcc sides.

* Setting preferred protocol to DIN SPEC on evcc side for now (to be changed later.)

* Fixed flake8 and black errors. Removed message types not used by DINSpec.

* Fixed flake8 and black errors. Moved EnergyTransferMode to common enums.

* Initial checkin - DIN SPEC states for EVCC and SECC.

* Code format mods to pass tests on GitHub.

* Support for remaining states till SessionStop

* Refactoring to move common classes between -2 dc and dinspec messages.

* Updated EXICodec.jar with fix for WeldingDetectionRes message (#27)

* feat: Addressed some of the comments on PR(AB#1439)

* feat: DIN SPEC should not be listed in supported protocols if use_tls set to false (AB#1439)

Also, Major version for DIN SPEC is 2 (in supportedAppProtocolReq).

* feat: Add timeout handling to CableCheck, renamed ServiceAndPaymentSelection to ServicePaymentSelection

* feat: Added tests. Fixed identified issue with CableCheck.

* Feature/dc states till session stop (#21)

* ability to add existing EVSEController

* Separate config validataion in order to have another way to configure iso15118

* Added some some abstract methods for DC-Charging

* Completed State CableCheck. But is not tested

* Added State Precharge

* Implemented CableCheck in EVCC states.
Reached State Precharge with EVCC/EVSE simulation

* simulatin with SECC/EVCC works until beginning of CurrentDemand

* simulatin with SECC/EVCC works until beginning of CurrentDemand

* Simulation with SECC/EVCC reaches CurrentDemand and is constantly sending CurrendDemandReq/Res

* Just Layout changes and some comments. No changes in productive Code

* First sucessfull unittest

* wip DC_state current_demand and pytests

* DC-States until Welding-Detection.

* Added some pytests

* added timeouts for CableCheck and Precharge

* some changes in interface

* implemented feedback from André

* review from Shalin

* improvements #2 from Pullrequest

* improvements # from Pullrequest

* improvements #4 from pullrequest

* reformat code to fullfill black and flake8

* Decreased the number of Precharge cycles to avoid the Timeout. Reformated a few error messages around the code

* Reformated the Exi Codec class creation as its former use complicated testing; fixed the tests

* reformated the code

* fixed flake8 issues

* Revert "Reformated the Exi Codec class creation as its former use complicated testing; fixed the tests"

This reverts commit 1b6e798.

* fixed bugs inserted after the git reverse

* fixed the tests by patching the to_exi method

* flaked 8 the code

* marked tests as async for future compatability and added  mode on the pytest init config as specified here: https://github.com/pytest-dev/pytest-asyncio\#modes

* added conftest

* fixed flake eror

Co-authored-by: Martin Bachmann <martin.bachmann@designwerk.com>
Co-authored-by: tropxy <andre14x@gmail.com>

* feat: More fixes. (AB#1439)

* Updated timeout values for DINSpec. Minor formatting to stop black from complaining.

* Added reference schema files.

* DIN SPEC schema representation - first draft

* Updated din_spec/datatypes.py

* Updated comm_session.py and exi_codec to accept DINSPEC message types.

* Updated abstract method definition in states.py and updated associated implementations in -2 and -20 on both secc and evcc sides.

* Setting preferred protocol to DIN SPEC on evcc side for now (to be changed later.)

* Fixed flake8 and black errors. Removed message types not used by DINSpec.

* Fixed flake8 and black errors. Moved EnergyTransferMode to common enums.

* Initial checkin - DIN SPEC states for EVCC and SECC.

* Code format mods to pass tests on GitHub.

* Support for remaining states till SessionStop

* Refactoring to move common classes between -2 dc and dinspec messages.

* feat: Addressed some of the comments on PR(AB#1439)

* feat: DIN SPEC should not be listed in supported protocols if use_tls set to false (AB#1439)

Also, Major version for DIN SPEC is 2 (in supportedAppProtocolReq).

* feat: Add timeout handling to CableCheck, renamed ServiceAndPaymentSelection to ServicePaymentSelection

* feat: Added tests. Fixed identified issue with CableCheck.

* feat: More fixes. (AB#1439)

* feat: Rebased to master. Re-added missed (AB#1439)

* feat: Updated failing tests(AB#1439)

* feat: Addressed comments in PR (AB#1439)

* feat: Fixed failing tests(AB#1439)

* feat: added timeout checkj to CableCheck, WeldingDetection, updated tests., Also added timeout check to WeldingDetectionRes in -2

* feat: Addressed comments on PR. Added missing docstrings.(AB#1439)

* feat: Addressed comments on PR(AB#1439)

* feat: Renamed shared/messages/datatypes_iso15118_2_dinspec to shared/messages/datatypes. Fixed dinspec related mypy issues.

* feat: Fixed flake8 errors

* feat: Updated tests following file rename (AB#1439)

Co-authored-by: lukaslombriserdesignwerk <95468282+lukaslombriserdesignwerk@users.noreply.github.com>
Co-authored-by: Martin Bachmann <martin.bachmann@designwerk.com>
Co-authored-by: tropxy <andre14x@gmail.com>
@tropxy tropxy deleted the fix_messages_datatypes branch May 24, 2022 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants