X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_libjuju.py;h=a789bc8d0e5390307864109ef057f0ed3d98c7c8;hp=27f04545432d95717345e120351bafce44aa5fd6;hb=8331f7ce83ebe7b1c9b2ca25610dfa7fab3a0e64;hpb=bc538e4dc147558118094252f31b762d35392623;ds=inline diff --git a/n2vc/tests/unit/test_libjuju.py b/n2vc/tests/unit/test_libjuju.py index 27f0454..a789bc8 100644 --- a/n2vc/tests/unit/test_libjuju.py +++ b/n2vc/tests/unit/test_libjuju.py @@ -670,9 +670,7 @@ class AddRelationTest(LibjujuTestCase): mock_add_relation.side_effect = JujuAPIError(result) self.loop.run_until_complete( - self.libjuju.add_relation( - "model", "app1", "app2", "relation1", "relation2", - ) + self.libjuju.add_relation("model", "app1:relation1", "app2:relation2",) ) mock_warning.assert_called_with("Relation not found: not found") @@ -696,9 +694,7 @@ class AddRelationTest(LibjujuTestCase): mock_add_relation.side_effect = JujuAPIError(result) self.loop.run_until_complete( - self.libjuju.add_relation( - "model", "app1", "app2", "relation1", "relation2", - ) + self.libjuju.add_relation("model", "app1:relation1", "app2:relation2",) ) mock_warning.assert_called_with("Relation already exists: already exists") @@ -719,9 +715,7 @@ class AddRelationTest(LibjujuTestCase): with self.assertRaises(JujuAPIError): self.loop.run_until_complete( - self.libjuju.add_relation( - "model", "app1", "app2", "relation1", "relation2", - ) + self.libjuju.add_relation("model", "app1:relation1", "app2:relation2",) ) mock_disconnect_controller.assert_called_once() @@ -738,13 +732,31 @@ class AddRelationTest(LibjujuTestCase): mock_get_model.return_value = juju.model.Model() self.loop.run_until_complete( - self.libjuju.add_relation( - "model", "app1", "app2", "relation1", "relation2", - ) + self.libjuju.add_relation("model", "app1:relation1", "app2:relation2",) + ) + + mock_add_relation.assert_called_with( + "app1:relation1", "app2:relation2" + ) + mock_disconnect_controller.assert_called_once() + mock_disconnect_model.assert_called_once() + + def test_saas( + self, + mock_add_relation, + mock_disconnect_controller, + mock_disconnect_model, + mock_get_model, + mock_get_controller, + ): + mock_get_model.return_value = juju.model.Model() + + self.loop.run_until_complete( + self.libjuju.add_relation("model", "app1:relation1", "saas_name",) ) mock_add_relation.assert_called_with( - relation1="app1:relation1", relation2="app2:relation2" + "app1:relation1", "saas_name" ) mock_disconnect_controller.assert_called_once() mock_disconnect_model.assert_called_once()