From e067b0c8d11f8e1c9e0935268ac93a4f2dbe8636 Mon Sep 17 00:00:00 2001
From: "Mytnyk, Volodymyr" <volodymyrx.mytnyk@intel.com>
Date: Thu, 19 Jul 2018 09:04:06 +0100
Subject: kubernetes_utils: avoid 404 error code in
 delete_replication_controller()

JIRA: YARDSTICK-1319

Change-Id: I8370c5ef4e43e58a8bb9c3aac60a089b0981dda0
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
---
 yardstick/benchmark/contexts/kubernetes.py         |  2 +-
 yardstick/common/kubernetes_utils.py               | 13 +++++---
 .../tests/unit/common/test_kubernetes_utils.py     | 36 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)

(limited to 'yardstick')

diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py
index 7534c4ea5..6312973e6 100644
--- a/yardstick/benchmark/contexts/kubernetes.py
+++ b/yardstick/benchmark/contexts/kubernetes.py
@@ -110,7 +110,7 @@ class KubernetesContext(ctx_base.Context):
             self._delete_rc(rc)
 
     def _delete_rc(self, rc):
-        k8s_utils.delete_replication_controller(rc)
+        k8s_utils.delete_replication_controller(rc, skip_codes=[404])
 
     def _delete_pods(self):
         for pod in self.template.pods:
diff --git a/yardstick/common/kubernetes_utils.py b/yardstick/common/kubernetes_utils.py
index c90f73e43..03d38784c 100644
--- a/yardstick/common/kubernetes_utils.py
+++ b/yardstick/common/kubernetes_utils.py
@@ -121,8 +121,10 @@ def create_replication_controller(template,
 def delete_replication_controller(name,
                                   namespace='default',
                                   wait=False,
-                                  **kwargs):    # pragma: no cover
+                                  skip_codes=None,
+                                  **kwargs):
     # pylint: disable=unused-argument
+    skip_codes = [] if not skip_codes else skip_codes
     core_v1_api = get_core_api()
     body = kwargs.get('body', client.V1DeleteOptions())
     kwargs.pop('body', None)
@@ -131,9 +133,12 @@ def delete_replication_controller(name,
                                                              namespace,
                                                              body,
                                                              **kwargs)
-    except ApiException:
-        LOG.exception('Delete replication controller failed')
-        raise
+    except ApiException as e:
+        if e.status in skip_codes:
+            LOG.info(e.reason)
+        else:
+            raise exceptions.KubernetesApiException(
+                action='delete', resource='ReplicationController')
 
 
 def delete_pod(name,
diff --git a/yardstick/tests/unit/common/test_kubernetes_utils.py b/yardstick/tests/unit/common/test_kubernetes_utils.py
index 9dca2700d..28de8ad10 100644
--- a/yardstick/tests/unit/common/test_kubernetes_utils.py
+++ b/yardstick/tests/unit/common/test_kubernetes_utils.py
@@ -311,3 +311,39 @@ class DeleteServiceTestCase(base.BaseUnitTestCase):
 
         mock_get_api.return_value = mock_api
         kubernetes_utils.delete_service(mock.ANY, skip_codes=[404])
+
+
+class DeleteReplicationControllerTestCase(base.BaseUnitTestCase):
+    @mock.patch.object(kubernetes_utils, 'get_core_api')
+    def test_execute_correct(self, mock_get_api):
+        mock_api = mock.Mock()
+        mock_get_api.return_value = mock_api
+        kubernetes_utils.delete_replication_controller(
+            "name", "default", body=None)
+
+        mock_api.delete_namespaced_replication_controller.assert_called_once_with(
+            "name", "default", None)
+
+    @mock.patch.object(kubernetes_utils, 'get_core_api')
+    def test_execute_exception(self, mock_get_api):
+        mock_api = mock.Mock()
+        mock_api.delete_namespaced_replication_controller.side_effect = (
+            rest.ApiException(status=200)
+        )
+
+        mock_get_api.return_value = mock_api
+        with self.assertRaises(exceptions.KubernetesApiException):
+            kubernetes_utils.delete_replication_controller(mock.ANY, skip_codes=[404])
+
+    @mock.patch.object(kubernetes_utils, 'get_core_api')
+    @mock.patch.object(kubernetes_utils, 'LOG')
+    def test_execute_skip_exception(self, mock_log, mock_get_api):
+        mock_api = mock.Mock()
+        mock_api.delete_namespaced_replication_controller.side_effect = (
+            rest.ApiException(status=404)
+        )
+
+        mock_get_api.return_value = mock_api
+        kubernetes_utils.delete_replication_controller(mock.ANY, skip_codes=[404])
+
+        mock_log.info.assert_called_once()
-- 
cgit 1.2.3-korg