From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 13 May 2015 14:40:50 +0000 (+0000)
Subject: Merge "Removing sleep between when a command is sent and 'YES' is sent"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8c0f5d048c7142df1f8c3d087a63606523219054;p=openstack-build%2Fcinder-build.git

Merge "Removing sleep between when a command is sent and 'YES' is sent"
---

8c0f5d048c7142df1f8c3d087a63606523219054
diff --cc cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
index 266fc3855,14ff95223..705ba1805
--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
+++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
@@@ -430,13 -430,12 +430,12 @@@ class CiscoFCZoneClientCLI(object)
                      attempts -= 1
                      try:
                          stdin, stdout, stderr = ssh.exec_command(command)
-                         greenthread.sleep(random.randint(20, 500) / 100.0)
                          channel = stdout.channel
                          exit_status = channel.recv_exit_status()
 -                        LOG.debug("Exit Status from ssh:%s", exit_status)
 +                        LOG.debug("Exit Status from ssh: %s", exit_status)
                          # exit_status == -1 if no exit code was returned
                          if exit_status != -1:
 -                            LOG.debug('Result was %s' % exit_status)
 +                            LOG.debug('Result was %s', exit_status)
                              if check_exit_code and exit_status != 0:
                                  raise processutils.ProcessExecutionError(
                                      exit_code=exit_status,