openstack
/
cinder
Code Issues Proposed changes

Merge "Revert "VNX: Set timeout for naviseccli""

This commit is contained in:
Jenkins 2016-03-16 04:03:06 +00:00 committed by Gerrit Code Review
parent fc282f1ca0 a7357df0a4
commit 8936b2dc03
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

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

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

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