From eaaccf135fd2035b9e28300fd411862370f1d3ef Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 19 May 2023 11:23:03 +0000
Subject: [PATCH] Pre-merge organization and cleanup
---
manifests/pathcompservice.yaml | 2 +-
manifests/serviceservice.yaml | 2 +-
my_deploy.sh | 4 ++--
.../tests/test_service_recompute_cons.sh | 20 +++++++++++++++++++
test_service_recompute_cons.sh | 7 -------
5 files changed, 24 insertions(+), 11 deletions(-)
create mode 100644 src/service/tests/test_service_recompute_cons.sh
delete mode 100644 test_service_recompute_cons.sh
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index f10178700..3ba12750b 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:10020"]
diff --git a/manifests/serviceservice.yaml b/manifests/serviceservice.yaml
index 3865fd6c0..7d7bdaa4e 100644
--- a/manifests/serviceservice.yaml
+++ b/manifests/serviceservice.yaml
@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "DEBUG"
+ value: "INFO"
readinessProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:3030"]
diff --git a/my_deploy.sh b/my_deploy.sh
index 1ffbffa15..e3ad5e71a 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -78,7 +78,7 @@ export CRDB_DATABASE="tfs"
export CRDB_DEPLOY_MODE="single"
# Disable flag for dropping database, if it exists.
-export CRDB_DROP_DATABASE_IF_EXISTS="YES"
+export CRDB_DROP_DATABASE_IF_EXISTS=""
# Disable flag for re-deploying CockroachDB from scratch.
export CRDB_REDEPLOY=""
@@ -126,7 +126,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis"
export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"
# Disable flag for dropping tables if they exist.
-export QDB_DROP_TABLES_IF_EXIST="YES"
+export QDB_DROP_TABLES_IF_EXIST=""
# Disable flag for re-deploying QuestDB from scratch.
export QDB_REDEPLOY=""
diff --git a/src/service/tests/test_service_recompute_cons.sh b/src/service/tests/test_service_recompute_cons.sh
new file mode 100644
index 000000000..e5bc18895
--- /dev/null
+++ b/src/service/tests/test_service_recompute_cons.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source my_deploy.sh
+./deploy/all.sh
+
+source tfs_runtime_env_vars.sh
+PYTHONPATH=./src pytest --log-level=INFO --verbose src/service/tests/test_unitary_recompute_conns.py
diff --git a/test_service_recompute_cons.sh b/test_service_recompute_cons.sh
deleted file mode 100644
index aee82aaf4..000000000
--- a/test_service_recompute_cons.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-source my_deploy.sh
-./deploy/all.sh
-
-source tfs_runtime_env_vars.sh
-PYTHONPATH=./src pytest --log-level=INFO --verbose src/service/tests/test_unitary_recompute_conns.py
--
GitLab