X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_k8s_helm3_conn.py;h=cb4a1dcf1270e18d4e013f20b54bbb84f5cff53f;hb=6d6707771792dd1a917b32c77b40920760aa0a08;hp=c7eefbf4684e9b229a700eb2cf0f8825cb6ed126;hpb=25a1392579da2e8e4789e0b8f35abbaa372fde08;p=osm%2FN2VC.git diff --git a/n2vc/tests/unit/test_k8s_helm3_conn.py b/n2vc/tests/unit/test_k8s_helm3_conn.py index c7eefbf..cb4a1dc 100644 --- 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.cluster_uuid = self.cluster_id + self.cluster_uuid = "{}:{}".format(self.namespace, 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.cluster_id, - "Check cluster_uuid", + "{}:{}".format(self.namespace, self.cluster_id), + "Check cluster_uuid format: .", ) 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" - 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) @@ -102,7 +102,9 @@ class TestK8sHelm3Conn(asynctest.TestCase): ), ) - repo_update_command = "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo update" + repo_update_command = ( + "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo update {}" + ).format(repo_name) repo_add_command = ( "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 repo add {} {}" ).format(repo_name, repo_url) @@ -110,24 +112,24 @@ class TestK8sHelm3Conn(asynctest.TestCase): 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, - "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"), - 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, - "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) @@ -194,9 +196,17 @@ class TestK8sHelm3Conn(asynctest.TestCase): self.helm_conn._create_namespace.assert_called_once_with( self.cluster_id, self.namespace ) - self.helm_conn.fs.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 + self.helm_conn.fs.sync.assert_has_calls( + [ + asynctest.call(from_path=self.cluster_id), + asynctest.call(from_path=self.cluster_id), + ] + ) + self.helm_conn.fs.reverse_sync.assert_has_calls( + [ + asynctest.call(from_path=self.cluster_id), + asynctest.call(from_path=self.cluster_id), + ] ) self.helm_conn._store_status.assert_called_with( cluster_id=self.cluster_id, @@ -204,15 +214,13 @@ class TestK8sHelm3Conn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="install", - run_once=True, - check_every=0, ) command = ( "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( + self.helm_conn._local_async_exec.assert_called_with( command=command, env=self.env, raise_exception_on_error=False ) @@ -268,8 +276,11 @@ class TestK8sHelm3Conn(asynctest.TestCase): self.cluster_uuid, kdu_instance, kdu_model, atomic=True, db_dict=db_dict ) 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_has_calls( + [ + asynctest.call(from_path=self.cluster_id), + asynctest.call(from_path=self.cluster_id), + ] ) self.helm_conn._store_status.assert_called_with( cluster_id=self.cluster_id, @@ -277,8 +288,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="upgrade", - run_once=True, - check_every=0, ) command = ( "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config " @@ -286,7 +295,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): "--namespace testk8s --atomic --output yaml --timeout 300s " "--version 1.2.3" ) - self.helm_conn._local_async_exec.assert_called_once_with( + self.helm_conn._local_async_exec.assert_called_with( command=command, env=self.env, raise_exception_on_error=False ) @@ -320,8 +329,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="rollback", - run_once=True, - check_every=0, ) command = ( "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 " @@ -480,7 +487,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): 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 + 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" @@ -516,14 +523,12 @@ class TestK8sHelm3Conn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="install", - run_once=True, - check_every=0, ) self.helm_conn._status_kdu.assert_called_once_with( cluster_id=self.cluster_id, kdu_instance=kdu_instance, namespace=self.namespace, - return_text=False, + yaml_format=False, ) self.helm_conn.write_app_status_to_db.assert_called_once_with( db_dict=db_dict, @@ -557,7 +562,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): "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() @@ -567,9 +571,6 @@ class TestK8sHelm3Conn(asynctest.TestCase): 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 ) @@ -577,7 +578,7 @@ class TestK8sHelm3Conn(asynctest.TestCase): cluster_uuid=self.cluster_uuid, kdu_instance=kdu_instance ) self.helm_conn._uninstall_sw.assert_called_once_with( - cluster_id=self.cluster_id, namespace=self.namespace + self.cluster_id, self.namespace ) @asynctest.fail_on(active_handles=True)