From dea6d51bd7801dbeea6fbd2305303893521a2d20 Mon Sep 17 00:00:00 2001 From: Matan Sabag Date: Mon, 27 Aug 2018 08:57:27 +0100 Subject: [PATCH] Fixed invalid number of arguments bug in ScaleIO driver Change-Id: I6946f531e2bed4b3f7e4491ca26876dd68fd0fc8 Closes-Bug: #1789174 Signed-off-by: Matan Sabag (cherry picked from commit 13a6689ccb7751c9f9b5c37ce0a3f75eb7665a95) --- cinder/tests/unit/volume/drivers/dell_emc/scaleio/mocks.py | 2 +- cinder/volume/drivers/dell_emc/scaleio/driver.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/dell_emc/scaleio/mocks.py b/cinder/tests/unit/volume/drivers/dell_emc/scaleio/mocks.py index b3f2ea3b1e5..fa77cb3de3b 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/scaleio/mocks.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/scaleio/mocks.py @@ -40,7 +40,7 @@ class ScaleIODriver(driver.ScaleIODriver): def unmanage(self, volume): pass - def _is_volume_creation_safe(self, _pd, _sp, _pt): + def _is_volume_creation_safe(self, _pd, _sp): return True diff --git a/cinder/volume/drivers/dell_emc/scaleio/driver.py b/cinder/volume/drivers/dell_emc/scaleio/driver.py index bc274d0a0dc..281f6e1d41a 100644 --- a/cinder/volume/drivers/dell_emc/scaleio/driver.py +++ b/cinder/volume/drivers/dell_emc/scaleio/driver.py @@ -600,8 +600,7 @@ class ScaleIODriver(driver.VolumeDriver): provisioning = "ThickProvisioned" allowed = self._is_volume_creation_safe(protection_domain_name, - storage_pool_name, - provisioning) + storage_pool_name) if not allowed: # Do not allow thick volume creation on this backend. # Volumes may leak data between tenants.