From 5315d5068c6250ccf71c1aa67e7e0109a0718f2a Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 4 Feb 2011 13:07:17 -0600
Subject: Fixes for Vish & Devin's feedback

---
 nova/utils.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 5f5225289..100e26f70 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -152,6 +152,41 @@ def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
     return result
 
 
+def ssh_execute(ssh, cmd, process_input=None,
+                addl_env=None, check_exit_code=True):
+    LOG.debug(_("Running cmd (SSH): %s"), cmd)
+    if addl_env:
+        raise exception.Error("Environment not supported over SSH")
+
+    if process_input:
+        # This is (probably) fixable if we need it...
+        raise exception.Error("process_input not supported over SSH")
+
+    stdin_stream, stdout_stream, stderr_stream = ssh.exec_command(cmd)
+    channel = stdout_stream.channel
+
+    #stdin.write('process_input would go here')
+    #stdin.flush()
+
+    # NOTE(justinsb): This seems suspicious...
+    # ...other SSH clients have buffering issues with this approach
+    stdout = stdout_stream.read()
+    stderr = stderr_stream.read()
+    stdin_stream.close()
+
+    exit_status = channel.recv_exit_status()
+
+    # exit_status == -1 if no exit code was returned
+    if exit_status != -1:
+        LOG.debug(_("Result was %s") % exit_status)
+        if check_exit_code and exit_status != 0:
+            raise exception.ProcessExecutionError(exit_code=exit_status,
+                                                  stdout=stdout,
+                                                  stderr=stderr,
+                                                  cmd=cmd)
+
+    return (stdout, stderr)
+
 def abspath(s):
     return os.path.join(os.path.dirname(__file__), s)
 
-- 
cgit 


From d4b4fa93e7603d73eb99c8edb0e648ff047cda30 Mon Sep 17 00:00:00 2001
From: SuperStack <superstack@superstack.org>
Date: Wed, 9 Feb 2011 11:18:48 -0800
Subject: Fix PEP8 violations

---
 nova/utils.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 100e26f70..8d7ff1f64 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -187,6 +187,7 @@ def ssh_execute(ssh, cmd, process_input=None,
 
     return (stdout, stderr)
 
+
 def abspath(s):
     return os.path.join(os.path.dirname(__file__), s)
 
-- 
cgit