Skip to content

Commit

Permalink
🔥 Remove support for OCPP 1.6J
Browse files Browse the repository at this point in the history
- OCPP 1.6J is no longer part of the NEVI requirements in the US
- OCPP has switched to developing 2.1, so 1.6J is two releases old
- The 1.6J demo used StEVe as the CSMS, which was known to be flaky
    - It is not clear when anybody last ran the 11.6J demo, and whether it is
      still working or has bitrotted
- We now support two 201 CSMSes, so we are not picking a single integration
  point, and can still test interoperability
- We want to add CI for this repo so that we can see if anything is
  broken/bitrotted. If it isn't tested, it isn't working. We don't want a flaky
  demo in there confusing everything.
  • Loading branch information
shankari committed Nov 3, 2024
1 parent da4dcdf commit 084bc3d
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 214 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Below is a table of demonstrations that are currently available.
| **One EV ↔ EVSE (ISO 15118-2 DC)** | ISO 15118-2 compliant charging session with one EV connecting to one EVSE | [One EV ↔ EVSE (ISO 15118-2 DC) Diagram](#one-ev-to-evse-iso-15118-2-dc)|
| **Two EV ↔ EVSE** | Two EVSE connector points showcasing EVerests ability to work with a CSMS in a multi-station context | [Two EV ↔ EVSE Diagram](#two-ev-to-evse) |
| **E2E Automated Tests** | Performs an automated test of a full charging session| [E2E Automated Tests Diagram](e2e-automated-tests) |
| **OCPP Demos** | Various OCPP 1.6J and 2.0.1 compliant charging sessions with differing security profiles| [OCPP Demo Diagram](#ocpp-demos)|
| **OCPP Demos** | Various OCPP 2.0.1 compliant charging sessions with differing security profiles| [OCPP Demo Diagram](#ocpp-demos)|

## Operating System Specific Instructions

Expand Down Expand Up @@ -120,8 +120,6 @@ the demonstrations. See below:

### One EV ↔ EVSE (ISO 15118 AC) Demo

- You can open the SteVe wep portal at <http://localhost:8180/steve/manager/home>.
Login with username: admin, password: 1234 when running the OCPP Demos
- When running the Basic and ISO 15118-2 AC Charging with OCPP 201 CSMS demo,
the script currently checks out the maeve repository and builds it, so it is
fairly slow.
Expand Down
14 changes: 5 additions & 9 deletions demo-iso15118-2-ocpp-201.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CITRINEOS_BRANCH="feature/everest-demo"



usage="usage: $(basename "$0") [-r <repo>] [-b <branch>] [-j|1|2|3|c] [-h]
usage="usage: $(basename "$0") [-r <repo>] [-b <branch>] [-c <csms>] [1|2|3] [-h]
This script will run EVerest ISO 15118-2 AC charging with OCPP demos.
Expand All @@ -23,7 +23,6 @@ directory to the -r option (e.g., '-r \$(pwd)').
where:
-r URL to everest-demo repo to use (default: $DEMO_REPO)
-b Branch of everest-demo repo to use (default: $DEMO_BRANCH)
-j OCPP v1.6j
-1 OCPP v2.0.1 Security Profile 1
-2 OCPP v2.0.1 Security Profile 2
-3 OCPP v2.0.1 Security Profile 3
Expand All @@ -37,12 +36,10 @@ DEMO_CSMS=maeve


# loop through positional options/arguments
while getopts ':r:b:j123ch' option; do
while getopts ':r:b:c123h' option; do
case "$option" in
r) DEMO_REPO="$OPTARG" ;;
b) DEMO_BRANCH="$OPTARG" ;;
j) DEMO_VERSION="v1.6j"
DEMO_COMPOSE_FILE_NAME="docker-compose.ocpp16j.yml" ;;
1) DEMO_VERSION="v2.0.1-sp1"
DEMO_COMPOSE_FILE_NAME="docker-compose.ocpp201.yml" ;;
2) DEMO_VERSION="v2.0.1-sp2"
Expand Down Expand Up @@ -93,7 +90,7 @@ cd "${DEMO_DIR}" || exit 1
echo "Cloning EVerest from ${DEMO_REPO} into ${DEMO_DIR}/everest-demo"
git clone --branch "${DEMO_BRANCH}" "${DEMO_REPO}" everest-demo

if [[ "$DEMO_VERSION" != v1.6j && "$DEMO_CSMS" == maeve ]]; then
if [[ "$DEMO_CSMS" == maeve ]]; 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}" ${DEMO_CSMS}-csms

Expand Down Expand Up @@ -176,8 +173,7 @@ if [[ "$DEMO_VERSION" != v1.6j && "$DEMO_CSMS" == maeve ]]; then
popd || exit 1
fi


if [[ "$DEMO_VERSION" != v1.6j && "$DEMO_CSMS" == 'citrineos' ]]; then
if [[ "$DEMO_CSMS" == 'citrineos' ]]; then
echo "Cloning CitrineOS CSMS from ${CITRINEOS_REPO} into ${DEMO_DIR}/citrineos-csms and starting it"
git clone --branch "${CITRINEOS_BRANCH}" "${CITRINEOS_REPO}" citrineos-csms

Expand Down Expand Up @@ -274,4 +270,4 @@ fi
if [[ "$DEMO_VERSION" =~ v2.0.1 ]]; then
echo "Starting software in the loop simulation"
docker exec everest-ac-demo-manager-1 sh /ext/source/build/run-scripts/run-sil-ocpp201-pnc.sh
fi
fi
8 changes: 0 additions & 8 deletions docker-compose.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ services:
MYSQL_USER: ocpp
MYSQL_PASSWORD: ocpp

steve:
build: steve
ports:
- 8180:8180
- 8443:8443
depends_on:
- ocpp-db

nodered:
build: nodered
image: ghcr.io/everest/everest-demo/nodered:${TAG}
Expand Down
53 changes: 0 additions & 53 deletions docker-compose.ocpp16j.yml

This file was deleted.

17 changes: 0 additions & 17 deletions steve/Dockerfile

This file was deleted.

57 changes: 0 additions & 57 deletions steve/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions steve/init.sh

This file was deleted.

Binary file removed steve/keystore.jks
Binary file not shown.
57 changes: 0 additions & 57 deletions steve/main.properties

This file was deleted.

0 comments on commit 084bc3d

Please sign in to comment.