openstack/cinder
Code Issues Proposed changes

Pass default executor to os-brick

Browse Source 
os-brick uses processutils.execute in the current version by default. It
will priv_rootwrap.execute in the new version if nothing will be passed.
So we don't need to pass anything to os-brick explicitly.

Change-Id: I489193c18ae6603f0bc750c7b63e1dd0b4a71e28
This commit is contained in:
Ivan Kolodyazhny
2016-05-04 21:28:07 +03:00
parent 696ca898e9
commit 6425d9a323
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/test_utils.py
View File

@@ -806,8 +806,7 @@ class BrickUtils(test.TestCase):
self.assertEqual(mock_factory.return_value, output)
mock_factory.assert_called_once_with(
'protocol', mock_helper.return_value, driver=None,
execute=putils.execute, use_multipath=False,
device_scan_attempts=3)
use_multipath=False, device_scan_attempts=3)
class StringLengthTestCase(test.TestCase):

2
cinder/utils.py
View File

@@ -534,7 +534,6 @@ def brick_get_connector_properties(multipath=False, enforce_multipath=False):
def brick_get_connector(protocol, driver=None,
execute=processutils.execute,
use_multipath=False,
device_scan_attempts=3,
*args, **kwargs):
@@ -547,7 +546,6 @@ def brick_get_connector(protocol, driver=None,
root_helper = get_root_helper()
return connector.InitiatorConnector.factory(protocol, root_helper,
driver=driver,
execute=execute,
use_multipath=use_multipath,
device_scan_attempts=
device_scan_attempts,