From 1bf0a697eca8bfdcb6072b88694ac75fdeadcfee Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Mon, 9 Aug 2021 15:06:58 +0200
Subject: [PATCH] Solve integration test bugs
---
manifests/contextservice.yaml | 4 ++--
manifests/deviceservice.yaml | 4 ++--
src/common/database/engines/redis/RedisDatabaseEngine.py | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index fb8b85a31..1e4d1a6f7 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -15,13 +15,13 @@ spec:
containers:
- name: server
image: context:latest
- imagePullPolicy: Never
+ imagePullPolicy: IfNotPresent
ports:
- containerPort: 1010
env:
- name: DB_ENGINE
value: "redis"
- - name: REDISDB_DATABASE_ID
+ - name: REDIS_DATABASE_ID
value: "0"
- name: LOG_LEVEL
value: "DEBUG"
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 4c344cd37..4b9908425 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -15,13 +15,13 @@ spec:
containers:
- name: server
image: device:latest
- imagePullPolicy: Never
+ imagePullPolicy: IfNotPresent
ports:
- containerPort: 2020
env:
- name: DB_ENGINE
value: "redis"
- - name: REDISDB_DATABASE_ID
+ - name: REDIS_DATABASE_ID
value: "0"
- name: LOG_LEVEL
value: "DEBUG"
diff --git a/src/common/database/engines/redis/RedisDatabaseEngine.py b/src/common/database/engines/redis/RedisDatabaseEngine.py
index b8bad8398..e87777968 100644
--- a/src/common/database/engines/redis/RedisDatabaseEngine.py
+++ b/src/common/database/engines/redis/RedisDatabaseEngine.py
@@ -13,9 +13,9 @@ def get_setting(settings, name):
class RedisDatabaseEngine(_DatabaseEngine):
def __init__(self, **settings) -> None:
- host = get_setting(settings, 'REDISDB_SERVICE_HOST')
- port = get_setting(settings, 'REDISDB_SERVICE_PORT')
- dbid = get_setting(settings, 'REDISDB_DATABASE_ID')
+ host = get_setting(settings, 'REDIS_SERVICE_HOST')
+ port = get_setting(settings, 'REDIS_SERVICE_PORT')
+ dbid = get_setting(settings, 'REDIS_DATABASE_ID')
self._client = Redis.from_url('redis://{host}:{port}/{dbid}'.format(host=host, port=port, dbid=dbid))
self._mutex = Mutex(self._client)
--
GitLab