Skip to content

Commit

Permalink
🐛Fix citrine test after upgrade to 0.0.16
Browse files Browse the repository at this point in the history
This fixes #50
by copying over the device model for Citrine SP1 as well.
Note that the location where the device model is read is different after 0.0.16

#50 (comment)

Testing done:

```
$ bash demo-iso15118-2-ac-plus-ocpp.sh -c -1

/var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.hzWe2rEL/citrine-csms /var/folders/y5/cx3cfzrd2q116myv9ly86sw1rnlmdj/T/tmp.hzWe2rEL
HEAD is now at 63670f3 Merge pull request #99 from citrineos/fix/fix-container-build-pipeline
...

 ✔ Network server_default          Created                                                                0.1s
 ✔ Container server-amqp-broker-1  Created                                                                0.1s
 ✔ Container server-ocpp-db-1      Healthy                                                                0.1s
 ✔ Container server-directus-1     Created                                                                0.1s
 ✔ Container server-citrine-1      Created                                                               10.9s

...
200Password update successful.
API calls to CSMS finished, starting EVerest...
...
[+] Running 4/4
 ✔ Network everest-ac-demo_default          Created                                                       0.0s
 ✔ Container everest-ac-demo-mqtt-server-1  Healthy                                                       0.1s
 ✔ Container everest-ac-demo-manager-1      Healthy                                                       0.1s
 ✔ Container everest-ac-demo-nodered-1      Healthy                                                       0.1s
                                             Successfully copied 6.66kB to everest-ac-demo-manager-1:/ext/source/config/config-sil-ocpp201-pnc.yaml
Copying device DB, configured to SecurityProfile: 1
                                             Successfully copied 84.5kB to everest-ac-demo-manager-1:/ext/source/build/dist/share/everest/modules/OCPP201/device_model_storage.db

2024-06-05 03:46:08.957953 [INFO] ocpp:OCPP201     :: Connecting to plain websocket at uri: ws://host.docker.internal/ws/cp001 with security profile: 1

2024-06-05 03:46:09.053553 [INFO] ocpp:OCPP201     :: OCPP client successfully connected to plain websocket server

2024-06-05 03:47:19.161544 [INFO] ocpp:OCPP201     :: Received BootNotificationResponse: {
    "currentTime": "2024-06-05T03:47:19.157Z",
    "interval": 60,
    "status": "Accepted"
}
```
  • Loading branch information
shankari committed Jun 5, 2024
1 parent 1aa6cc1 commit d9cd7bb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion demo-iso15118-2-ac-plus-ocpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ if [[ "$DEMO_VERSION" =~ sp2 || "$DEMO_VERSION" =~ sp3 ]]; then
docker exec everest-ac-demo-manager-1 /bin/bash -c "pushd /ext/source/build && openssl verify -show_chain -CAfile dist/etc/everest/certs/ca/v2g/V2G_ROOT_CA.pem --untrusted dist/etc/everest/certs/ca/csms/CPO_SUB_CA1.pem --untrusted dist/etc/everest/certs/ca/csms/CPO_SUB_CA2.pem dist/etc/everest/certs/client/csms/CSMS_LEAF.pem"
fi

if [[ ${CSMS} == "citrine" ]]; then
if [[ ${CSMS} == "citrine" && ! ("$DEMO_VERSION" =~ sp1) ]]; then
echo "TODO: Set up device model correctly!"
else
if [[ "$DEMO_VERSION" =~ sp1 ]]; then
Expand Down

0 comments on commit d9cd7bb

Please sign in to comment.