openstack
/
cinder
Code Issues Proposed changes

VNX: Set timeout for naviseccli 

Add -timeout option to all naviseccli commands,
the value is 120 sec.

Change-Id: Ib3b35da6766b5db69395b89debd50c54d69eec00
Closes-Bug: 1546412
This commit is contained in:
Ryan LIANG 2016-02-03 00:40:03 -08:00
parent 58ecfaac88
commit 4fe875a199
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_emc_vnx.py
View File

@ -5492,9 +5492,9 @@ class EMCVNXCLIDriverFCTestCase(DriverTestCaseBase):
class EMCVNXCLIToggleSPTestData(object):
def FAKE_COMMAND_PREFIX(self, sp_address):
return ('/opt/Navisphere/bin/naviseccli', '-address', sp_address,
'-user', 'sysadmin', '-password', 'sysadmin',
'-scope', 'global')
return ('/opt/Navisphere/bin/naviseccli', '-timeout 120',
'-address', sp_address, '-user', 'sysadmin',
'-password', 'sysadmin', '-scope', 'global')
class EMCVNXCLIToggleSPTestCase(test.TestCase):

2
cinder/volume/drivers/emc/emc_vnx_cli.py
View File

@ -688,7 +688,7 @@ class CommandLineHelper(object):
LOG.error(err_msg)
raise exception.VolumeBackendAPIException(data=err_msg)
self.command = (navisecclipath, '-address')
self.command = (navisecclipath, '-timeout 120', '-address')
self.active_storage_ip = configuration.san_ip
self.primary_storage_ip = self.active_storage_ip
self.secondary_storage_ip = configuration.san_secondary_ip