KVM: allow netboot

[ganeti-local] / lib / utils.py

diff --git a/lib/utils.py b/lib/utils.py
index f1d0f99..2ce3e43 100644 (file)
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -416,7 +416,7 @@ def ReadPidFile(pidfile):
   @type  pidfile: string
   @param pidfile: path to the file containing the pid
   @rtype: int
-  @return: The process id, if the file exista and contains a valid PID,
+  @return: The process id, if the file exists and contains a valid PID,
            otherwise 0
 
   """
@@ -576,7 +576,7 @@ def CheckBEParams(beparams):
           try:
             val = int(val)
           except ValueError, err:
-            raise errors.OpPrereqError("Invalid %s size: %s" % (item, str(err)))
+            raise errors.OpPrereqError("Invalid %s size: %s" % (item, err))
           beparams[item] = val
       if item in (constants.BE_AUTO_BALANCE):
         val = beparams[item]
@@ -1743,6 +1743,27 @@ def TailFile(fname, lines=20):
   return rows[-lines:]
 
 
+def SafeEncode(text):
+  """Return a 'safe' version of a source string.
+
+  This function mangles the input string and returns a version that
+  should be safe to disply/encode as ASCII. To this end, we first
+  convert it to ASCII using the 'backslashreplace' encoding which
+  should get rid of any non-ASCII chars, and then we again encode it
+  via 'string_escape' which converts '\n' into '\\n' so that log
+  messages remain one-line.
+
+  @type text: str or unicode
+  @param text: input data
+  @rtype: str
+  @return: a safe version of text
+
+  """
+  text = text.encode('ascii', 'backslashreplace')
+  text = text.encode('string_escape')
+  return text
+
+
 def LockedMethod(fn):
   """Synchronized object access decorator.