projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10908 pass over upgrade request to Libjuju
[osm/N2VC.git]
/
n2vc
/
k8s_helm_conn.py
diff --git
a/n2vc/k8s_helm_conn.py
b/n2vc/k8s_helm_conn.py
index
444f2da
..
8c526f5
100644
(file)
--- a/
n2vc/k8s_helm_conn.py
+++ b/
n2vc/k8s_helm_conn.py
@@
-20,6
+20,7
@@
# contact with: nfvlabs@tid.es
##
import asyncio
# contact with: nfvlabs@tid.es
##
import asyncio
+from typing import Union
import os
import yaml
import os
import yaml
@@
-464,9
+465,9
@@
class K8sHelmConnector(K8sHelmBaseConnector):
cluster_id: str,
kdu_instance: str,
namespace: str = None,
cluster_id: str,
kdu_instance: str,
namespace: str = None,
+ yaml_format: bool = False,
show_error_log: bool = False,
show_error_log: bool = False,
- return_text: bool = False,
- ):
+ ) -> Union[str, dict]:
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
@@
-486,7
+487,7
@@
class K8sHelmConnector(K8sHelmBaseConnector):
env=env,
)
env=env,
)
- if
return_tex
t:
+ if
yaml_forma
t:
return str(output)
if rc != 0:
return str(output)
if rc != 0:
@@
-544,7
+545,7
@@
class K8sHelmConnector(K8sHelmBaseConnector):
)
status = await self._status_kdu(
)
status = await self._status_kdu(
- cluster_id=cluster_id, kdu_instance=kdu_instance,
return_tex
t=False
+ cluster_id=cluster_id, kdu_instance=kdu_instance,
yaml_forma
t=False
)
# extract info.status.resources-> str
)
# extract info.status.resources-> str