VNX: Set timeout for naviseccli

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

Change-Id: Ib3b35da6766b5db69395b89debd50c54d69eec00
Closes-Bug: 1546412

diff --git a/cinder/tests/unit/test_emc_vnx.py b/cinder/tests/unit/test_emc_vnx.py
index d4f3f2acde820b45cba647a2118efb0fc4f8f878..a98759b3c15c3b084de0eae4dc6c2d5ccbdac145 100644 (file)
--- a/cinder/tests/unit/test_emc_vnx.py
+++ b/cinder/tests/unit/test_emc_vnx.py
@@ -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):

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 2a247bf508c1a695d7f589db82c3664bdc81cc93..76f4bbac2da20688ec7a8b3f4698be1cf26e2fdf 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -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