X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_k8s_juju_conn.py;h=e0faaf0405c231d7e563fb74d5efa5a0b8b43f0e;hp=ead7b5324ae75ea4b0688c5aba9c02ec08eb7735;hb=HEAD;hpb=085942e581b846f59ac6cb94b0e6ff72663d86e2 diff --git a/n2vc/tests/unit/test_k8s_juju_conn.py b/n2vc/tests/unit/test_k8s_juju_conn.py index ead7b53..1de1288 100644 --- a/n2vc/tests/unit/test_k8s_juju_conn.py +++ b/n2vc/tests/unit/test_k8s_juju_conn.py @@ -72,7 +72,6 @@ class K8sJujuConnTestCase(asynctest.TestCase): fs=fslocal.FsLocal(), db=self.db, log=None, - loop=self.loop, on_update_db=None, ) self.k8s_juju_conn._store.get_vca_id.return_value = None @@ -227,6 +226,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 +236,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 +249,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 +272,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 +294,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 +339,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 +382,7 @@ class InstallTest(K8sJujuConnTestCase): model_name=self.default_namespace, wait=True, timeout=1800, + instantiation_params=None, )