Fix bug 1412: Generate kdu instance from LCM

[osm/LCM.git] / osm_lcm / tests / test_lcm_helm_conn.py

diff --git a/osm_lcm/tests/test_lcm_helm_conn.py b/osm_lcm/tests/test_lcm_helm_conn.py
index db9f47d..47838b3 100644 (file)
--- a/osm_lcm/tests/test_lcm_helm_conn.py
+++ b/osm_lcm/tests/test_lcm_helm_conn.py
@@ -67,7 +67,12 @@ class TestLcmHelmConn(asynctest.TestCase):
         db_dict = {}
         artifact_path = "helm_sample_charm"
         helm_chart_id = "helm_sample_charm_0001"
-        self.helm_conn._k8sclusterhelm3.install = asynctest.CoroutineMock(return_value=helm_chart_id)
+        self.helm_conn._k8sclusterhelm3.install = asynctest.CoroutineMock(return_value=None)
+        self.helm_conn._k8sclusterhelm3.generate_kdu_instance_name = Mock()
+        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(namespace,
                                                                      db_dict,
@@ -77,6 +82,7 @@ class TestLcmHelmConn(asynctest.TestCase):
                          "Check ee_id format: <helm-version>:<default namespace>.<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", db_dict=db_dict,
                                                                         params=None, timeout=None)