Bug 1980 fixed

Added the `yaml_format` argument to the `status_kdu` abstract method of
the class `K8sConnector`, and changed the corresponding Helm connectors
methods accordingly, while maintaining backward compatibility

Change-Id: Ic78c951825b7654ccf8246c4fe1fc4d488221bfc
Signed-off-by: Pedro Escaleira <escaleira@av.it.pt>

diff --git a/n2vc/k8s_conn.py b/n2vc/k8s_conn.py
index a4b98db..ef4f5f2 100644 (file)
--- a/n2vc/k8s_conn.py
+++ b/n2vc/k8s_conn.py
@@ -22,6 +22,7 @@
 
 import abc
 import asyncio
 
 import abc
 import asyncio

+from typing import Union

 import time
 
 from n2vc.loggable import Loggable
 import time
 
 from n2vc.loggable import Loggable


@@ -358,7 +359,9 @@ class K8sConnector(abc.ABC, Loggable):
         """
 
     @abc.abstractmethod
         """
 
     @abc.abstractmethod

-    async def status_kdu(self, cluster_uuid: str, kdu_instance: str) -> str:
+    async def status_kdu(
+        self, cluster_uuid: str, kdu_instance: str, yaml_format: str
+    ) -> Union[str, dict]:

         """
         This call would retrieve tha current state of a given KDU instance. It would be
         would allow to retrieve the _composition_ (i.e. K8s objects) and _specific
         """
         This call would retrieve tha current state of a given KDU instance. It would be
         would allow to retrieve the _composition_ (i.e. K8s objects) and _specific


@@ -367,6 +370,8 @@ class K8sConnector(abc.ABC, Loggable):
 
         :param cluster_uuid: UUID of a K8s cluster known by OSM
         :param kdu_instance: unique name for the KDU instance
 
         :param cluster_uuid: UUID of a K8s cluster known by OSM
         :param kdu_instance: unique name for the KDU instance

+        :param yaml_format: if the return shall be returned as an YAML string or as a
+                                dictionary

         :return: If successful, it will return the following vector of arguments:
         - K8s `namespace` in the cluster where the KDU lives
         - `state` of the KDU instance. It can be:
         :return: If successful, it will return the following vector of arguments:
         - K8s `namespace` in the cluster where the KDU lives
         - `state` of the KDU instance. It can be:

diff --git a/n2vc/k8s_helm3_conn.py b/n2vc/k8s_helm3_conn.py
index 8bfd173..bb08f07 100644 (file)
--- a/n2vc/k8s_helm3_conn.py
+++ b/n2vc/k8s_helm3_conn.py
@@ -19,6 +19,7 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact with: nfvlabs@tid.es
 ##
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact with: nfvlabs@tid.es
 ##

+from typing import Union

 import os
 import yaml
 
 import os
 import yaml
 


@@ -367,9 +368,9 @@ class K8sHelm3Connector(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)


@@ -393,7 +394,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector):
             env=env,
         )
 
             env=env,
         )
 

-        if return_text:
+        if yaml_format:

             return str(output)
 
         if rc != 0:
             return str(output)
 
         if rc != 0:

diff --git a/n2vc/k8s_helm_base_conn.py b/n2vc/k8s_helm_base_conn.py
index b72c986..5079dbe 100644 (file)
--- a/n2vc/k8s_helm_base_conn.py
+++ b/n2vc/k8s_helm_base_conn.py
@@ -21,6 +21,7 @@
 ##
 import abc
 import asyncio
 ##
 import abc
 import asyncio

+from typing import Union

 import random
 import time
 import shlex
 import random
 import time
 import shlex


@@ -999,7 +1000,9 @@ class K8sHelmBaseConnector(K8sConnector):
 
         return service
 
 
         return service
 

-    async def status_kdu(self, cluster_uuid: str, kdu_instance: str, **kwargs) -> str:
+    async def status_kdu(
+        self, cluster_uuid: str, kdu_instance: str, yaml_format: str = False, **kwargs
+    ) -> Union[str, dict]:

         """
         This call would retrieve tha current state of a given KDU instance. It would be
         would allow to retrieve the _composition_ (i.e. K8s objects) and _specific
         """
         This call would retrieve tha current state of a given KDU instance. It would be
         would allow to retrieve the _composition_ (i.e. K8s objects) and _specific


@@ -1009,6 +1012,8 @@ class K8sHelmBaseConnector(K8sConnector):
         :param cluster_uuid: UUID of a K8s cluster known by OSM
         :param kdu_instance: unique name for the KDU instance
         :param kwargs: Additional parameters (None yet)
         :param cluster_uuid: UUID of a K8s cluster known by OSM
         :param kdu_instance: unique name for the KDU instance
         :param kwargs: Additional parameters (None yet)

