X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Ftests%2Funit%2Ftest_k8s_helm_conn.py;h=907ff404e357291c21ba5289f42dcdfacf45b37d;hp=afc8ca7e345bd3f9e822cd9201975be68f60ea85;hb=b46f88d2ce319c7661dc6064c8c76d020e314fb6;hpb=7bd5c6affb2805caba1b832b56d0ad5712396306 diff --git a/n2vc/tests/unit/test_k8s_helm_conn.py b/n2vc/tests/unit/test_k8s_helm_conn.py index afc8ca7..907ff40 100644 --- a/n2vc/tests/unit/test_k8s_helm_conn.py +++ b/n2vc/tests/unit/test_k8s_helm_conn.py @@ -38,11 +38,11 @@ class TestK8sHelmConn(asynctest.TestCase): self.namespace = "testk8s" self.service_account = "osm" self.cluster_id = "helm_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 K8sHelmConnector._check_file_exists = asynctest.Mock(return_value=True) K8sHelmConnector._local_async_exec = asynctest.CoroutineMock( - return_value=("", 0) + return_value=(0, "") ) cluster_dir = self.fs.path + self.cluster_id self.kube_config = self.fs.path + self.cluster_id + "/.kube/config" @@ -79,7 +79,9 @@ class TestK8sHelmConn(asynctest.TestCase): ), ) - repo_update_command = "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm repo update" + repo_update_command = ( + "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm repo update {}" + ).format(repo_name) repo_add_command = ( "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm repo add {} {}" ).format(repo_name, repo_url) @@ -87,24 +89,24 @@ class TestK8sHelmConn(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) @@ -168,8 +170,6 @@ class TestK8sHelmConn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="install", - run_once=True, - check_every=0, ) command = ( "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm install " @@ -212,8 +212,6 @@ class TestK8sHelmConn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="upgrade", - run_once=True, - check_every=0, ) command = ( "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm upgrade " @@ -223,6 +221,90 @@ class TestK8sHelmConn(asynctest.TestCase): command=command, env=self.env, raise_exception_on_error=False ) + @asynctest.fail_on(active_handles=True) + async def test_scale(self): + kdu_model = "stable/openldap:1.2.3" + kdu_instance = "stable-openldap-0005399828" + db_dict = {} + instance_info = { + "chart": "openldap-1.2.3", + "name": kdu_instance, + "namespace": self.namespace, + "revision": 1, + "status": "DEPLOYED", + } + repo_list = [ + { + "name": "stable", + "url": "https://kubernetes-charts.storage.googleapis.com/", + } + ] + kdu_values = """ + # Default values for openldap. + # This is a YAML-formatted file. + # Declare variables to be passed into your templates. + + replicaCount: 1 + dummy-app: + replicas: 2 + """ + + self.helm_conn.repo_list = asynctest.CoroutineMock(return_value=repo_list) + self.helm_conn.values_kdu = asynctest.CoroutineMock(return_value=kdu_values) + self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) + self.helm_conn._store_status = asynctest.CoroutineMock() + self.helm_conn.get_instance_info = asynctest.CoroutineMock( + return_value=instance_info + ) + + # TEST-1 + await self.helm_conn.scale( + kdu_instance, + 2, + "", + kdu_model=kdu_model, + cluster_uuid=self.cluster_uuid, + atomic=True, + db_dict=db_dict, + ) + command = ( + "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config " + "/usr/bin/helm upgrade --atomic --output yaml --set replicaCount=2 " + "--timeout 1800s stable-openldap-0005399828 stable/openldap " + "--version 1.2.3" + ) + self.helm_conn._local_async_exec.assert_called_once_with( + command=command, env=self.env, raise_exception_on_error=False + ) + + # TEST-2 + await self.helm_conn.scale( + kdu_instance, + 3, + "dummy-app", + kdu_model=kdu_model, + cluster_uuid=self.cluster_uuid, + atomic=True, + db_dict=db_dict, + ) + command = ( + "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config " + "/usr/bin/helm upgrade --atomic --output yaml --set dummy-app.replicas=3 " + "--timeout 1800s stable-openldap-0005399828 stable/openldap " + "--version 1.2.3" + ) + self.helm_conn._local_async_exec.assert_called_with( + command=command, env=self.env, raise_exception_on_error=False + ) + self.helm_conn.fs.reverse_sync.assert_called_with(from_path=self.cluster_id) + self.helm_conn._store_status.assert_called_with( + cluster_id=self.cluster_id, + kdu_instance=kdu_instance, + namespace=self.namespace, + db_dict=db_dict, + operation="scale", + ) + @asynctest.fail_on(active_handles=True) async def test_rollback(self): kdu_instance = "stable-openldap-0005399828" @@ -253,8 +335,6 @@ class TestK8sHelmConn(asynctest.TestCase): namespace=self.namespace, db_dict=db_dict, operation="rollback", - run_once=True, - check_every=0, ) command = ( "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config " @@ -355,9 +435,7 @@ class TestK8sHelmConn(asynctest.TestCase): "https://kubernetes-charts.storage.googleapis.com/ " "--version 1.2.4" ) - self.helm_conn._local_async_exec.assert_called_with( - command=command, encode_utf8=True - ) + self.helm_conn._local_async_exec.assert_called_with(command=command) @asynctest.fail_on(active_handles=True) async def test_help_kdu(self): @@ -372,9 +450,7 @@ class TestK8sHelmConn(asynctest.TestCase): "https://kubernetes-charts.storage.googleapis.com/ " "--version 1.2.4" ) - self.helm_conn._local_async_exec.assert_called_with( - command=command, encode_utf8=True - ) + self.helm_conn._local_async_exec.assert_called_with(command=command) @asynctest.fail_on(active_handles=True) async def test_values_kdu(self): @@ -389,9 +465,22 @@ class TestK8sHelmConn(asynctest.TestCase): "https://kubernetes-charts.storage.googleapis.com/ " "--version 1.2.4" ) - self.helm_conn._local_async_exec.assert_called_with( - command=command, encode_utf8=True + self.helm_conn._local_async_exec.assert_called_with(command=command) + + @asynctest.fail_on(active_handles=True) + async def test_get_values_kdu(self): + self.helm_conn._local_async_exec = asynctest.CoroutineMock(return_value=("", 0)) + + kdu_instance = "stable-openldap-0005399828" + await self.helm_conn.get_values_kdu( + kdu_instance, self.namespace, self.env["KUBECONFIG"] + ) + + command = ( + "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm get values " + "stable-openldap-0005399828 --output yaml" ) + self.helm_conn._local_async_exec.assert_called_with(command=command) @asynctest.fail_on(active_handles=True) async def test_instances_list(self): @@ -413,7 +502,7 @@ class TestK8sHelmConn(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/helm_cluster_id/.kube/config /usr/bin/helm status {} --output yaml" @@ -449,14 +538,12 @@ class TestK8sHelmConn(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, @@ -490,6 +577,7 @@ class TestK8sHelmConn(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() @@ -499,6 +587,9 @@ class TestK8sHelmConn(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 ) @@ -506,7 +597,7 @@ class TestK8sHelmConn(asynctest.TestCase): 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) @@ -541,8 +632,10 @@ class TestK8sHelmConn(asynctest.TestCase): ) call2_kargs = calls[2][1] command_2 = ( - "/usr/bin/kubectl --kubeconfig={} --namespace kube-system delete " - "serviceaccount/{}".format(self.kube_config, self.service_account) + "/usr/bin/kubectl --kubeconfig={} --namespace {} delete " + "serviceaccount/{}".format( + self.kube_config, self.namespace, self.service_account + ) ) self.assertEqual( call2_kargs,