projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update helm repo after adding the repo
[osm/N2VC.git]
/
n2vc
/
tests
/
unit
/
test_k8s_helm3_conn.py
diff --git
a/n2vc/tests/unit/test_k8s_helm3_conn.py
b/n2vc/tests/unit/test_k8s_helm3_conn.py
index
93d0c4c
..
7542fab
100644
(file)
--- a/
n2vc/tests/unit/test_k8s_helm3_conn.py
+++ b/
n2vc/tests/unit/test_k8s_helm3_conn.py
@@
-39,7
+39,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.fs.path = "./tmp/"
self.namespace = "testk8s"
self.cluster_id = "helm3_cluster_id"
self.fs.path = "./tmp/"
self.namespace = "testk8s"
self.cluster_id = "helm3_cluster_id"
- self.cluster_uuid =
"{}:{}".format(self.namespace, self.cluster_id)
+ self.cluster_uuid =
self.cluster_id
# pass fake kubectl and helm commands to make sure it does not call actual commands
K8sHelm3Connector._check_file_exists = asynctest.Mock(return_value=True)
cluster_dir = self.fs.path + self.cluster_id
# pass fake kubectl and helm commands to make sure it does not call actual commands
K8sHelm3Connector._check_file_exists = asynctest.Mock(return_value=True)
cluster_dir = self.fs.path + self.cluster_id
@@
-66,8
+66,8
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.assertEqual(
k8scluster_uuid,
self.assertEqual(
k8scluster_uuid,
-
"{}:{}".format(self.namespace, self.cluster_id)
,
- "Check cluster_uuid
format: <namespace>.<cluster_id>
",
+
self.cluster_id
,
+ "Check cluster_uuid",
)
self.helm_conn._get_namespaces.assert_called_once_with(self.cluster_id)
self.helm_conn._create_namespace.assert_called_once_with(
)
self.helm_conn._get_namespaces.assert_called_once_with(self.cluster_id)
self.helm_conn._create_namespace.assert_called_once_with(
@@
-86,7
+86,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
async def test_repo_add(self):
repo_name = "bitnami"
repo_url = "https://charts.bitnami.com/bitnami"
async def test_repo_add(self):
repo_name = "bitnami"
repo_url = "https://charts.bitnami.com/bitnami"
- self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=(
"", 0
))
+ self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=(
0, ""
))
await self.helm_conn.repo_add(self.cluster_uuid, repo_name, repo_url)
await self.helm_conn.repo_add(self.cluster_uuid, repo_name, repo_url)
@@
-102,30
+102,32
@@
class TestK8sHelm3Conn(asynctest.TestCase):
),
)
),
)
- repo_update_command = "/usr/bin/helm3 repo update"
- repo_add_command = "/usr/bin/helm3 repo add {} {}".format(repo_name, repo_url)
+ repo_update_command = "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo update"
+ repo_add_command = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo add {} {}"
+ ).format(repo_name, repo_url)
calls = self.helm_conn._local_async_exec.call_args_list
call0_kargs = calls[0][1]
self.assertEqual(
call0_kargs.get("command"),
calls = self.helm_conn._local_async_exec.call_args_list
call0_kargs = calls[0][1]
self.assertEqual(
call0_kargs.get("command"),
- repo_
update
_command,
- "Invalid repo
update
command: {}".format(call0_kargs.get("command")),
+ repo_
add
_command,
+ "Invalid repo
add
command: {}".format(call0_kargs.get("command")),
)
self.assertEqual(
call0_kargs.get("env"),
self.env,
)
self.assertEqual(
call0_kargs.get("env"),
self.env,
- "Invalid env for
update
command: {}".format(call0_kargs.get("env")),
+ "Invalid env for
add
command: {}".format(call0_kargs.get("env")),
)
call1_kargs = calls[1][1]
self.assertEqual(
call1_kargs.get("command"),
)
call1_kargs = calls[1][1]
self.assertEqual(
call1_kargs.get("command"),
- repo_
add
_command,
- "Invalid repo
add
command: {}".format(call1_kargs.get("command")),
+ repo_
update
_command,
+ "Invalid repo
update
command: {}".format(call1_kargs.get("command")),
)
self.assertEqual(
call1_kargs.get("env"),
self.env,
)
self.assertEqual(
call1_kargs.get("env"),
self.env,
- "Invalid env for
add
command: {}".format(call1_kargs.get("env")),
+ "Invalid env for
update
command: {}".format(call1_kargs.get("env")),
)
@asynctest.fail_on(active_handles=True)
)
@asynctest.fail_on(active_handles=True)
@@
-139,7
+141,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
- command = "/usr/bin/helm3 repo list --output yaml"
+ command = "
env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config
/usr/bin/helm3 repo list --output yaml"
self.helm_conn._local_async_exec.assert_called_with(
command=command, env=self.env, raise_exception_on_error=False
)
self.helm_conn._local_async_exec.assert_called_with(
command=command, env=self.env, raise_exception_on_error=False
)
@@
-155,7
+157,9
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
- command = "/usr/bin/helm3 repo remove {}".format(repo_name)
+ command = "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo remove {}".format(
+ repo_name
+ )
self.helm_conn._local_async_exec.assert_called_with(
command=command, env=self.env, raise_exception_on_error=True
)
self.helm_conn._local_async_exec.assert_called_with(
command=command, env=self.env, raise_exception_on_error=True
)
@@
-204,7
+208,8
@@
class TestK8sHelm3Conn(asynctest.TestCase):
check_every=0,
)
command = (
check_every=0,
)
command = (
- "/usr/bin/helm3 install stable-openldap-0005399828 --atomic --output yaml "
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 "
+ "install stable-openldap-0005399828 --atomic --output yaml "
"--timeout 300s --namespace testk8s stable/openldap --version 1.2.2"
)
self.helm_conn._local_async_exec.assert_called_once_with(
"--timeout 300s --namespace testk8s stable/openldap --version 1.2.2"
)
self.helm_conn._local_async_exec.assert_called_once_with(
@@
-262,7
+267,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
await self.helm_conn.upgrade(
self.cluster_uuid, kdu_instance, kdu_model, atomic=True, db_dict=db_dict
)
await self.helm_conn.upgrade(
self.cluster_uuid, kdu_instance, kdu_model, atomic=True, db_dict=db_dict
)
- self.helm_conn.fs.sync.assert_called_
once_
with(from_path=self.cluster_id)
+ self.helm_conn.fs.sync.assert_called_with(from_path=self.cluster_id)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
@@
-276,8
+281,9
@@
class TestK8sHelm3Conn(asynctest.TestCase):
check_every=0,
)
command = (
check_every=0,
)
command = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config "
"/usr/bin/helm3 upgrade stable-openldap-0005399828 stable/openldap "
"/usr/bin/helm3 upgrade stable-openldap-0005399828 stable/openldap "
- "--namespace testk8s --atomic --output yaml --timeout 300s
"
+ "--namespace testk8s --atomic --output yaml --timeout 300s "
"--version 1.2.3"
)
self.helm_conn._local_async_exec.assert_called_once_with(
"--version 1.2.3"
)
self.helm_conn._local_async_exec.assert_called_once_with(
@@
-304,7
+310,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
await self.helm_conn.rollback(
self.cluster_uuid, kdu_instance=kdu_instance, revision=1, db_dict=db_dict
)
await self.helm_conn.rollback(
self.cluster_uuid, kdu_instance=kdu_instance, revision=1, db_dict=db_dict
)
- self.helm_conn.fs.sync.assert_called_
once_
with(from_path=self.cluster_id)
+ self.helm_conn.fs.sync.assert_called_with(from_path=self.cluster_id)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
@@
-317,7
+323,10
@@
class TestK8sHelm3Conn(asynctest.TestCase):
run_once=True,
check_every=0,
)
run_once=True,
check_every=0,
)
- command = "/usr/bin/helm3 rollback stable-openldap-0005399828 1 --namespace=testk8s --wait"
+ command = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 "
+ "rollback stable-openldap-0005399828 1 --namespace=testk8s --wait"
+ )
self.helm_conn._local_async_exec.assert_called_once_with(
command=command, env=self.env, raise_exception_on_error=False
)
self.helm_conn._local_async_exec.assert_called_once_with(
command=command, env=self.env, raise_exception_on_error=False
)
@@
-339,13
+348,13
@@
class TestK8sHelm3Conn(asynctest.TestCase):
)
await self.helm_conn.uninstall(self.cluster_uuid, kdu_instance)
)
await self.helm_conn.uninstall(self.cluster_uuid, kdu_instance)
- self.helm_conn.fs.sync.assert_called_
once_
with(from_path=self.cluster_id)
+ self.helm_conn.fs.sync.assert_called_with(from_path=self.cluster_id)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
self.helm_conn.fs.reverse_sync.assert_called_once_with(
from_path=self.cluster_id
)
- command =
"/usr/bin/helm3 uninstall {} --namespace={}".format
(
- kdu_instance, self.namespace
- )
+ command = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 uninstall {} --namespace={}"
+ )
.format(kdu_instance, self.namespace)
self.helm_conn._local_async_exec.assert_called_once_with(
command=command, env=self.env, raise_exception_on_error=True
)
self.helm_conn._local_async_exec.assert_called_once_with(
command=command, env=self.env, raise_exception_on_error=True
)
@@
-368,9
+377,9
@@
class TestK8sHelm3Conn(asynctest.TestCase):
from_path=self.cluster_id
)
self.helm_conn._parse_services.assert_called_once()
from_path=self.cluster_id
)
self.helm_conn._parse_services.assert_called_once()
- command1 =
"/usr/bin/helm3 get manifest {} --namespace=testk8s".format
(
- kdu_instance
- )
+ command1 = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 get manifest {} --namespace=testk8s"
+ )
.format(kdu_instance)
command2 = "/usr/bin/kubectl get --namespace={} -f -".format(self.namespace)
self.helm_conn._local_async_exec_pipe.assert_called_once_with(
command1, command2, env=self.env, raise_exception_on_error=True
command2 = "/usr/bin/kubectl get --namespace={} -f -".format(self.namespace)
self.helm_conn._local_async_exec_pipe.assert_called_once_with(
command1, command2, env=self.env, raise_exception_on_error=True
@@
-471,11
+480,11
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0))
await self.helm_conn._status_kdu(
self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0))
await self.helm_conn._status_kdu(
- self.cluster_id, kdu_instance, self.namespace, return_text=True
- )
- command = "/usr/bin/helm3 status {} --namespace={} --output yaml".format(
- kdu_instance, self.namespace
+ self.cluster_id, kdu_instance, self.namespace, yaml_format=True
)
)
+ command = (
+ "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 status {} --namespace={} --output yaml"
+ ).format(kdu_instance, self.namespace)
self.helm_conn._local_async_exec.assert_called_once_with(
command=command,
env=self.env,
self.helm_conn._local_async_exec.assert_called_once_with(
command=command,
env=self.env,
@@
-514,7
+523,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
cluster_id=self.cluster_id,
kdu_instance=kdu_instance,
namespace=self.namespace,
cluster_id=self.cluster_id,
kdu_instance=kdu_instance,
namespace=self.namespace,
-
return_tex
t=False,
+
yaml_forma
t=False,
)
self.helm_conn.write_app_status_to_db.assert_called_once_with(
db_dict=db_dict,
)
self.helm_conn.write_app_status_to_db.assert_called_once_with(
db_dict=db_dict,
@@
-548,6
+557,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
"updated": "2020-10-30 11:11:20.376744191 +0000 UTC",
}
]
"updated": "2020-10-30 11:11:20.376744191 +0000 UTC",
}
]
+ self.helm_conn._get_namespace = Mock(return_value=self.namespace)
self.helm_conn._uninstall_sw = asynctest.CoroutineMock()
self.helm_conn.instances_list = asynctest.CoroutineMock(return_value=instances)
self.helm_conn.uninstall = asynctest.CoroutineMock()
self.helm_conn._uninstall_sw = asynctest.CoroutineMock()
self.helm_conn.instances_list = asynctest.CoroutineMock(return_value=instances)
self.helm_conn.uninstall = asynctest.CoroutineMock()
@@
-557,6
+567,9
@@
class TestK8sHelm3Conn(asynctest.TestCase):
self.helm_conn.fs.file_delete.assert_called_once_with(
self.cluster_id, ignore_non_exist=True
)
self.helm_conn.fs.file_delete.assert_called_once_with(
self.cluster_id, ignore_non_exist=True
)
+ self.helm_conn._get_namespace.assert_called_once_with(
+ cluster_uuid=self.cluster_uuid
+ )
self.helm_conn.instances_list.assert_called_once_with(
cluster_uuid=self.cluster_uuid
)
self.helm_conn.instances_list.assert_called_once_with(
cluster_uuid=self.cluster_uuid
)
@@
-564,7
+577,7
@@
class TestK8sHelm3Conn(asynctest.TestCase):
cluster_uuid=self.cluster_uuid, kdu_instance=kdu_instance
)
self.helm_conn._uninstall_sw.assert_called_once_with(
cluster_uuid=self.cluster_uuid, kdu_instance=kdu_instance
)
self.helm_conn._uninstall_sw.assert_called_once_with(
-
self.cluster_id,
self.namespace
+
cluster_id=self.cluster_id, namespace=
self.namespace
)
@asynctest.fail_on(active_handles=True)
)
@asynctest.fail_on(active_handles=True)