Smart Charging: Expand add profile capabilities #682

couryrr-afs · 2024-06-21T16:33:20Z

Describe your changes

Added logic to replace existing non-external constraint charging profiles
Added logic to verify TX Default charging profile evse placement.
Added test to cover required callbacks.

Issue ticket number and link

Checklist before requesting a review

I have performed a self-review of my code
I have made corresponding changes to the documentation
If OCPP 2.0.1: I have updated the OCPP 2.0.1 status document
I read the contribution documentation and made sure that my changes meet its requirements

couryrr-afs · 2024-06-21T16:34:39Z

@shankari this is ready for your review.

lib/ocpp/v201/smart_charging.cpp

tests/lib/ocpp/v201/test_smart_charging_handler.cpp

shankari

This is a fairly simple change and my comments are primarily focused on improved documentation, so I am approving this. Please do address my comments before sending it off to the community for merging. Documentation clarity is just as important, particularly in open source projects, where contributors can join and leave, as code.

lib/ocpp/v201/charge_point.cpp

tests/lib/ocpp/v201/test_charge_point.cpp

shankari

One more clarifying question....

shankari · 2024-07-05T17:09:46Z

doc/ocpp_201_status.md

+| K01.FR.14 | ✅     |                                                                                                 |
+| K01.FR.15 | ✅     |                                                                                                 |


These are not addressed in this PR, right?

These were addressed with the check here

marcemmers

I have some comments/questions. Not sure if there are any actual changes needed but would like some answers at least before approving.

lib/ocpp/v201/smart_charging.cpp

tests/lib/ocpp/v201/test_smart_charging_handler.cpp

couryrr-afs · 2024-07-19T13:24:21Z

tests/lib/ocpp/v201/test_smart_charging_handler.cpp

+TEST_F(ChargepointTestFixtureV201,
+       K01FR05_IfProfileWithSameIdExistsAndIsChargingStationExternalContraints_ThenProfileIsAppended) {
+
+    auto profile1 =
+        create_charging_profile(DEFAULT_PROFILE_ID, ChargingProfilePurposeEnum::ChargingStationExternalConstraints,
+                                create_charge_schedule(ChargingRateUnitEnum::A), uuid(),
+                                ChargingProfileKindEnum::Absolute, DEFAULT_STACK_LEVEL);
+    auto profile2 = create_charging_profile(DEFAULT_PROFILE_ID, ChargingProfilePurposeEnum::TxProfile,
+                                            create_charge_schedule(ChargingRateUnitEnum::A), uuid(),
+                                            ChargingProfileKindEnum::Absolute, DEFAULT_STACK_LEVEL);
+
+    auto sut1 = handler.add_profile(DEFAULT_EVSE_ID, profile1);
+    auto sut2 = handler.add_profile(DEFAULT_EVSE_ID, profile2);
+
+    auto profiles = handler.get_profiles();
+
+    EXPECT_THAT(sut1.status, testing::Eq(ChargingProfileStatusEnum::Accepted));
+    EXPECT_THAT(sut2.status, testing::Eq(ChargingProfileStatusEnum::Accepted));
+    EXPECT_THAT(profiles, testing::Contains(profile1));
+    EXPECT_THAT(profiles, testing::Contains(profile2));
+}


Based on the need for profile_ids to be unique. This test seems to be validating an invalid case.

With the latest update we've removed this test.

Signed-off-by: Gianfranco Berardi <[email protected]>

Signed-off-by: Christopher Davis <[email protected]>

Signed-off-by: Gianfranco Berardi <[email protected]>

Signed-off-by: Christopher Davis <[email protected]>

Signed-off-by: Coury Richards <[email protected]>

Clarify where the existing profiles in the FR05 tests are. Signed-off-by: Christopher Davis <[email protected]>

Signed-off-by: Christopher Davis <[email protected]>

lib/ocpp/v201/smart_charging.cpp

marcemmers

Except for 2 small comments this looks good. The comments are relatively minor and I can accept to merge this as is and fix those later if you want to.

We don't need a try-catch actually Signed-off-by: Christopher Davis <[email protected]>

Signed-off-by: Christopher Davis <[email protected]>

Signed-off-by: Coury Richards <[email protected]>

louisg1337 reviewed Jun 24, 2024

View reviewed changes

lib/ocpp/v201/smart_charging.cpp Outdated Show resolved Hide resolved

louisg1337 reviewed Jun 24, 2024

View reviewed changes

tests/lib/ocpp/v201/test_smart_charging_handler.cpp Outdated Show resolved Hide resolved

louisg1337 reviewed Jun 24, 2024

View reviewed changes

tests/lib/ocpp/v201/test_smart_charging_handler.cpp Outdated Show resolved Hide resolved

shankari approved these changes Jun 27, 2024

View reviewed changes

lib/ocpp/v201/charge_point.cpp Show resolved Hide resolved

lib/ocpp/v201/charge_point.cpp Show resolved Hide resolved

tests/lib/ocpp/v201/test_charge_point.cpp Outdated Show resolved Hide resolved

couryrr-afs force-pushed the feature/k01-add-profile branch 2 times, most recently from dbe9afb to 5d7919c Compare July 3, 2024 14:13

shankari approved these changes Jul 5, 2024

View reviewed changes

Pietfried assigned marcemmers Jul 8, 2024

couryrr-afs force-pushed the feature/k01-add-profile branch 2 times, most recently from 5d7919c to 18f3f28 Compare July 8, 2024 17:21

couryrr-afs marked this pull request as ready for review July 8, 2024 17:22

couryrr-afs requested review from Pietfried, hikinggrass, marcemmers and maaikez as code owners July 8, 2024 17:22

marcemmers reviewed Jul 9, 2024

