Add general citrine support #58

ChrisWeissmann · 2024-06-10T15:29:06Z

feat: add general citrine support with own device-model. Run bash command with argument -c.

Testing done:
Used local branch to test before pushing to remote ./demo-iso15118-2-ac-plus-ocpp.sh -2 -c -r $(pwd) -b feature/add-citrine-support-signedoff

[+] Running 5/5
 ✔ Network citrineos-csms_default          Created                                                                                                                                                            0.0s
 ✔ Container citrineos-csms-ocpp-db-1      Healthy                                                                                                                                                           22.6s
 ✔ Container citrineos-csms-amqp-broker-1  Healthy                                                                                                                                                           22.6s
 ✔ Container citrineos-csms-directus-1     Healthy                                                                                                                                                           22.6s
 ✔ Container citrineos-csms-citrine-1      Healthy                                                                                                                                                           22.5s

Adding charger successfully:

Adding a charger to CitrineOS
Adding new station...
{"data":{"id":"cp001","isOnline":null,"locationId":2,"createdAt":"2024-06-10T15:10:18.175Z","updatedAt":"2024-06-10T15:10:18.176Z"}}{"data":{"id":"cp001","isOnline":null,"locationId":2,"createdAt":"2024-06-10T15:10:18.175Z","updatedAt":"2024-06-10T15:10:18.176Z"}}
Add cp001 password to citrine...

[+] Running 4/4
 ✔ Network everest-ac-demo_default          Created                                                                                                                                                           0.0s
 ✔ Container everest-ac-demo-mqtt-server-1  Healthy                                                                                                                                                           1.1s
 ✔ Container everest-ac-demo-nodered-1      Healthy                                                                                                                                                          31.0s
 ✔ Container everest-ac-demo-manager-1      Healthy

2024-06-10 15:13:05.314829 [INFO] ocpp:OCPP201     :: Received BootNotificationResponse: {
    "currentTime": "2024-06-10T15:13:05.306Z",
    "interval": 60,
    "status": "Accepted"
}

…mand with argument `-c`. Testing done: Used local branch to test before pushing to remote `./demo-iso15118-2-ac-plus-ocpp.sh -2 -c -r $(pwd) -b feature/add-citrine-support-signedoff` ``` [+] Running 5/5 ✔ Network citrineos-csms_default Created 0.0s ✔ Container citrineos-csms-ocpp-db-1 Healthy 22.6s ✔ Container citrineos-csms-amqp-broker-1 Healthy 22.6s ✔ Container citrineos-csms-directus-1 Healthy 22.6s ✔ Container citrineos-csms-citrine-1 Healthy 22.5s ``` Adding charger successfully: ``` Adding a charger to CitrineOS Adding new station... {"data":{"id":"cp001","isOnline":null,"locationId":2,"createdAt":"2024-06-10T15:10:18.175Z","updatedAt":"2024-06-10T15:10:18.176Z"}}{"data":{"id":"cp001","isOnline":null,"locationId":2,"createdAt":"2024-06-10T15:10:18.175Z","updatedAt":"2024-06-10T15:10:18.176Z"}} Add cp001 password to citrine... ``` ``` [+] Running 4/4 ✔ Network everest-ac-demo_default Created 0.0s ✔ Container everest-ac-demo-mqtt-server-1 Healthy 1.1s ✔ Container everest-ac-demo-nodered-1 Healthy 31.0s ✔ Container everest-ac-demo-manager-1 Healthy ``` ``` 2024-06-10 15:13:05.314829 [INFO] ocpp:OCPP201 :: Received BootNotificationResponse: { "currentTime": "2024-06-10T15:13:05.306Z", "interval": 60, "status": "Accepted" } ``` Signed-off-by: Christian Weissmann <[email protected]>

Signed-off-by: Christian Weissmann <[email protected]>

thanaParis · 2024-06-17T15:42:01Z

@shankari can we close #53 in favor of this PR? Hoping we can merge this soon!

louisg1337 · 2024-06-17T23:03:08Z

Thank you guys for getting this over to us. I took some time to try out the new demo script and almost everything worked as expected. Here are the steps I took and the results I saw.

Cloned repo + checked out branch.

git clone https://github.com/ChrisWeissmann/everest-demo.git
git checkout -b feature/add-citrine-support-signedoff origin/feature/add-citrine-support-signedoff

Ran the demo script.

bash demo-iso15118-2-ac-plus-ocpp.sh -2 -c -r $(pwd) -b feature/add-citrine-support-signedoff

Observed all of the following (same as @ChrisWeissmann above).
- Citrine containers start successfully ✅
- Charger and password set successfully ✅
- EVerest containers loaded properly ✅
- BootNotificationResponse returned accepted ✅
Went to localhost:8080/docs and sent a setChargingProfile API request.
- Message was successfully sent to EVerest as it was in the OCPP logs and returned a Not Implemented. ✅

