From: Avishay Traeger <avishay@il.ibm.com>
Date: Wed, 23 Jan 2013 11:55:51 +0000 (+0200)
Subject: Don't require importing paramiko for error.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cb417e2be13d061d123b448eaed7c1e4c18d6748;p=openstack-build%2Fcinder-build.git

Don't require importing paramiko for error.

The _run_ssh function raises a paramiko exception, which requires
functions that use it to import the paramiko class. This should be
hidden away, and so I created a new exception in its place. Nobody
but the Storwize/SVC driver use it anyway, and I am updating that
driver in a separate patch.

Change-Id: Ibf353edc664765897a5fa7a08d126de4b8992863
---

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index 9315b1641..69818c2b1 100644
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -21,7 +21,6 @@ The unique thing about a SAN is that we don't expect that we can run the volume
 controller on the SAN hardware.  We expect to access it over SSH or some API.
 """
 
-import paramiko
 import random
 
 from eventlet import greenthread
@@ -112,6 +111,7 @@ class SanISCSIDriver(ISCSIDriver):
                                          privatekey=FLAGS.san_private_key,
                                          min_size=FLAGS.ssh_min_pool_conn,
                                          max_size=FLAGS.ssh_max_pool_conn)
+        last_exception = None
         try:
             total_attempts = attempts
             with self.sshpool.item() as ssh:
@@ -124,12 +124,23 @@ class SanISCSIDriver(ISCSIDriver):
                             check_exit_code=check_exit_code)
                     except Exception as e:
                         LOG.error(e)
+                        last_exception = e
                         greenthread.sleep(random.randint(20, 500) / 100.0)
-                raise paramiko.SSHException(_("SSH Command failed after "
-                                              "'%(total_attempts)r' attempts"
-                                              ": '%(command)s'"), locals())
+                try:
+                    raise exception.ProcessExecutionError(
+                            exit_code=last_exception.exit_code,
+                            stdout=last_exception.stdout,
+                            stderr=last_exception.stderr,
+                            cmd=last_exception.cmd)
+                except AttributeError:
+                    raise exception.ProcessExecutionError(
+                            exit_code=-1,
+                            stdout="",
+                            stderr="Error running SSH command",
+                            cmd=command)
+
         except Exception as e:
-            LOG.error(_("Error running ssh command: %s") % command)
+            LOG.error(_("Error running SSH command: %s") % command)
             raise e
 
     def ensure_export(self, context, volume):