From: Ryan Liang <ryan.liang@emc.com>
Date: Tue, 15 Mar 2016 01:39:45 +0000 (+0000)
Subject: Revert "VNX: Set timeout for naviseccli"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a7357df0a4d334ef051b137cfff1622c5190ef6e;p=openstack-build%2Fcinder-build.git

Revert "VNX: Set timeout for naviseccli"

EMC CI test failed.
It is not the fault of adding timeout option to naviseccli.
I made a mistake by adding wrong option format in code.
The command line should be
self.command = (navisecclipath, '-timeout', '120', '-address')
instead of
self.command = (navisecclipath, '-timeout 120', '-address')
Later, I will send out a new review for the right one,
after this is reverted.

This reverts commit 4fe875a199e407970686d6f4159e5f15de0528db.

Change-Id: I5c5003d83370bea0b9e06a3d7adc5a5c2a7e61f3
---

diff --git a/cinder/tests/unit/test_emc_vnx.py b/cinder/tests/unit/test_emc_vnx.py
index a98759b3c..d4f3f2acd 100644
--- 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', '-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):
diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 76f4bbac2..2a247bf50 100644
--- 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, '-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