Went to localhost:1880/ui and tried to start a charging session.

Unfortunately this didn't work as it seems like we aren't adding any authorization token to Citrine. Whenever I tried swiping the RFID to authorize the transaction, I get this message in return. ❌

2024-06-17 22:49:02.926657 [INFO] token_provider_  :: Publishing new dummy token: {"id_token":{"value":"DEADBEEF","type":"ISO14443"},"authorization_type":"RFID","prevalidated":false,"connectors":[1]}
2024-06-17 22:49:02.931590 [INFO] auth:Auth        :: Received new token: {
    "authorization_type": "RFID",
    "connectors": [
        1
     ],
    "id_token": {
        "type": "ISO14443",
        "value": "DEADBEEF"
     },
  "prevalidated": false
}
2024-06-17 22:49:02.942580 [INFO] ocpp:OCPP201     :: Found invalid entry in AuthCache: Sending new request
2024-06-17 22:49:03.076192 [INFO] auth:Auth        :: Result for token: DEADBEEF: REJECTED

Let me know if I did something wrong somewhere along the line that would get 5 working. Other than that one issue, it all looked great. We really appreciate all the work that was put into getting this PR together!

EDIT:

I forgot to check this before, but MaEVe doesn't work with this new script. There are a few changes that need to be made to make it work in this new script, all of which I am working on getting into the review.

shankari · 2024-06-17T23:10:43Z

@thanaParis @ChrisWeissmann please see comment from @louisg1337

louisg1337 · 2024-06-17T23:16:30Z

citrineos/add-charger.sh

If you could put in an extra function to support adding in EVerest's authorization token to Citrine that would be great. I put more context regarding this in my comment here.

louisg1337 · 2024-06-17T23:19:23Z

demo-iso15118-2-ac-plus-ocpp.sh


-if [[ "$DEMO_VERSION" != v1.6j ]]; then
-  echo "Cloning ${CSMS} CSMS from ${CSMS_REPO} into ${DEMO_DIR}/${CSMS}-csms and starting it"
+if [[ "$DEMO_VERSION" != v1.6j  && "$DEMO_CSMS" == meave ]]; then


Small typo meave --> 'maeve'

louisg1337 · 2024-06-17T23:26:03Z

demo-iso15118-2-ac-plus-ocpp.sh

-  echo "Cloning ${CSMS} CSMS from ${CSMS_REPO} into ${DEMO_DIR}/${CSMS}-csms and starting it"
+if [[ "$DEMO_VERSION" != v1.6j  && "$DEMO_CSMS" == meave ]]; then
+  echo "Cloning ${DEMO_CSMS} CSMS from ${MAEVE_REPO} into ${DEMO_DIR}/${DEMO_CSMS}-csms and starting it"
+  git clone --branch "${MAEVE_BRANCH}" "${MAEVE_REPO}" "${CSMS}-csms"


Change "${CSMS}-csms" to "${DEMO_CSMS}-csms"

louisg1337 · 2024-06-18T00:00:43Z

demo-iso15118-2-ac-plus-ocpp.sh

-    if [[ "$DEMO_VERSION" =~ sp1 ]]; then
-      echo "MaEVe CSMS started, adding charge station with Security Profile 1 (note: profiles in MaEVe start with 0 so SP-0 == OCPP SP-1)"
-      curl http://localhost:9410/api/v0/cs/cp001 -H 'content-type: application/json' \
-        -d '{"securityProfile": 0, "base64SHA256Password": "3oGi4B5I+Y9iEkYtL7xvuUxrvGOXM/X2LQrsCwf/knA="}'
-    elif [[ "$DEMO_VERSION" =~ sp2 ]]; then
-      echo "MaEVe CSMS started, adding charge station with Security Profile 2 (note: profiles in MaEVe start with 0 so SP-1 == OCPP SP-2)"
-      curl http://localhost:9410/api/v0/cs/cp001 -H 'content-type: application/json' \
-        -d '{"securityProfile": 1, "base64SHA256Password": "3oGi4B5I+Y9iEkYtL7xvuUxrvGOXM/X2LQrsCwf/knA="}'
-    elif [[ "$DEMO_VERSION" =~ sp3 ]]; then
-      echo "MaEVe CSMS started, adding charge station with Security Profile 3 (note: profiles in MaEVe start with 0 so SP-2 == OCPP SP-3)"
-      curl http://localhost:9410/api/v0/cs/cp001 -H 'content-type: application/json' -d '{"securityProfile": 2}'
-    fi
-
-    echo "Charge station added, adding user token"
-
-    curl http://localhost:9410/api/v0/token -H 'content-type: application/json' -d '{
-      "countryCode": "GB",
-      "partyId": "TWK",
-      "type": "RFID",
-      "uid": "DEADBEEF",
-      "contractId": "GBTWK012345678V",
-      "issuer": "Thoughtworks",
-      "valid": true,
-      "cacheMode": "ALWAYS"
-    }'
-
-    curl http://localhost:9410/api/v0/token -H 'content-type: application/json' -d '{"countryCode": "UK", "partyId": "Switch", "contractId": "UKSWI123456789G", "uid": "UKSWI123456789G", "issuer": "Switch", "valid": true, "cacheMode": "ALWAYS"}'
-  fi 
-
-  echo "API calls to CSMS finished, starting EVerest..."


