X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_k8s_juju_conn.py;fp=n2vc%2Ftests%2Funit%2Ftest_k8s_juju_conn.py;h=1cc0809ba8835ab80a1a27120c5c7d1c4b7ce62a;hp=ead7b5324ae75ea4b0688c5aba9c02ec08eb7735;hb=fedf9150c2041deb65fc54944e9be245e4b6fd21;hpb=2b2dc52b95660e3b4a5564914aa1f490d88a2b9f diff --git a/n2vc/tests/unit/test_k8s_juju_conn.py b/n2vc/tests/unit/test_k8s_juju_conn.py index ead7b53..1cc0809 100644 --- a/n2vc/tests/unit/test_k8s_juju_conn.py +++ b/n2vc/tests/unit/test_k8s_juju_conn.py @@ -227,6 +227,7 @@ class InstallTest(K8sJujuConnTestCase): kdu_name=self.kdu_name, db_dict=self.db_dict, timeout=1800, + params=None, ) ) self.assertEqual(mock_chdir.call_count, 2) @@ -236,6 +237,7 @@ class InstallTest(K8sJujuConnTestCase): model_name=self.default_namespace, wait=True, timeout=1800, + instantiation_params=None, ) def test_success_cs(self, mock_chdir): @@ -248,14 +250,20 @@ class InstallTest(K8sJujuConnTestCase): kdu_name=self.kdu_name, db_dict=self.db_dict, timeout=1800, + params={}, ) ) self.k8s_juju_conn.libjuju.add_model.assert_called_once() self.k8s_juju_conn.libjuju.deploy.assert_called_once_with( - self.cs_bundle, model_name=self.default_namespace, wait=True, timeout=1800 + self.cs_bundle, + model_name=self.default_namespace, + wait=True, + timeout=1800, + instantiation_params=None, ) def test_success_http(self, mock_chdir): + params = {"overlay": {"applications": {"squid": {"scale": 2}}}} self.loop.run_until_complete( self.k8s_juju_conn.install( self.cluster_uuid, @@ -265,14 +273,20 @@ class InstallTest(K8sJujuConnTestCase): kdu_name=self.kdu_name, db_dict=self.db_dict, timeout=1800, + params=params, ) ) self.k8s_juju_conn.libjuju.add_model.assert_called_once() self.k8s_juju_conn.libjuju.deploy.assert_called_once_with( - self.http_bundle, model_name=self.default_namespace, wait=True, timeout=1800 + self.http_bundle, + model_name=self.default_namespace, + wait=True, + timeout=1800, + instantiation_params=params.get("overlay"), ) def test_success_not_kdu_name(self, mock_chdir): + params = {"some_key": {"applications": {"squid": {"scale": 2}}}} self.loop.run_until_complete( self.k8s_juju_conn.install( self.cluster_uuid, @@ -281,11 +295,16 @@ class InstallTest(K8sJujuConnTestCase): atomic=True, db_dict=self.db_dict, timeout=1800, + params=params, ) ) self.k8s_juju_conn.libjuju.add_model.assert_called_once() self.k8s_juju_conn.libjuju.deploy.assert_called_once_with( - self.cs_bundle, model_name=self.default_namespace, wait=True, timeout=1800 + self.cs_bundle, + model_name=self.default_namespace, + wait=True, + timeout=1800, + instantiation_params=None, ) def test_missing_db_dict(self, mock_chdir): @@ -321,7 +340,11 @@ class InstallTest(K8sJujuConnTestCase): ) self.k8s_juju_conn.libjuju.add_model.assert_called_once() self.k8s_juju_conn.libjuju.deploy.assert_called_once_with( - self.cs_bundle, model_name=self.default_namespace, wait=True, timeout=1800 + self.cs_bundle, + model_name=self.default_namespace, + wait=True, + timeout=1800, + instantiation_params=None, ) def test_missing_bundle(self, mock_chdir): @@ -360,6 +383,7 @@ class InstallTest(K8sJujuConnTestCase): model_name=self.default_namespace, wait=True, timeout=1800, + instantiation_params=None, )