View reviewed changes

lib/ocpp/v201/smart_charging.cpp Outdated Show resolved Hide resolved

lib/ocpp/v201/smart_charging.cpp Outdated Show resolved Hide resolved

tests/lib/ocpp/v201/test_smart_charging_handler.cpp Show resolved Hide resolved

couryrr-afs commented Jul 19, 2024

View reviewed changes

gberardi-pillar and others added 12 commits July 22, 2024 15:54

Add TxDefaultProfile to either EVSE or entire station.

0d74948

Signed-off-by: Gianfranco Berardi <[email protected]>

Return SetChargingProfileResponse when adding profile.

1058bd8

Signed-off-by: Gianfranco Berardi <[email protected]>

Check boxes for K01.FR.14 and K01.FR.15.

b184b3e

Signed-off-by: Gianfranco Berardi <[email protected]>

smart_charging: Handle profile updates per K01.FR.05

7774438

Signed-off-by: Christopher Davis <[email protected]>

Test Callbacks validity check.

22001e4

Signed-off-by: Gianfranco Berardi <[email protected]>

Ensure each function is required in validity check.

f7ddab4

Signed-off-by: Gianfranco Berardi <[email protected]>

Add security_event_callback to validity check.

fc126da

Signed-off-by: Gianfranco Berardi <[email protected]>

Add set_charging_profiles_callback to validity check.

b944ad1

Signed-off-by: Gianfranco Berardi <[email protected]>

Fix lint issue.

68cf543

Signed-off-by: Gianfranco Berardi <[email protected]>

Fix lint issue.

93e388e

Signed-off-by: Gianfranco Berardi <[email protected]>

Add tests for optional functions being validated.

4a3c03b

Signed-off-by: Gianfranco Berardi <[email protected]>

Fix lint.

1312179

Signed-off-by: Gianfranco Berardi <[email protected]>

gberardi-pillar and others added 5 commits July 22, 2024 15:54

Specify requirement in test names.

854b1cd

Signed-off-by: Gianfranco Berardi <[email protected]>

Update callback validity check with all optional function objects.

a51cf29

Signed-off-by: Gianfranco Berardi <[email protected]>

charge_point: Fix incorrect type in tests

de3706a

Signed-off-by: Christopher Davis <[email protected]>

added comment for K01 functional requirement

f8384e5

Signed-off-by: Coury Richards <[email protected]>

commented reason for test case

8c5aa0f

Signed-off-by: Coury Richards <[email protected]>

christopher-davis-afs force-pushed the feature/k01-add-profile branch from 18f3f28 to 8c5aa0f Compare July 22, 2024 15:57

couryrr-afs closed this Jul 23, 2024

couryrr-afs deleted the feature/k01-add-profile branch July 23, 2024 16:15

couryrr-afs restored the feature/k01-add-profile branch July 23, 2024 16:31

couryrr-afs reopened this Jul 23, 2024

christopher-davis-afs added 2 commits July 23, 2024 15:15

smart_charging: Clarify test names for add profile

7e09162

Clarify where the existing profiles in the FR05 tests are. Signed-off-by: Christopher Davis <[email protected]>

smart_charging: Ensure profile ids are unique across destinations

8bafb0c

Signed-off-by: Christopher Davis <[email protected]>

marcemmers reviewed Jul 24, 2024

View reviewed changes

lib/ocpp/v201/smart_charging.cpp Outdated Show resolved Hide resolved

marcemmers reviewed Jul 24, 2024

View reviewed changes

lib/ocpp/v201/smart_charging.cpp Outdated Show resolved Hide resolved

marcemmers approved these changes Jul 24, 2024

View reviewed changes

christopher-davis-afs and others added 3 commits July 24, 2024 12:18

smart_charging: Adjust get_station_wide_profiles

7994707

We don't need a try-catch actually Signed-off-by: Christopher Davis <[email protected]>

smart_charging: Clean up redundant imports

8f633db

Signed-off-by: Christopher Davis <[email protected]>

corrected test name

570bd0c

Signed-off-by: Coury Richards <[email protected]>

couryrr-afs force-pushed the feature/k01-add-profile branch from 4b49b17 to 570bd0c Compare July 24, 2024 14:02

christopher-davis-afs mentioned this pull request Jul 24, 2024

Implement SetChargingProfileRequest and basic database storage/loading #711

Merged

4 tasks

marcemmers merged commit 01f064f into EVerest:main Jul 24, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Smart Charging: Expand add profile capabilities #682

Smart Charging: Expand add profile capabilities #682

couryrr-afs commented Jun 21, 2024

couryrr-afs commented Jun 21, 2024

shankari left a comment

shankari left a comment

shankari Jul 5, 2024

couryrr-afs Jul 8, 2024

marcemmers left a comment

couryrr-afs Jul 19, 2024

christopher-davis-afs Jul 23, 2024

marcemmers left a comment

Smart Charging: Expand add profile capabilities #682

Smart Charging: Expand add profile capabilities #682

Conversation

couryrr-afs commented Jun 21, 2024

Describe your changes

Issue ticket number and link

Checklist before requesting a review

couryrr-afs commented Jun 21, 2024

shankari left a comment

Choose a reason for hiding this comment

shankari left a comment

Choose a reason for hiding this comment

shankari Jul 5, 2024

Choose a reason for hiding this comment

couryrr-afs Jul 8, 2024

Choose a reason for hiding this comment

marcemmers left a comment

Choose a reason for hiding this comment

couryrr-afs Jul 19, 2024

Choose a reason for hiding this comment

christopher-davis-afs Jul 23, 2024

Choose a reason for hiding this comment

marcemmers left a comment

Choose a reason for hiding this comment