All of this needs to be re-added into the MaEVe section. You can just copy and paste all of it into line 147, although please don't include the fi on line 338.

Signed-off-by: thanaParis <[email protected]>

Signed-off-by: Christian Weissmann <[email protected]>

thanaParis · 2024-06-18T19:00:16Z

@louisg1337 the issues with maeve have been fixed! the add-charger.sh script was expanded to add-charger-and-rfid-card.sh and now adds an idToken to CitrineOS with value 'DEADBEEF' and type 'ISO14443'.

shankari · 2024-06-18T20:37:47Z

@louisg1337 in the absence of github actions, can you please try to rerun this for both MaEVe and Citrine? I can then merge this. @MukuFlash03 for an example of what the lack of GH actions is doing 😦

louisg1337 · 2024-06-18T22:47:35Z

@louisg1337 the issues with maeve have been fixed! the add-charger.sh script was expanded to add-charger-and-rfid-card.sh and now adds an idToken to CitrineOS with value 'DEADBEEF' and type 'ISO14443'.

I can confirm everything works as expected now. I tested both Citrine and MaEVe and they both posted Accepted and worked in the SIL demo. Thank you @thanaParis and @ChrisWeissmann for fixing that for us!

louisg1337

Looks great, thanks again for getting this in to us!

ChrisWeissmann mentioned this pull request Jun 10, 2024

Feature/add citrine support #53

Open

slight adjustment from static code analysis action to avoid globbing

17b26dd

Signed-off-by: Christian Weissmann <[email protected]>

thanaParis mentioned this pull request Jun 17, 2024

Connect charging station to CitrineOs citrineos/citrineos#23

Open

louisg1337 reviewed Jun 18, 2024

View reviewed changes

thanaParis and others added 3 commits June 18, 2024 11:01

fixing issues from pr feedback preventing maeve from working

35fb981

Signed-off-by: thanaParis <[email protected]>

adding rfid token generation to script

8563062

Signed-off-by: thanaParis <[email protected]>

adding execution permissions to add-charger-and-rfid-card.sh

0b1584a

Signed-off-by: Christian Weissmann <[email protected]>

thanaParis force-pushed the feature/add-citrine-support-signedoff branch from eb7c43a to 0b1584a Compare June 18, 2024 18:21

fixing add rfid card call

2f400af

Signed-off-by: Christian Weissmann <[email protected]>

louisg1337 approved these changes Jun 18, 2024

View reviewed changes

MukuFlash03 mentioned this pull request Jun 23, 2024

GitHub Actions workflow for running Automated Tests #62

Closed

shankari merged commit 6ac3228 into EVerest:main Jun 26, 2024
5 checks passed

MukuFlash03 mentioned this pull request Aug 9, 2024

Changes from previous PR on Running automated tests via CICD #67

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add general citrine support #58

Add general citrine support #58

ChrisWeissmann commented Jun 10, 2024

thanaParis commented Jun 17, 2024

louisg1337 commented Jun 17, 2024 •

edited

Loading

shankari commented Jun 17, 2024

louisg1337 Jun 17, 2024

louisg1337 Jun 17, 2024

louisg1337 Jun 17, 2024

louisg1337 Jun 18, 2024 •

edited

Loading

thanaParis commented Jun 18, 2024

shankari commented Jun 18, 2024

louisg1337 commented Jun 18, 2024

louisg1337 left a comment

Add general citrine support #58

Add general citrine support #58

Conversation

ChrisWeissmann commented Jun 10, 2024

thanaParis commented Jun 17, 2024

louisg1337 commented Jun 17, 2024 • edited Loading

shankari commented Jun 17, 2024

louisg1337 Jun 17, 2024

Choose a reason for hiding this comment

louisg1337 Jun 17, 2024

Choose a reason for hiding this comment

louisg1337 Jun 17, 2024

Choose a reason for hiding this comment

louisg1337 Jun 18, 2024 • edited Loading

Choose a reason for hiding this comment

thanaParis commented Jun 18, 2024

shankari commented Jun 18, 2024

louisg1337 commented Jun 18, 2024

louisg1337 left a comment

Choose a reason for hiding this comment

louisg1337 commented Jun 17, 2024 •

edited

Loading

louisg1337 Jun 18, 2024 •

edited

Loading