projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1995 fixed: possibility of defining the K8s namespace for Juju Bundles
[osm/N2VC.git]
/
n2vc
/
tests
/
unit
/
test_k8s_juju_conn.py
diff --git
a/n2vc/tests/unit/test_k8s_juju_conn.py
b/n2vc/tests/unit/test_k8s_juju_conn.py
index
915738e
..
3e35494
100644
(file)
--- a/
n2vc/tests/unit/test_k8s_juju_conn.py
+++ b/
n2vc/tests/unit/test_k8s_juju_conn.py
@@
-67,6
+67,10
@@
class K8sJujuConnTestCase(asynctest.TestCase):
)
logging.disable(logging.CRITICAL)
)
logging.disable(logging.CRITICAL)
+ self.kdu_name = "kdu_name"
+ self.kdu_instance = "{}-{}".format(self.kdu_name, "id")
+ self.default_namespace = self.kdu_instance
+
self.k8s_juju_conn = K8sJujuConnector(
fs=fslocal.FsLocal(),
db=self.db,
self.k8s_juju_conn = K8sJujuConnector(
fs=fslocal.FsLocal(),
db=self.db,
@@
-83,6
+87,9
@@
class K8sJujuConnTestCase(asynctest.TestCase):
self.kubectl.get_services.return_value = [{}]
self.k8s_juju_conn._get_kubectl = Mock()
self.k8s_juju_conn._get_kubectl.return_value = self.kubectl
self.kubectl.get_services.return_value = [{}]
self.k8s_juju_conn._get_kubectl = Mock()
self.k8s_juju_conn._get_kubectl.return_value = self.kubectl
+ self.k8s_juju_conn._obtain_namespace_from_db = Mock(
+ return_value=self.default_namespace
+ )
class InitEnvTest(K8sJujuConnTestCase):
class InitEnvTest(K8sJujuConnTestCase):
@@
-203,9
+210,7
@@
class InstallTest(K8sJujuConnTestCase):
self.local_bundle = "bundle"
self.cs_bundle = "cs:bundle"
self.http_bundle = "https://example.com/bundle.yaml"
self.local_bundle = "bundle"
self.cs_bundle = "cs:bundle"
self.http_bundle = "https://example.com/bundle.yaml"
- self.kdu_name = "kdu_name"
self.cluster_uuid = "cluster"
self.cluster_uuid = "cluster"
- self.kdu_instance = "{}-{}".format(self.kdu_name, "id")
self.k8s_juju_conn.libjuju.add_model = AsyncMock()
self.k8s_juju_conn.libjuju.deploy = AsyncMock()
self.k8s_juju_conn.libjuju.add_model = AsyncMock()
self.k8s_juju_conn.libjuju.deploy = AsyncMock()
@@
-225,7
+230,7
@@
class InstallTest(K8sJujuConnTestCase):
self.k8s_juju_conn.libjuju.add_model.assert_called_once()
self.k8s_juju_conn.libjuju.deploy.assert_called_once_with(
"local:{}".format(self.local_bundle),
self.k8s_juju_conn.libjuju.add_model.assert_called_once()
self.k8s_juju_conn.libjuju.deploy.assert_called_once_with(
"local:{}".format(self.local_bundle),
- model_name=self.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-245,7
+250,7
@@
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,
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.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-265,7
+270,7
@@
class InstallTest(K8sJujuConnTestCase):
self.k8s_juju_conn.libjuju.add_model.assert_called_once()
self.k8s_juju_conn.libjuju.deploy.assert_called_once_with(
self.http_bundle,
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.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-284,7
+289,7
@@
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,
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.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-323,7
+328,7
@@
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,
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.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-361,7
+366,7
@@
class InstallTest(K8sJujuConnTestCase):
self.k8s_juju_conn.libjuju.add_model.assert_called_once()
self.k8s_juju_conn.libjuju.deploy.assert_called_once_with(
"local:{}".format(self.local_bundle),
self.k8s_juju_conn.libjuju.add_model.assert_called_once()
self.k8s_juju_conn.libjuju.deploy.assert_called_once_with(
"local:{}".format(self.local_bundle),
- model_name=self.
kdu_instan
ce,
+ model_name=self.
default_namespa
ce,
wait=True,
timeout=1800,
)
wait=True,
timeout=1800,
)
@@
-395,7
+400,6
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
super(ExecPrimitivesTest, self).setUp()
self.action_name = "touch"
self.application_name = "myapp"
super(ExecPrimitivesTest, self).setUp()
self.action_name = "touch"
self.application_name = "myapp"
- self.model_name = "model"
self.k8s_juju_conn.libjuju.get_actions = AsyncMock()
self.k8s_juju_conn.libjuju.execute_action = AsyncMock()
self.k8s_juju_conn.libjuju.get_actions = AsyncMock()
self.k8s_juju_conn.libjuju.execute_action = AsyncMock()
@@
-409,16
+413,22
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, self.action_name, params=params
+ "cluster", self.
kdu_instanc
e, self.action_name, params=params
)
)
self.assertEqual(output, "success")
)
)
self.assertEqual(output, "success")
+ self.k8s_juju_conn._obtain_namespace_from_db.assert_called_once_with(
+ kdu_instance=self.kdu_instance
+ )
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
-
self.application_name, self.model_nam
e
+
application_name=self.application_name, model_name=self.default_namespac
e
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
- self.application_name, self.model_name, self.action_name, **params
+ application_name=self.application_name,
+ model_name=self.default_namespace,
+ action_name=self.action_name,
+ **params
)
def test_exception(self):
)
def test_exception(self):
@@
-430,16
+440,22
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
with self.assertRaises(Exception):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
with self.assertRaises(Exception):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, self.action_name, params=params
+ "cluster", self.
kdu_instanc
e, self.action_name, params=params
)
)
self.assertIsNone(output)
)
)
self.assertIsNone(output)
+ self.k8s_juju_conn._obtain_namespace_from_db.assert_called_once_with(
+ kdu_instance=self.kdu_instance
+ )
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
-
self.application_name, self.model_nam
e
+
application_name=self.application_name, model_name=self.default_namespac
e
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
- self.application_name, self.model_name, self.action_name, **params
+ application_name=self.application_name,
+ model_name=self.default_namespace,
+ action_name=self.action_name,
+ **params
)
def test_missing_application_name_in_params(self):
)
def test_missing_application_name_in_params(self):
@@
-449,7
+465,7
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, self.action_name, params=params
+ "cluster", self.
kdu_instanc
e, self.action_name, params=params
)
)
)
)
@@
-462,7
+478,7
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, self.action_name
+ "cluster", self.
kdu_instanc
e, self.action_name
)
)
)
)
@@
-481,13
+497,16
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, "non-existing-action", params=params
+ "cluster", self.
kdu_instanc
e, "non-existing-action", params=params
)
)
self.assertIsNone(output)
)
)
self.assertIsNone(output)
+ self.k8s_juju_conn._obtain_namespace_from_db.assert_called_once_with(
+ kdu_instance=self.kdu_instance
+ )
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
-
self.application_name, self.model_nam
e
+
application_name=self.application_name, model_name=self.default_namespac
e
)
self.k8s_juju_conn.libjuju.execute_action.assert_not_called()
)
self.k8s_juju_conn.libjuju.execute_action.assert_not_called()
@@
-499,16
+518,22
@@
class ExecPrimitivesTest(K8sJujuConnTestCase):
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
with self.assertRaises(K8sException):
output = self.loop.run_until_complete(
self.k8s_juju_conn.exec_primitive(
- "cluster", self.
model_nam
e, self.action_name, params=params
+ "cluster", self.
kdu_instanc
e, self.action_name, params=params
)
)
self.assertIsNone(output)
)
)
self.assertIsNone(output)
+ self.k8s_juju_conn._obtain_namespace_from_db.assert_called_once_with(
+ kdu_instance=self.kdu_instance
+ )
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
self.k8s_juju_conn.libjuju.get_actions.assert_called_once_with(
-
self.application_name, self.model_nam
e
+
application_name=self.application_name, model_name=self.default_namespac
e
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
)
self.k8s_juju_conn.libjuju.execute_action.assert_called_once_with(
- self.application_name, self.model_name, self.action_name, **params
+ application_name=self.application_name,
+ model_name=self.default_namespace,
+ action_name=self.action_name,
+ **params
)
)
@@
-647,8
+672,6
@@
class UpdateVcaStatusTest(K8sJujuConnTestCase):
def setUp(self):
super(UpdateVcaStatusTest, self).setUp()
self.vcaStatus = {"model": {"applications": {"app": {"actions": {}}}}}
def setUp(self):
super(UpdateVcaStatusTest, self).setUp()
self.vcaStatus = {"model": {"applications": {"app": {"actions": {}}}}}
- self.kdu_name = "kdu_name"
- self.kdu_instance = "{}-{}".format(self.kdu_name, "id")
self.k8s_juju_conn.libjuju.get_executed_actions = AsyncMock()
self.k8s_juju_conn.libjuju.get_actions = AsyncMock()
self.k8s_juju_conn.libjuju.get_application_configs = AsyncMock()
self.k8s_juju_conn.libjuju.get_executed_actions = AsyncMock()
self.k8s_juju_conn.libjuju.get_actions = AsyncMock()
self.k8s_juju_conn.libjuju.get_application_configs = AsyncMock()