Commit 9356cc45 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

pre-merge code cleanup

parent 78ba82c8

src/tests/tools/simap_ai_engine/ai_engine/config/Config.py

+1 −2
Original line number Original line Diff line number Diff line
@@ -29,8 +29,7 @@ SIMAP_DATASTORE_USERNAME = get_setting('SIMAP_DATASTORE_USERNAME', default='admi 
SIMAP_DATASTORE_PASSWORD = get_setting('SIMAP_DATASTORE_PASSWORD', default='admin')

SIMAP_DATASTORE_PASSWORD = get_setting('SIMAP_DATASTORE_PASSWORD', default='admin')





# InfluxDB Configuration

# InfluxDB Configuration

# INFLUXDB_HOST     = get_setting('INFLUXDB_HOST',     default='localhost')

INFLUXDB_HOST     = get_setting('INFLUXDB_HOST',     default='localhost')

INFLUXDB_HOST     = 'localhost'

INFLUXDB_PORT     = int(get_setting('INFLUXDB_PORT', default='8181'))

INFLUXDB_PORT     = int(get_setting('INFLUXDB_PORT', default='8181'))

INFLUXDB_TOKEN    = get_setting('INFLUXDB_TOKEN',    default='')

INFLUXDB_TOKEN    = get_setting('INFLUXDB_TOKEN',    default='')

INFLUXDB_DATABASE = get_setting('INFLUXDB_DATABASE', default='simap_telemetry')

INFLUXDB_DATABASE = get_setting('INFLUXDB_DATABASE', default='simap_telemetry')

src/tests/tools/simap_ai_engine/deploy.sh

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,9 @@ set -euo pipefail 
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

REPO_ROOT="$(cd "${SCRIPT_DIR}/../../../.." && pwd)"

REPO_ROOT="$(cd "${SCRIPT_DIR}/../../../.." && pwd)"





echo "Building SIMAP Server..."

echo "Building SIMAP DataStore..."

cd "${REPO_ROOT}"

cd "${REPO_ROOT}"

docker buildx build -t simap-server:mock -f ./src/tests/tools/simap_server/Dockerfile .

docker buildx build -t simap-datastore:mock -f ./src/tests/tools/simap_datastore/Dockerfile .





echo "Building NCE-FAN Controller..."

echo "Building NCE-FAN Controller..."

docker buildx build -t nce-fan-ctrl:mock -f ./src/tests/tools/mock_nce_fan_ctrl/Dockerfile .

docker buildx build -t nce-fan-ctrl:mock -f ./src/tests/tools/mock_nce_fan_ctrl/Dockerfile .
@@ -35,7 +35,7 @@ docker buildx build -t ai-engine:latest -f ./src/tests/tools/simap_ai_engine/ai_ 
# docker buildx build -t traffic-changer:mock -f ./src/tests/tools/traffic_changer/Dockerfile .

# docker buildx build -t traffic-changer:mock -f ./src/tests/tools/traffic_changer/Dockerfile .





echo "Deploying support services..."

echo "Deploying support services..."

docker run --detach --name simap-server --publish 8080:8080 simap-server:mock

docker run --detach --name simap-datastore --publish 8080:8080 simap-datastore:mock

docker run --detach --name nce-fan-ctrl --publish 8081:8080 \

docker run --detach --name nce-fan-ctrl --publish 8081:8080 \

  --env SIMAP_ADDRESS=172.17.0.1 \

  --env SIMAP_ADDRESS=172.17.0.1 \

  --env SIMAP_PORT=8080 \

  --env SIMAP_PORT=8080 \

src/tests/tools/simap_ai_engine/destroy.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
set -euo pipefail

set -euo pipefail





echo "Cleaning up..."

echo "Cleaning up..."

docker rm --force simap-server 2>/dev/null || true

docker rm --force simap-datastore 2>/dev/null || true

docker rm --force nce-fan-ctrl 2>/dev/null || true

docker rm --force nce-fan-ctrl 2>/dev/null || true

docker rm --force nce-t-ctrl 2>/dev/null || true

docker rm --force nce-t-ctrl 2>/dev/null || true

docker rm --force ai-engine 2>/dev/null || true

docker rm --force ai-engine 2>/dev/null || true