From: Gabriel Cuba <gcuba@whitestack.com>
Date: Sat, 3 Jun 2023 00:27:43 +0000 (-0500)
Subject: Adapt prometheus template to use EE dedicated namespace
X-Git-Tag: release-v14.0-start
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=697e9bde6fa8e77f517d249b8a8b40d292c17da1;p=osm%2FLCM.git

Adapt prometheus template to use EE dedicated namespace

Change-Id: I6b436202f5d1862acd132eebfa36abfabe9379cc
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>
---

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 999aee6..7a73326 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -7713,10 +7713,11 @@ class NsLcm(LcmBase):
                         f"Timeout waiting KDU with name={kdu_name} and index={kdu_index} to be intantiated"
                     )
 
-        # TODO get_service
         if ee_id is not None:
-            _, _, service = ee_id.partition(".")  # remove prefix   "namespace."
-            host_name = "{}-{}".format(service, ee_config_descriptor["metric-service"])
+            _, namespace, helm_id = get_ee_id_parts(
+                ee_id
+            )  # get namespace and EE gRPC service name
+            host_name = f'{helm_id}-{ee_config_descriptor["metric-service"]}.{namespace}.svc'  # svc_name.namespace.svc
             host_port = "80"
             vnfr_id = vnfr_id.replace("-", "")
             variables = {