commit 4500a5f69e3bb6a66a18b78f4523f49f36dabd2e
author koder aka kdanilov <kdanilov@mirantis.com> Fri Apr 17 16:55:17 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Fri Apr 17 16:55:24 2015 +0300
tree 969029f77eeea424e594a9ffdf95031d777e7040
parent 69339acf1f162d6df50366d3aa60da52182667c8

fixing bugs

ssh_utils.py

diff --git a/ssh_utils.py b/ssh_utils.py
index c4a18e8..aea3111 100644
--- a/ssh_utils.py
+++ b/ssh_utils.py
@@ -133,6 +133,12 @@
             ssh_copy_file(sftp, localfile, remfile, preserve_perm)
 
 
+def delete_file(conn, path):
+    sftp = conn.open_sftp()
+    sftp.remove(path)
+    sftp.close()
+
+
 def copy_paths(conn, paths):
     sftp = conn.open_sftp()
     try:
@@ -231,11 +237,14 @@
 all_sessions = []
 
 
-def run_over_ssh(conn, cmd, stdin_data=None, timeout=60, nolog=False):
+def run_over_ssh(conn, cmd, stdin_data=None, timeout=60, nolog=False, node=None):
     "should be replaces by normal implementation, with select"
     transport = conn.get_transport()
     session = transport.open_session()
 
+    if node is None:
+        node = ""
+
     with all_sessions_lock:
         all_sessions.append(session)
 
@@ -245,7 +254,7 @@
         stime = time.time()
 
         if not nolog:
-            logger.debug("SSH: Exec {1!r}".format(conn, cmd))
+            logger.debug("SSH:{0} Exec {1!r}".format(node, cmd))
 
         session.exec_command(cmd)
 
@@ -273,8 +282,8 @@
         session.close()
 
     if code != 0:
-        templ = "Cmd {0!r} failed with code {1}. Output: {2}"
-        raise OSError(templ.format(cmd, code, output))
+        templ = "SSH:{0} Cmd {1!r} failed with code {2}. Output: {3}"
+        raise OSError(templ.format(node, cmd, code, output))
 
     return output