X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Ftests%2Ftest_lcm_helm_conn.py;h=051fff855dbea20dfaf40332b3584eb8a243acf1;hb=b6049d378301d13e0ddaadb8433b8ad20f4f8a23;hp=2ea9ae86ed5c2a9aba10514e8843113a554d5fac;hpb=a27dc53c6acd967ea17f0d720a82b23a8404cbfa;p=osm%2FLCM.git

diff --git a/osm_lcm/tests/test_lcm_helm_conn.py b/osm_lcm/tests/test_lcm_helm_conn.py
index 2ea9ae8..051fff8 100644
--- a/osm_lcm/tests/test_lcm_helm_conn.py
+++ b/osm_lcm/tests/test_lcm_helm_conn.py
@@ -51,14 +51,11 @@ class TestLcmHelmConn(asynctest.TestCase):
             "helm3path": "/usr/local/bin/helm3",
             "kubectlpath": "/usr/bin/kubectl",
         }
-        lcm_helm_conn.K8sHelmConnector = asynctest.Mock(lcm_helm_conn.K8sHelmConnector)
         lcm_helm_conn.K8sHelm3Connector = asynctest.Mock(
             lcm_helm_conn.K8sHelm3Connector
         )
         vca_config = VcaConfig(vca_config)
-        self.helm_conn = LCMHelmConn(
-            loop=self.loop, vca_config=vca_config, log=self.logger
-        )
+        self.helm_conn = LCMHelmConn(vca_config=vca_config, log=self.logger)
 
     @asynctest.fail_on(active_handles=True)
     async def test_create_execution_environment(self):
@@ -74,10 +71,6 @@ class TestLcmHelmConn(asynctest.TestCase):
         self.helm_conn._k8sclusterhelm3.generate_kdu_instance_name.return_value = (
             helm_chart_id
         )
-        self.helm_conn._k8sclusterhelm2.generate_kdu_instance_name = Mock()
-        self.helm_conn._k8sclusterhelm2.generate_kdu_instance_name.return_value = (
-            helm_chart_id
-        )
 
         self.db.get_one.return_value = {"_admin": {"helm-chart-v3": {"id": "myk8s_id"}}}
         ee_id, _ = await self.helm_conn.create_execution_environment(
@@ -89,14 +82,14 @@ class TestLcmHelmConn(asynctest.TestCase):
         )
         self.assertEqual(
             ee_id,
-            "{}:{}.{}".format("helm-v3", "osm", helm_chart_id),
-            "Check ee_id format: <helm-version>:<default namespace>.<helm_chart-id>",
+            "{}:{}.{}".format("helm-v3", namespace, helm_chart_id),
+            "Check ee_id format: <helm-version>:<NS ID>.<helm_chart-id>",
         )
         self.helm_conn._k8sclusterhelm3.install.assert_called_once_with(
             "myk8s_id",
             kdu_model="/helm_sample_charm",
             kdu_instance=helm_chart_id,
-            namespace="osm",
+            namespace=namespace,
             db_dict=db_dict,
             params=None,
             timeout=None,