- self.helm_conn._k8sclusterhelm.install = asynctest.CoroutineMock(return_value=helm_chart_id)
- self.db.get_one.return_value = {"_admin": {"helm-chart": {"id": "myk8s_id"}}}
- ee_id, _ = await self.helm_conn.create_execution_environment(namespace, db_dict, artifact_path=artifact_path)
- self.assertEqual(ee_id, "{}.{}".format("osm", helm_chart_id),
- "Check ee_id format: <default namespace>.<helm_chart-id>")
- self.helm_conn._k8sclusterhelm.install.assert_called_once_with("myk8s_id",
- kdu_model="/app/storage/helm_sample_charm",
- namespace="osm", db_dict=db_dict,
- params=None, timeout=None)
+ 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, artifact_path=artifact_path, vca_type="helm-v3"
+ )
+ self.assertEqual(
+ ee_id,
+ "{}:{}.{}".format("helm-v3", "osm", helm_chart_id),
+ "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,
+ )