From f6cca46f6b1aa6134a0e634a3a9e524cdbbfa729 Mon Sep 17 00:00:00 2001
From: Shobhi Jain <shobhi.jain@intel.com>
Date: Tue, 10 Apr 2018 15:17:35 +0100
Subject: Replace cinder detach volume with shade client.

Function detach volume now uses shade client.

JIRA: YARDSTICK-891

Change-Id: Ie437ccf1172cb82dc869963f0d62e31a5ab23ebb
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
---
 .../benchmark/scenarios/lib/test_detach_volume.py  | 53 +++++++++++++++++-----
 1 file changed, 42 insertions(+), 11 deletions(-)

(limited to 'yardstick/tests/unit/benchmark')

diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_detach_volume.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_detach_volume.py
index 9794d2129..2bc57f495 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_detach_volume.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_detach_volume.py
@@ -6,21 +6,52 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+from oslo_utils import uuidutils
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.detach_volume import DetachVolume
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import detach_volume
 
 
 class DetachVolumeTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.detach_volume')
-    def test_detach_volume(self, mock_detach_volume):
-        options = {
-            'server_id': '321-321-321',
-            'volume_id': '123-123-123'
-        }
-        args = {"options": options}
-        obj = DetachVolume(args, {})
-        obj.run({})
-        mock_detach_volume.assert_called_once()
+    def setUp(self):
+        self._mock_detach_volume = mock.patch.object(
+            openstack_utils, 'detach_volume')
+        self.mock_detach_volume = (
+            self._mock_detach_volume.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(detach_volume, 'LOG')
+        self.mock_log = self._mock_log.start()
+        _uuid = uuidutils.generate_uuid()
+        self.args = {'options': {'server_name_or_id':  _uuid,
+                                 'volume_name_or_id': _uuid}}
+        self.result = {}
+
+        self.detachvol_obj = detach_volume.DetachVolume(self.args, mock.ANY)
+
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_detach_volume.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        self.mock_detach_volume.return_value = True
+        self.assertIsNone(self.detachvol_obj.run(self.result))
+        self.assertEqual({'detach_volume': 1}, self.result)
+        self.mock_log.info.assert_called_once_with(
+            'Detach volume from server successful!')
+
+    def test_run_fail(self):
+        self.mock_detach_volume.return_value = False
+        with self.assertRaises(exceptions.ScenarioDetachVolumeError):
+            self.detachvol_obj.run(self.result)
+        self.assertEqual({'detach_volume': 0}, self.result)
+        self.mock_log.error.assert_called_once_with(
+            'Detach volume from server failed!')
-- 
cgit 1.2.3-korg