openstack/deb-cinder
Code Issues Proposed changes

Fix some pylint error in Coraid Driver

Browse Source 
Chage usage of rpc method in tests, for fixing
3 pylint error.

Change-Id: Ib30d3f1a26b718d2fca588668683253c03df01ba
This commit is contained in:
Nikolay Sobolevskiy
2013-08-19 11:22:37 +04:00
parent 08b6480ca8
commit dbc0fda150
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/tests/test_coraid.py
View File

@@ -374,14 +374,10 @@ class CoraidDriverIntegrationalTestCase(CoraidDriverLoginSuccessTestCase):
self.mox.VerifyAll()
def test_ping_failed(self):
self.mox.StubOutWithMock(self.driver._appliance, 'rpc')
def rpc(handle, url_params, data,
allow_empty_response=True):
def rpc(*args, **kwargs):
raise Exception("Some exception")
self.driver._appliance.rpc = rpc
self.stubs.Set(self.driver._appliance, 'rpc', rpc)
self.mox.ReplayAll()
self.assertRaises(exception.CoraidESMNotAvailable,

9
cinder/volume/drivers/coraid.py
View File

@@ -219,9 +219,7 @@ class CoraidAppliance(object):
reply = self._rest_client.rpc(handle, url_params, data,
allow_empty_response)
if ('state' in reply and
reply['state'] in ESM_SESSION_EXPIRED_STATES and
reply['metaCROp'] == 'reboot'):
if self._is_session_expired(reply):
relogin_attempts -= 1
if relogin_attempts <= 0:
raise exception.CoraidESMReloginFailed()
@@ -230,6 +228,11 @@ class CoraidAppliance(object):
else:
return reply
def _is_session_expired(self, reply):
return ('state' in reply and
reply['state'] in ESM_SESSION_EXPIRED_STATES and
reply['metaCROp'] == 'reboot')
def _is_bad_config_state(self, reply):
return (not reply or
'configState' not in reply or