openstack/cinder
Code Issues Proposed changes

Fixes the EQL driver CI tests AttributeError

Browse Source 
Moved the ssh object back to a 'with' Block to
fix the AttributeError thrown by the GeneralContextManager
in the Eqlx CI tests

Fixed the unit tests to mock the enter and exit methods
instead

Change-Id: I629d20e815fb7da3df90dfeee76abc1c60daeefe
Closes-Bug: #1417772
This commit is contained in:
rajinir 2015-02-03 15:38:13 -06:00
parent aa1d3754b1
commit f5f2ccea52
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/test_eqlx.py
View File

@ -341,8 +341,10 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
password="test",
min_size=1,
max_size=1)
self.mock_object(sshpool.item(), 'close')
self.driver.sshpool = mock.Mock(return_value=sshpool)
ssh = mock.Mock(paramiko.SSHClient)
self.driver.sshpool.item().__enter__ = mock.Mock(return_value=ssh)
self.driver.sshpool.item().__exit__ = mock.Mock(return_value=False)
# now call the execute
self.assertRaises(exception.VolumeBackendAPIException,
self.driver._eql_execute, "fake command")
@ -363,8 +365,10 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
password="test",
min_size=1,
max_size=1)
self.mock_object(sshpool.item(), 'close')
self.driver.sshpool = mock.Mock(return_value=sshpool)
ssh = mock.Mock(paramiko.SSHClient)
self.driver.sshpool.item().__enter__ = mock.Mock(return_value=ssh)
self.driver.sshpool.item().__exit__ = mock.Mock(return_value=False)
# mocks for _ssh_execute and _get_output
self.mock_object(self.driver, '_get_output',
mock.Mock(side_effect=exception.

37
cinder/volume/drivers/eqlx.py
View File

@ -211,25 +211,24 @@ class DellEQLSanISCSIDriver(SanISCSIDriver):
max_size=max_size)
try:
total_attempts = attempts
ssh = self.sshpool.item()
while attempts > 0:
attempts -= 1
try:
LOG.info(_LI('EQL-driver: executing "%s".'), command)
return self._ssh_execute(
ssh, command,
timeout=self.configuration.eqlx_cli_timeout)
except processutils.ProcessExecutionError:
raise
except Exception as e:
LOG.exception(e)
greenthread.sleep(random.randint(20, 500) / 100.0)
msg = (_("SSH Command failed after '%(total_attempts)r' "
"attempts : '%(command)s'") %
{'total_attempts': total_attempts - attempts,
'command': command})
ssh.close()
raise exception.VolumeBackendAPIException(data=msg)
with self.sshpool.item() as ssh:
while attempts > 0:
attempts -= 1
try:
LOG.info(_LI('EQL-driver: executing "%s".'), command)
return self._ssh_execute(
ssh, command,
timeout=self.configuration.eqlx_cli_timeout)
except processutils.ProcessExecutionError:
raise
except Exception as e:
LOG.exception(e)
greenthread.sleep(random.randint(20, 500) / 100.0)
msg = (_("SSH Command failed after '%(total_attempts)r' "
"attempts : '%(command)s'") %
{'total_attempts': total_attempts - attempts,
'command': command})
raise exception.VolumeBackendAPIException(data=msg)
except Exception:
with excutils.save_and_reraise_exception():