From 5e3207816b31fad96c9976c5cf637469c723c2d7 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 7 Oct 2024 17:35:06 +0000
Subject: [PATCH] Multiple CI/CD fixes
---
src/analytics/frontend/tests/test_frontend.py | 2 +-
src/kpi_manager/.gitlab-ci.yml | 1 +
src/kpi_manager/tests/test_kpi_db.py | 22 -------------------
src/kpi_manager/tests/test_kpi_manager.py | 7 ------
src/nbi/service/__main__.py | 6 +++--
5 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/src/analytics/frontend/tests/test_frontend.py b/src/analytics/frontend/tests/test_frontend.py
index 58bee3cd2..48ab4dac5 100644
--- a/src/analytics/frontend/tests/test_frontend.py
+++ b/src/analytics/frontend/tests/test_frontend.py
@@ -103,7 +103,7 @@ def test_StartAnalyzers(analyticsFrontend_client):
LOGGER.debug(str(added_analyzer_id))
LOGGER.info(' --> Calling StartResponseListener... ')
class_obj = AnalyticsFrontendServiceServicerImpl()
- response = class_obj.StartResponseListener(added_analyzer_id.analyzer_id._uuid)
+ response = class_obj.StartResponseListener(added_analyzer_id.analyzer_id.uuid)
LOGGER.debug(response)
LOGGER.info("waiting for timer to comlete ...")
time.sleep(3)
diff --git a/src/kpi_manager/.gitlab-ci.yml b/src/kpi_manager/.gitlab-ci.yml
index 498cfd89f..47c866b4a 100644
--- a/src/kpi_manager/.gitlab-ci.yml
+++ b/src/kpi_manager/.gitlab-ci.yml
@@ -83,6 +83,7 @@ unit_test kpi-manager:
- docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script:
+ - docker rm -f $IMAGE_NAME crdb
- docker volume rm -f crdb
- docker network rm teraflowbridge
- docker volume prune --force
diff --git a/src/kpi_manager/tests/test_kpi_db.py b/src/kpi_manager/tests/test_kpi_db.py
index 44c6df6a9..b731ba385 100644
--- a/src/kpi_manager/tests/test_kpi_db.py
+++ b/src/kpi_manager/tests/test_kpi_db.py
@@ -14,11 +14,8 @@
import logging
-#from common.proto.kpi_manager_pb2 import KpiDescriptorList
-#from .test_messages import create_kpi_filter_request
from kpi_manager.database.KpiDB import KpiDB
from kpi_manager.database.KpiModel import Kpi as KpiModel
-# from common.tools.database.GenericDatabase import Database
LOGGER = logging.getLogger(__name__)
@@ -30,22 +27,3 @@ def test_verify_databases_and_Tables():
kpiDBobj.create_database()
kpiDBobj.create_tables()
kpiDBobj.verify_tables()
-
-# def test_generic_DB_select_method():
-# LOGGER.info("--> STARTED-test_generic_DB_select_method")
-# kpi_obj = KpiDB()
-# _filter = create_kpi_filter_request()
-# # response = KpiDescriptorList()
-# try:
-# kpi_obj.select_with_filter(KpiModel, _filter)
-# except Exception as e:
-# LOGGER.error('Unable to apply filter on kpi descriptor. {:}'.format(e))
-# LOGGER.info("--> FINISHED-test_generic_DB_select_method")
-# # try:
-# # for row in rows:
-# # kpiDescriptor_obj = KpiModel.convert_row_to_KpiDescriptor(row)
-# # response.kpi_descriptor_list.append(kpiDescriptor_obj)
-# # return response
-# # except Exception as e:
-# # LOGGER.info('Unable to process filter response {:}'.format(e))
-# # assert isinstance(r)
diff --git a/src/kpi_manager/tests/test_kpi_manager.py b/src/kpi_manager/tests/test_kpi_manager.py
index 06e836b70..3d046ea2c 100755
--- a/src/kpi_manager/tests/test_kpi_manager.py
+++ b/src/kpi_manager/tests/test_kpi_manager.py
@@ -138,10 +138,3 @@ def test_SelectKpiDescriptor(kpi_manager_client):
response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request())
LOGGER.info("Response gRPC message object: {:}".format(response))
assert isinstance(response, KpiDescriptorList)
-
-# def test_set_list_of_KPIs(kpi_manager_client):
-# LOGGER.debug(" >>> test_set_list_of_KPIs: START <<< ")
-# KPIs_TO_SEARCH = ["node_in_power_total", "node_in_current_total", "node_out_power_total"]
-# # adding KPI
-# for kpi in KPIs_TO_SEARCH:
-# kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request_a(kpi))
diff --git a/src/nbi/service/__main__.py b/src/nbi/service/__main__.py
index 8f4ef87e0..ddbf7bb8f 100644
--- a/src/nbi/service/__main__.py
+++ b/src/nbi/service/__main__.py
@@ -49,8 +49,10 @@ def main():
wait_for_environment_variables([
get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_HOST ),
get_env_var_name(ServiceNameEnum.CONTEXT, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
- get_env_var_name(ServiceNameEnum.SLICE, ENVVAR_SUFIX_SERVICE_HOST ),
- get_env_var_name(ServiceNameEnum.SLICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
+ get_env_var_name(ServiceNameEnum.DEVICE, ENVVAR_SUFIX_SERVICE_HOST ),
+ get_env_var_name(ServiceNameEnum.DEVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
+ get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_HOST ),
+ get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
])
signal.signal(signal.SIGINT, signal_handler)
--
GitLab