+        :param yaml_format: if the return shall be returned as an YAML string or as a
+                                dictionary

         :return: If successful, it will return the following vector of arguments:
         - K8s `namespace` in the cluster where the KDU lives
         - `state` of the KDU instance. It can be:
         :return: If successful, it will return the following vector of arguments:
         - K8s `namespace` in the cluster where the KDU lives
         - `state` of the KDU instance. It can be:


@@ -1049,8 +1054,8 @@ class K8sHelmBaseConnector(K8sConnector):
             cluster_id=cluster_uuid,
             kdu_instance=kdu_instance,
             namespace=instance["namespace"],
             cluster_id=cluster_uuid,
             kdu_instance=kdu_instance,
             namespace=instance["namespace"],

+            yaml_format=yaml_format,

             show_error_log=True,
             show_error_log=True,

-            return_text=True,

         )
 
         # sync fs
         )
 
         # sync fs


@@ -1217,9 +1222,9 @@ class K8sHelmBaseConnector(K8sConnector):
         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]:

         """
         Implements the helm version dependent method to obtain status of a helm instance
         """
         """
         Implements the helm version dependent method to obtain status of a helm instance
         """


@@ -1783,8 +1788,8 @@ class K8sHelmBaseConnector(K8sConnector):
                 detailed_status = await self._status_kdu(
                     cluster_id=cluster_id,
                     kdu_instance=kdu_instance,
                 detailed_status = await self._status_kdu(
                     cluster_id=cluster_id,
                     kdu_instance=kdu_instance,

+                    yaml_format=False,

                     namespace=namespace,
                     namespace=namespace,

-                    return_text=False,

                 )
                 status = detailed_status.get("info").get("description")
                 self.log.debug("KDU {} STATUS: {}.".format(kdu_instance, status))
                 )
                 status = detailed_status.get("info").get("description")
                 self.log.debug("KDU {} STATUS: {}.".format(kdu_instance, status))

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_text:
+        if yaml_format:

             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_text=False
+            cluster_id=cluster_id, kdu_instance=kdu_instance, yaml_format=False

         )
 
         # extract info.status.resources-> str
         )
 
         # extract info.status.resources-> str

diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py
index 1e400c2..c27449b 100644 (file)
--- a/n2vc/k8s_juju_conn.py
+++ b/n2vc/k8s_juju_conn.py
@@ -13,6 +13,7 @@
 #     limitations under the License.
 
 import asyncio
 #     limitations under the License.
 
 import asyncio

+from typing import Union

 import os
 import uuid
 import yaml
 import os
 import uuid
 import yaml


@@ -656,7 +657,7 @@ class K8sJujuConnector(K8sConnector):
         complete_status: bool = False,
         yaml_format: bool = False,
         **kwargs,
         complete_status: bool = False,
         yaml_format: bool = False,
         **kwargs,

-    ) -> dict:
+    ) -> Union[str, dict]:

         """Get the status of the KDU
 
         Get the current status of the KDU instance.
         """Get the status of the KDU
 
         Get the current status of the KDU instance.

diff --git a/n2vc/tests/unit/test_k8s_helm3_conn.py b/n2vc/tests/unit/test_k8s_helm3_conn.py
index 9ae5a72..91e1729 100644 (file)
--- a/n2vc/tests/unit/test_k8s_helm3_conn.py
+++ b/n2vc/tests/unit/test_k8s_helm3_conn.py
@@ -574,7 +574,7 @@ 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
+            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"
         )
         command = (
             "env KUBECONFIG=./tmp/helm3_cluster_id/.kube/config /usr/bin/helm3 status {} --namespace={} --output yaml"


@@ -617,7 +617,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_text=False,
+            yaml_format=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,

diff --git a/n2vc/tests/unit/test_k8s_helm_conn.py b/n2vc/tests/unit/test_k8s_helm_conn.py
index a6515f1..736405f 100644 (file)
--- a/n2vc/tests/unit/test_k8s_helm_conn.py
+++ b/n2vc/tests/unit/test_k8s_helm_conn.py
@@ -508,7 +508,7 @@ class TestK8sHelmConn(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
+            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"
         )
         command = (
             "env KUBECONFIG=./tmp/helm_cluster_id/.kube/config /usr/bin/helm status {} --output yaml"


@@ -551,7 +551,7 @@ class TestK8sHelmConn(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_text=False,
+            yaml_format=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,