Ensure async calls are performed
Change-Id: I3f8afe4c7aa4e5ab1e5f2b19edf4c07b5d6a5d64
Signed-off-by: limon <alimonj@indra.es>
(cherry picked from commit 3c443f5899f2cc953b27ed4ac4c5d1a247248c5e)
diff --git a/n2vc/k8s_helm_base_conn.py b/n2vc/k8s_helm_base_conn.py
index d2de810..2a2e935 100644
--- a/n2vc/k8s_helm_base_conn.py
+++ b/n2vc/k8s_helm_base_conn.py
@@ -380,7 +380,7 @@
repo = self._split_repo(kdu_model)
if repo:
- self.repo_update(cluster_id, repo)
+ await self.repo_update(cluster_id, repo)
command = self._get_install_command(
kdu_model,
@@ -490,7 +490,7 @@
repo = self._split_repo(kdu_model)
if repo:
- self.repo_update(cluster_id, repo)
+ await self.repo_update(cluster_id, repo)
command = self._get_upgrade_command(
kdu_model,
@@ -1579,7 +1579,7 @@
name = name + get_random_number()
return name.lower()
- async def _split_repo(self, kdu_model: str) -> str:
+ def _split_repo(self, kdu_model: str) -> str:
repo_name = None
idx = kdu_model.find("/")
if idx >= 0:
diff --git a/n2vc/tests/unit/test_k8s_helm3_conn.py b/n2vc/tests/unit/test_k8s_helm3_conn.py
index e32e56e..cb4a1dc 100644
--- a/n2vc/tests/unit/test_k8s_helm3_conn.py
+++ b/n2vc/tests/unit/test_k8s_helm3_conn.py
@@ -196,9 +196,17 @@
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,
@@ -212,7 +220,7 @@
"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 @@
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,
@@ -284,7 +295,7 @@
"--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
)
diff --git a/n2vc/tests/unit/test_k8s_helm_conn.py b/n2vc/tests/unit/test_k8s_helm_conn.py
index 8a0c1ea..69c8aba 100644
--- a/n2vc/tests/unit/test_k8s_helm_conn.py
+++ b/n2vc/tests/unit/test_k8s_helm_conn.py
@@ -160,9 +160,17 @@
db_dict=db_dict,
)
- 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,
@@ -177,7 +185,7 @@
"--name=stable-openldap-0005399828 --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
)
@@ -203,8 +211,11 @@
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,
@@ -217,7 +228,7 @@
"env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm upgrade "
"--atomic --output yaml --timeout 300 stable-openldap-0005399828 stable/openldap --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
)