Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/vss-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ In addition older versions may be supported. This folder contains copies of all
a branch without description. Descriptions are mandatory in VSS but that is currently not checked by vss-tools.
However, KUKSA.val databroker requires description to be present.
Use [VSS 3.1.1](https://github.com/COVESA/vehicle_signal_specification/releases/tag/v3.1.1) instead.
* [VSS 5.1](https://github.com/COVESA/vehicle_signal_specification/releases/tag/v5.1) gives the `max` value for brake torque has float (`0.0`), even though the datapoint is an int16 value. This does not pass the KUKSA validator. In the VSS json we are shipping this issue has been rectified.

## Change process

Expand Down Expand Up @@ -60,7 +61,7 @@ use the full name. When official release is created replace the copied *.json-fi
Build and run kuksa_databroker using the new VSS file according to [documentation](../../README.md), e.g.

```sh
$cargo run --bin databroker -- --metadata ./data/vss-core/vss_release_4.0.json
$cargo run --bin databroker -- --metadata ./data/vss-core/vss_release_5.1.json
```

Use the client to verify that changes in VSS are reflected, by doing e.g. set/get on some new or renamed signals.
Expand Down
1 change: 1 addition & 0 deletions data/vss-core/vss_release_5.1.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/opentelemetry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Enable the `otel` feature and start databroker binary with an increased buffer s
```
# in $workspace
cargo build --features=otel
OTEL_BSP_MAX_QUEUE_SIZE=8192 target/debug/databroker --vss data/vss-core/vss_release_4.0.json --enable-databroker-v1 --insecure
OTEL_BSP_MAX_QUEUE_SIZE=8192 target/debug/databroker --vss data/vss-core/vss_release_5.1.json --enable-databroker-v1 --insecure
```

Open the Jaeger UI at http://localhost:16686
Expand Down
6 changes: 3 additions & 3 deletions doc/tls.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ KUKSA Databroker supports TLS, but not mutual authentication.
As of today, if TLS is not configured, KUKSA Databroker will accept insecure connections.

```
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_4.0.json
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_5.1.json
```

The default behavior may change in the future. By that reason, it is recommended to use the `--insecure` argument
if you want to use insecure connections.

```
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_4.0.json --insecure
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_5.1.json --insecure
```

To use a secure connection specify both `--tls-cert`and `--tls-private-key`

```
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_4.0.json --tls-cert ../certificates/Server.pem --tls-private-key ../certificates/Server.key
~/kuksa-databroker$ cargo run --bin databroker -- --metadata ../data/vss-core/vss_release_5.1.json --tls-cert ../certificates/Server.pem --tls-private-key ../certificates/Server.key
```

Default certificates and keys are not included in the default KUKSA Databroker container,
Expand Down
2 changes: 1 addition & 1 deletion integration_test/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ VSS_DATA_DIR="$SCRIPT_DIR/../data"

echo "Starting databroker container (\"${DATABROKER_IMAGE}\") in insecure mode, requesting platform (\"${CONTAINER_PLATFORM}\")"
RUNNING_IMAGE=$(
docker run -d -v ${VSS_DATA_DIR}:/data -p 55555:55555 --rm --platform ${CONTAINER_PLATFORM} ${DATABROKER_IMAGE} --metadata data/vss-core/vss_release_4.0.json --insecure --enable-databroker-v1
docker run -d -v ${VSS_DATA_DIR}:/data -p 55555:55555 --rm --platform ${CONTAINER_PLATFORM} ${DATABROKER_IMAGE} --metadata data/vss-core/vss_release_5.1.json --insecure --enable-databroker-v1
)

python3 -m pytest -v "${SCRIPT_DIR}/test_databroker.py"
Expand Down
4 changes: 2 additions & 2 deletions integration_test/viss/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pip install pytest pytest-bdd allure-pytest-bdd requests websocket-client paho-m

Start databroker from project root:
```
RUST_LOG=debug cargo run --bin databroker --release --features viss -- --vss data/vss-core/vss_release_4.0.json --insecure --enable-viss --viss-address 0.0.0.0 --viss-port 8090
RUST_LOG=debug cargo run --bin databroker --release --features viss -- --vss data/vss-core/vss_release_5.1.json --insecure --enable-viss --viss-address 0.0.0.0 --viss-port 8090
```

> RUST_LOG=debug enables debug log messages of databroker, which shows incoming and outgoing VISS requests and makes it easier to troubleshoot failing tests.
Expand Down Expand Up @@ -80,7 +80,7 @@ _Setup:_ Clone kuksa-common for pre-built JWT tokens for testing purposes.
Start databroker with public key using `--jwt-public-key` to enable validation of access tokens:

```
RUST_LOG=debug cargo run --bin databroker --release --features viss -- --vss data/vss-core/vss_release_4.0.json --insecure --enable-databroker-v1 --enable-viss --viss-address 0.0.0.0 --viss-port 8090 --jwt-public-key kuksa-common/jwt/jwt.key.pub
RUST_LOG=debug cargo run --bin databroker --release --features viss -- --vss data/vss-core/vss_release_5.1.json --insecure --enable-databroker-v1 --enable-viss --viss-address 0.0.0.0 --viss-port 8090 --jwt-public-key kuksa-common/jwt/jwt.key.pub
```

Re-run tests:
Expand Down
5 changes: 3 additions & 2 deletions scripts/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ COPY ./dist/$TARGETARCH/sbom.json /app/sbom.json
COPY ./dist/$TARGETARCH/thirdparty-licenses/ /app/thirdparty-licenses


COPY ./data/vss-core/vss_release_3.1.1.json vss_release_3.1.1.json
COPY ./data/vss-core/vss_release_4.0.json vss_release_4.0.json
COPY ./data/vss-core/vss_release_5.1.json vss_release_5.1.json


ENV KUKSA_DATABROKER_ADDR=0.0.0.0
ENV KUKSA_DATABROKER_PORT=55555
ENV KUKSA_DATABROKER_METADATA_FILE=vss_release_4.0.json
ENV KUKSA_DATABROKER_METADATA_FILE=vss_release_5.1.json

EXPOSE $KUKSA_DATABROKER_PORT

Expand Down
Loading