From 6c03b0d60387b93f121424a386968e8e220cbabe Mon Sep 17 00:00:00 2001
From: Ken Fujimoto <fujimoto@valinux.co.jp>
Date: Wed, 11 Sep 2024 08:18:00 +0000
Subject: [PATCH] Fix helm release check in V2 API

If an error such as a N/W error occurs when checking the release
of helm in V2 API, it is assumed that the release does not exist.
This patch fixes helm release check to throw an exception for
errors other than a non-existent release.

Closes-Bug: #2082874
Change-Id: I3cbb267ec492057a930d574db38db3ec320c28a8
---
 .../infra_drivers/kubernetes/helm_utils.py    |  9 ++-
 .../kubernetes/test_helm_utils.py             | 68 +++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 tacker/tests/unit/sol_refactored/infra_drivers/kubernetes/test_helm_utils.py

diff --git a/tacker/sol_refactored/infra_drivers/kubernetes/helm_utils.py b/tacker/sol_refactored/infra_drivers/kubernetes/helm_utils.py
index 05b841f30..a2590f7aa 100644
--- a/tacker/sol_refactored/infra_drivers/kubernetes/helm_utils.py
+++ b/tacker/sol_refactored/infra_drivers/kubernetes/helm_utils.py
@@ -23,6 +23,7 @@ from tacker.sol_refactored.common import exceptions as sol_ex
 LOG = logging.getLogger(__name__)
 
 HELM_INSTALL_TIMEOUT = "120s"
+RELEASE_NOT_FOUND_MSG = 'Error: release: not found'
 
 
 class HelmClient():
@@ -51,7 +52,13 @@ class HelmClient():
         helm_command = ["helm", "status", release_name, "--namespace",
                         namespace]
         result = self._execute_command(helm_command, False)
-        return result.returncode == 0
+
+        if result.returncode == 0:
+            return True
+        elif RELEASE_NOT_FOUND_MSG in result.stderr:
+            return False
+        else:
+            raise sol_ex.HelmOperationFailed(sol_detail=str(result))
 
     def install(self, release_name, chart_name, namespace, parameters):
         # execute helm install command
diff --git a/tacker/tests/unit/sol_refactored/infra_drivers/kubernetes/test_helm_utils.py b/tacker/tests/unit/sol_refactored/infra_drivers/kubernetes/test_helm_utils.py
new file mode 100644
index 000000000..d1d543af8
--- /dev/null
+++ b/tacker/tests/unit/sol_refactored/infra_drivers/kubernetes/test_helm_utils.py
@@ -0,0 +1,68 @@
+# Copyright (C) 2024 Nippon Telegraph and Telephone Corporation
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from unittest import mock
+
+from tacker.sol_refactored.common import exceptions as sol_ex
+from tacker.sol_refactored.infra_drivers.kubernetes import helm_utils
+from tacker.tests.unit import base
+
+
+RELEASE_NAME = "vnf0e222bb1a81b45f5ba51fef83559caf6"
+NAMESPACE = "default"
+
+
+class FakeCompletedProcess(object):
+
+    def __init__(self, returncode, stdout, stderr):
+        self.returncode = returncode
+        self.stdout = stdout
+        self.stderr = stderr
+
+
+class TestHelmClient(base.TestCase):
+
+    def setUp(self):
+        super(TestHelmClient, self).setUp()
+        self.driver = helm_utils.HelmClient(mock.Mock())
+
+    @mock.patch.object(helm_utils.HelmClient, '_execute_command')
+    def test_is_release_exist(self, mock_execute_command):
+
+        mock_execute_command.return_value = FakeCompletedProcess(
+            0, 'Unit Test', '')
+
+        # run is_release_exist
+        self.assertTrue(self.driver.is_release_exist(RELEASE_NAME, NAMESPACE))
+
+    @mock.patch.object(helm_utils.HelmClient, '_execute_command')
+    def test_is_release_exist_release_not_found(self, mock_execute_command):
+
+        mock_execute_command.return_value = FakeCompletedProcess(
+            1, '', 'Error: release: not found\n')
+
+        # run is_release_exist
+        self.assertFalse(self.driver.is_release_exist(RELEASE_NAME, NAMESPACE))
+
+    @mock.patch.object(helm_utils.HelmClient, '_execute_command')
+    def test_is_release_exist_other_error(self, mock_execute_command):
+
+        mock_execute_command.return_value = FakeCompletedProcess(
+            1, '', 'Error: Kubernetes cluster unreachable\n')
+
+        # run is_release_exist
+        self.assertRaises(
+            sol_ex.HelmOperationFailed,
+            self.driver.is_release_exist, RELEASE_NAME, NAMESPACE)