Replace glance delete image with shade client.

Remove get_image_id function.
Function delete_image now uses shade client.

JIRA: YARDSTICK-892

Change-Id: I6e8510dfa49aa14786ed7ac3382b85c4e699fb9e
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
(cherry picked from commit d6c1b8b7bfd257efd5fe2df30dd450bdb2c57c7d)

2 files changed, 64 insertions, 14 deletions

diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_image.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_image.py
index e382d46fa..8a1d6d695 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_image.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_image.py
@@ -9,21 +9,44 @@
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.delete_image import DeleteImage
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import delete_image
 
 
 class DeleteImageTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.delete_image')
-    @mock.patch('yardstick.common.openstack_utils.get_image_id')
-    @mock.patch('yardstick.common.openstack_utils.get_glance_client')
-    def test_delete_image(self, mock_get_glance_client, mock_image_id, mock_delete_image):
-        options = {
-            'image_name': 'yardstick_test_image_01'
-        }
-        args = {"options": options}
-        obj = DeleteImage(args, {})
-        obj.run({})
-        mock_delete_image.assert_called_once()
-        mock_image_id.assert_called_once()
-        mock_get_glance_client.assert_called_once()
+    def setUp(self):
+        self._mock_delete_image = mock.patch.object(
+            openstack_utils, 'delete_image')
+        self.mock_delete_image = (
+            self._mock_delete_image.start())
+        self._mock_get_shade_client = mock.patch.object(
+            openstack_utils, 'get_shade_client')
+        self.mock_get_shade_client = self._mock_get_shade_client.start()
+        self._mock_log = mock.patch.object(delete_image, 'LOG')
+        self.mock_log = self._mock_log.start()
+        self.args = {'options': {'name_or_id': 'yardstick_image'}}
+        self.result = {}
+
+        self.delimg_obj = delete_image.DeleteImage(self.args, mock.ANY)
+
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_delete_image.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        self.mock_delete_image.return_value = True
+        self.assertIsNone(self.delimg_obj.run(self.result))
+        self.assertEqual({'delete_image': 1}, self.result)
+        self.mock_log.info.assert_called_once_with('Delete image successful!')
+
+    def test_run_fail(self):
+        self.mock_delete_image.return_value = False
+        with self.assertRaises(exceptions.ScenarioDeleteImageError):
+            self.delimg_obj.run(self.result)
+        self.assertEqual({'delete_image': 0}, self.result)
+        self.mock_log.error.assert_called_once_with('Delete image failed!')
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index 9b23c65b8..c9f9129df 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -667,3 +667,30 @@ class CreateImageTestCase(unittest.TestCase):
                                               self.name)
         mock_logger.error.assert_called_once()
         self.assertIsNone(output)
+
+
+class DeleteImageTestCase(unittest.TestCase):
+
+    def test_delete_image(self):
+        self.mock_shade_client = mock.Mock()
+        self.mock_shade_client.delete_image.return_value = True
+        output = openstack_utils.delete_image(self.mock_shade_client,
+                                              'image_name_or_id')
+        self.assertTrue(output)
+
+    def test_delete_image_fail(self):
+        self.mock_shade_client = mock.Mock()
+        self.mock_shade_client.delete_image.return_value = False
+        output = openstack_utils.delete_image(self.mock_shade_client,
+                                              'image_name_or_id')
+        self.assertFalse(output)
+
+    @mock.patch.object(openstack_utils, 'log')
+    def test_delete_image_exception(self, mock_logger):
+        self.mock_shade_client = mock.Mock()
+        self.mock_shade_client.delete_image.side_effect = (
+            exc.OpenStackCloudException('error message'))
+        output = openstack_utils.delete_image(self.mock_shade_client,
+                                              'image_name_or_id')
+        mock_logger.error.assert_called_once()
+        self.assertFalse(output)