X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/c30421e0437a2780a05bb85a63959c1d7abfb445..3d836750238cde8c63ceb8d3ae94d5cd2b78cea7:/lib/ssh.py

diff --git a/lib/ssh.py b/lib/ssh.py
index fdecab4..5c11be2 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2006, 2007, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,14 +31,15 @@ import re
 from ganeti import utils
 from ganeti import errors
 from ganeti import constants
+from ganeti import netutils
 
 
 def FormatParamikoFingerprint(fingerprint):
-  """Formats the fingerprint of L{paramiko.PKey.get_fingerprint()}
+  """Format paramiko PKey fingerprint.
 
   @type fingerprint: str
   @param fingerprint: PKey fingerprint
-  @return The string hex representation of the fingerprint
+  @return: The string hex representation of the fingerprint
 
   """
   assert len(fingerprint) % 2 == 0
@@ -105,7 +106,7 @@ class SshRunner:
     @param quiet: whether to enable -q to ssh
 
     @rtype: list
-    @return: the list of options ready to use in L{utils.RunCmd}
+    @return: the list of options ready to use in L{utils.process.RunCmd}
 
     """
     options = [
@@ -193,8 +194,8 @@ class SshRunner:
 
     Args: see SshRunner.BuildCmd.
 
-    @rtype: L{utils.RunResult}
-    @return: the result as from L{utils.RunCmd()}
+    @rtype: L{utils.process.RunResult}
+    @return: the result as from L{utils.process.RunCmd()}
 
     """
     return utils.RunCmd(self.BuildCmd(*args, **kwargs))
@@ -220,13 +221,16 @@ class SshRunner:
     command = [constants.SCP, "-p"]
     command.extend(self._BuildSshOptions(True, False, True, True))
     command.append(filename)
+    if netutils.IP6Address.IsValid(node):
+      node = netutils.FormatAddress((node, None))
+
     command.append("%s:%s" % (node, filename))
 
     result = utils.RunCmd(command)
 
     if result.failed:
-      logging.error("Copy to node %s failed (%s) error %s,"
-                    " command was %s",
+      logging.error("Copy to node %s failed (%s) error '%s',"
+                    " command was '%s'",
                     node, result.fail_reason, result.output, result.cmd)
 
     return not result.failed
@@ -250,7 +254,7 @@ class SshRunner:
         - detail: string with details
 
     """
-    retval = self.Run(node, 'root', 'hostname --fqdn')
+    retval = self.Run(node, "root", "hostname --fqdn", quiet=False)
 
     if retval.failed:
       msg = "ssh problem"