From 12d224a1e03dbe38c41a8a55820ef7730b4cb96d Mon Sep 17 00:00:00 2001
From: Waleed Akbar <wakbar@cttc.es>
Date: Thu, 25 Jul 2024 09:56:52 +0000
Subject: [PATCH] cleanup for merge

---
 manifests/kpi_value_apiservice.yaml    |  2 +-
 manifests/kpi_value_writerservice.yaml |  2 +-
 src/kpi_manager/service/__main__.py    | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/manifests/kpi_value_apiservice.yaml b/manifests/kpi_value_apiservice.yaml
index eb53a2383..1a5dfc265 100644
--- a/manifests/kpi_value_apiservice.yaml
+++ b/manifests/kpi_value_apiservice.yaml
@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: server
-          image: labs.etsi.org:5050/tfs/controller/kpi_manager:latest
+          image: labs.etsi.org:5050/tfs/controller/kpi_value_api:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 30020
diff --git a/manifests/kpi_value_writerservice.yaml b/manifests/kpi_value_writerservice.yaml
index 19cab536f..9bd5da943 100644
--- a/manifests/kpi_value_writerservice.yaml
+++ b/manifests/kpi_value_writerservice.yaml
@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: server
-          image: labs.etsi.org:5050/tfs/controller/kpi_manager:latest
+          image: labs.etsi.org:5050/tfs/controller/kpi_value_writer:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 30030
diff --git a/src/kpi_manager/service/__main__.py b/src/kpi_manager/service/__main__.py
index a4884c545..244d5afa3 100644
--- a/src/kpi_manager/service/__main__.py
+++ b/src/kpi_manager/service/__main__.py
@@ -12,14 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging, signal, sys, threading, time
-from prometheus_client import start_http_server
-from common.Constants import ServiceNameEnum
-from common.Settings import (
-    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,
-    wait_for_environment_variables)
-from common.proto import monitoring_pb2
-from .NameMapping import NameMapping          # import updated
+import logging, signal, sys, threading
+from common.Settings import get_log_level
 from .KpiManagerService import KpiManagerService
 
 terminate = threading.Event()
-- 
GitLab