import os
import logging
+import re
from ganeti import utils
from ganeti import errors
from ganeti import constants
+from ganeti import netutils
+
+
+def FormatParamikoFingerprint(fingerprint):
+ """Format paramiko PKey fingerprint.
+
+ @type fingerprint: str
+ @param fingerprint: PKey fingerprint
+ @return: The string hex representation of the fingerprint
+
+ """
+ assert len(fingerprint) % 2 == 0
+ return ":".join(re.findall(r"..", fingerprint.lower()))
def GetUserFiles(user, mkdir=False):
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 node.startswith(remotehostname + "."):
msg = "hostname not FQDN"
else:
- msg = "hostname mistmatch"
+ msg = "hostname mismatch"
return False, ("%s: expected %s but got %s" %
(msg, node, remotehostname))