Merge "Revert "VNX: Set timeout for naviseccli""
This commit is contained in:
commit
8936b2dc03
@ -5716,9 +5716,9 @@ class EMCVNXCLIDriverFCTestCase(DriverTestCaseBase):
|
|||||||
|
|
||||||
class EMCVNXCLIToggleSPTestData(object):
|
class EMCVNXCLIToggleSPTestData(object):
|
||||||
def FAKE_COMMAND_PREFIX(self, sp_address):
|
def FAKE_COMMAND_PREFIX(self, sp_address):
|
||||||
return ('/opt/Navisphere/bin/naviseccli', '-timeout 120',
|
return ('/opt/Navisphere/bin/naviseccli', '-address', sp_address,
|
||||||
'-address', sp_address, '-user', 'sysadmin',
|
'-user', 'sysadmin', '-password', 'sysadmin',
|
||||||
'-password', 'sysadmin', '-scope', 'global')
|
'-scope', 'global')
|
||||||
|
|
||||||
|
|
||||||
class EMCVNXCLIToggleSPTestCase(test.TestCase):
|
class EMCVNXCLIToggleSPTestCase(test.TestCase):
|
||||||
|
@ -699,7 +699,7 @@ class CommandLineHelper(object):
|
|||||||
LOG.error(err_msg)
|
LOG.error(err_msg)
|
||||||
raise exception.VolumeBackendAPIException(data=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.active_storage_ip = configuration.san_ip
|
||||||
self.primary_storage_ip = self.active_storage_ip
|
self.primary_storage_ip = self.active_storage_ip
|
||||||
self.secondary_storage_ip = configuration.san_secondary_ip
|
self.secondary_storage_ip = configuration.san_secondary_ip
|
||||||
|
Loading…
Reference in New Issue
Block a user