Refactor Ocpp 1.6/2.0 (#15)

* Document ocpp 1.6 functions Signed-off-by: Lorenzo Donini <[email protected]> * Refactor ocpp1.6 structure and naming Signed-off-by: Lorenzo Donini <[email protected]> * Refactor ocppj naming and docs Signed-off-by: Lorenzo Donini <[email protected]> * Update dateTime formatting in ocpp1.6 Signed-off-by: Lorenzo Donini <[email protected]> * Move feature name constants in ocpp1.6 Update documentation * Start refactoing ocpp2.0 profiles Signed-off-by: Lorenzo Donini <[email protected]> * Create missing ocpp 2.0 profiles * Rename ocpp 1.6 auth package * Restructure first half of ocpp2 messages Signed-off-by: Lorenzo Donini <[email protected]> * Restructure second half of ocpp2.0 messages Signed-off-by: Lorenzo Donini <[email protected]> * Rename confirmation to response Signed-off-by: Lorenzo Donini <[email protected]> * Cleanup ocpp 2.0 endpoints Signed-off-by: Lorenzo Donini <[email protected]> * Fix expected errors in e2e tests Signed-off-by: Lorenzo Donini <[email protected]> * Add MessageTypeNotSupported error code Signed-off-by: Lorenzo Donini <[email protected]> * Check for unsupported feature in 1.6 and update example names Signed-off-by: Lorenzo Donini <[email protected]>
lorenzodonini · May 23, 2020 · 0c9d005 · 0c9d005
1 parent 03b5898
commit 0c9d005
Show file tree

Hide file tree

Showing 164 changed files with 5,953 additions and 5,281 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,16 +20,16 @@ jobs:
         - go test ./...
     - stage: publish_latest
       script:
-        - docker build -t ldonini/ocpp1.6-central-system:latest -f example/cs/Dockerfile .
-        - docker build -t ldonini/ocpp1.6-charge-point:latest -f example/cp/Dockerfile .
+        - docker build -t ldonini/ocpp1.6-central-system:latest -f example/cs1.6/Dockerfile .
+        - docker build -t ldonini/ocpp1.6-charge-point:latest -f example/cp1.6/Dockerfile .
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker push ldonini/ocpp1.6-central-system:latest
         - docker push ldonini/ocpp1.6-charge-point:latest
       if: branch == master
     - stage: release
       script:
-        - docker build -t "ldonini/ocpp1.6-central-system:$TRAVIS_TAG" -f example/cs/Dockerfile .
-        - docker build -t "ldonini/ocpp1.6-charge-point:$TRAVIS_TAG" -f example/cp/Dockerfile .
+        - docker build -t "ldonini/ocpp1.6-central-system:$TRAVIS_TAG" -f example/cs1.6/Dockerfile .
+        - docker build -t "ldonini/ocpp1.6-charge-point:$TRAVIS_TAG" -f example/cp1.6/Dockerfile .
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker push "ldonini/ocpp1.6-central-system:$TRAVIS_TAG"
         - docker push "ldonini/ocpp1.6-charge-point:$TRAVIS_TAG"

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Planned milestones and features:
 
 **Note: The library is still a WIP, therefore expect some APIs to change.** 
 
-## Usage
+## OCPP 1.6 Usage
 
 Go version 1.11+ is required.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   central_system:
     build:
       context: .
-      dockerfile: ./example/cs/Dockerfile
+      dockerfile: example/cs1.6/Dockerfile
     image: ldonini/ocpp1.6-central-system:latest
     container_name: central-system
     ports:
@@ -16,7 +16,7 @@ services:
       - CENTRAL_SYSTEM_URL=ws://central_system:8887
     build:
       context: .
-      dockerfile: ./example/cp/Dockerfile
+      dockerfile: example/cp1.6/Dockerfile
     image: ldonini/ocpp1.6-charge-point:latest
     container_name: charge-point
     networks:

diff --git a/example/cp/charge_point_sim.go b/example/cp/charge_point_sim.go
diff --git a/example/cp/Dockerfile → example/cp1.6/Dockerfile b/example/cp/Dockerfile → example/cp1.6/Dockerfile
@@ -9,7 +9,7 @@ COPY . .
 # Fetch dependencies.
 RUN go mod download
 # Build the binary.
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/charge_point example/cp/charge_point_sim.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o /go/bin/charge_point example/cp1.6/charge_point_sim.go
 
 ############################
 # STEP 2 build a small image