Locking related fixes for networks
[ganeti-local] / test / ganeti.utils_unittest.py
index c1cb0b6..343e029 100755 (executable)
@@ -21,7 +21,6 @@
 
 """Script for unittesting the utils module"""
 
-import distutils.version
 import errno
 import fcntl
 import glob
@@ -32,12 +31,10 @@ import shutil
 import signal
 import socket
 import stat
-import string
 import tempfile
 import time
 import unittest
 import warnings
-import OpenSSL
 import random
 import operator
 
@@ -48,521 +45,7 @@ from ganeti import utils
 from ganeti import errors
 from ganeti.utils import RunCmd, \
      FirstFree, \
-     RunParts, \
-     SetEtcHostsEntry, RemoveEtcHostsEntry
-
-
-class TestIsProcessAlive(unittest.TestCase):
-  """Testing case for IsProcessAlive"""
-
-  def testExists(self):
-    mypid = os.getpid()
-    self.assert_(utils.IsProcessAlive(mypid), "can't find myself running")
-
-  def testNotExisting(self):
-    pid_non_existing = os.fork()
-    if pid_non_existing == 0:
-      os._exit(0)
-    elif pid_non_existing < 0:
-      raise SystemError("can't fork")
-    os.waitpid(pid_non_existing, 0)
-    self.assertFalse(utils.IsProcessAlive(pid_non_existing),
-                     "nonexisting process detected")
-
-
-class TestGetProcStatusPath(unittest.TestCase):
-  def test(self):
-    self.assert_("/1234/" in utils._GetProcStatusPath(1234))
-    self.assertNotEqual(utils._GetProcStatusPath(1),
-                        utils._GetProcStatusPath(2))
-
-
-class TestIsProcessHandlingSignal(unittest.TestCase):
-  def setUp(self):
-    self.tmpdir = tempfile.mkdtemp()
-
-  def tearDown(self):
-    shutil.rmtree(self.tmpdir)
-
-  def testParseSigsetT(self):
-    self.assertEqual(len(utils._ParseSigsetT("0")), 0)
-    self.assertEqual(utils._ParseSigsetT("1"), set([1]))
-    self.assertEqual(utils._ParseSigsetT("1000a"), set([2, 4, 17]))
-    self.assertEqual(utils._ParseSigsetT("810002"), set([2, 17, 24, ]))
-    self.assertEqual(utils._ParseSigsetT("0000000180000202"),
-                     set([2, 10, 32, 33]))
-    self.assertEqual(utils._ParseSigsetT("0000000180000002"),
-                     set([2, 32, 33]))
-    self.assertEqual(utils._ParseSigsetT("0000000188000002"),
-                     set([2, 28, 32, 33]))
-    self.assertEqual(utils._ParseSigsetT("000000004b813efb"),
-                     set([1, 2, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 17,
-                          24, 25, 26, 28, 31]))
-    self.assertEqual(utils._ParseSigsetT("ffffff"), set(range(1, 25)))
-
-  def testGetProcStatusField(self):
-    for field in ["SigCgt", "Name", "FDSize"]:
-      for value in ["", "0", "cat", "  1234 KB"]:
-        pstatus = "\n".join([
-          "VmPeak: 999 kB",
-          "%s: %s" % (field, value),
-          "TracerPid: 0",
-          ])
-        result = utils._GetProcStatusField(pstatus, field)
-        self.assertEqual(result, value.strip())
-
-  def test(self):
-    sp = utils.PathJoin(self.tmpdir, "status")
-
-    utils.WriteFile(sp, data="\n".join([
-      "Name:   bash",
-      "State:  S (sleeping)",
-      "SleepAVG:       98%",
-      "Pid:    22250",
-      "PPid:   10858",
-      "TracerPid:      0",
-      "SigBlk: 0000000000010000",
-      "SigIgn: 0000000000384004",
-      "SigCgt: 000000004b813efb",
-      "CapEff: 0000000000000000",
-      ]))
-
-    self.assert_(utils.IsProcessHandlingSignal(1234, 10, status_path=sp))
-
-  def testNoSigCgt(self):
-    sp = utils.PathJoin(self.tmpdir, "status")
-
-    utils.WriteFile(sp, data="\n".join([
-      "Name:   bash",
-      ]))
-
-    self.assertRaises(RuntimeError, utils.IsProcessHandlingSignal,
-                      1234, 10, status_path=sp)
-
-  def testNoSuchFile(self):
-    sp = utils.PathJoin(self.tmpdir, "notexist")
-
-    self.assertFalse(utils.IsProcessHandlingSignal(1234, 10, status_path=sp))
-
-  @staticmethod
-  def _TestRealProcess():
-    signal.signal(signal.SIGUSR1, signal.SIG_DFL)
-    if utils.IsProcessHandlingSignal(os.getpid(), signal.SIGUSR1):
-      raise Exception("SIGUSR1 is handled when it should not be")
-
-    signal.signal(signal.SIGUSR1, lambda signum, frame: None)
-    if not utils.IsProcessHandlingSignal(os.getpid(), signal.SIGUSR1):
-      raise Exception("SIGUSR1 is not handled when it should be")
-
-    signal.signal(signal.SIGUSR1, signal.SIG_IGN)
-    if utils.IsProcessHandlingSignal(os.getpid(), signal.SIGUSR1):
-      raise Exception("SIGUSR1 is not handled when it should be")
-
-    signal.signal(signal.SIGUSR1, signal.SIG_DFL)
-    if utils.IsProcessHandlingSignal(os.getpid(), signal.SIGUSR1):
-      raise Exception("SIGUSR1 is handled when it should not be")
-
-    return True
-
-  def testRealProcess(self):
-    self.assert_(utils.RunInSeparateProcess(self._TestRealProcess))
-
-
-class TestRunCmd(testutils.GanetiTestCase):
-  """Testing case for the RunCmd function"""
-
-  def setUp(self):
-    testutils.GanetiTestCase.setUp(self)
-    self.magic = time.ctime() + " ganeti test"
-    self.fname = self._CreateTempFile()
-    self.fifo_tmpdir = tempfile.mkdtemp()
-    self.fifo_file = os.path.join(self.fifo_tmpdir, "ganeti_test_fifo")
-    os.mkfifo(self.fifo_file)
-
-  def tearDown(self):
-    shutil.rmtree(self.fifo_tmpdir)
-    testutils.GanetiTestCase.tearDown(self)
-
-  def testOk(self):
-    """Test successful exit code"""
-    result = RunCmd("/bin/sh -c 'exit 0'")
-    self.assertEqual(result.exit_code, 0)
-    self.assertEqual(result.output, "")
-
-  def testFail(self):
-    """Test fail exit code"""
-    result = RunCmd("/bin/sh -c 'exit 1'")
-    self.assertEqual(result.exit_code, 1)
-    self.assertEqual(result.output, "")
-
-  def testStdout(self):
-    """Test standard output"""
-    cmd = 'echo -n "%s"' % self.magic
-    result = RunCmd("/bin/sh -c '%s'" % cmd)
-    self.assertEqual(result.stdout, self.magic)
-    result = RunCmd("/bin/sh -c '%s'" % cmd, output=self.fname)
-    self.assertEqual(result.output, "")
-    self.assertFileContent(self.fname, self.magic)
-
-  def testStderr(self):
-    """Test standard error"""
-    cmd = 'echo -n "%s"' % self.magic
-    result = RunCmd("/bin/sh -c '%s' 1>&2" % cmd)
-    self.assertEqual(result.stderr, self.magic)
-    result = RunCmd("/bin/sh -c '%s' 1>&2" % cmd, output=self.fname)
-    self.assertEqual(result.output, "")
-    self.assertFileContent(self.fname, self.magic)
-
-  def testCombined(self):
-    """Test combined output"""
-    cmd = 'echo -n "A%s"; echo -n "B%s" 1>&2' % (self.magic, self.magic)
-    expected = "A" + self.magic + "B" + self.magic
-    result = RunCmd("/bin/sh -c '%s'" % cmd)
-    self.assertEqual(result.output, expected)
-    result = RunCmd("/bin/sh -c '%s'" % cmd, output=self.fname)
-    self.assertEqual(result.output, "")
-    self.assertFileContent(self.fname, expected)
-
-  def testSignal(self):
-    """Test signal"""
-    result = RunCmd(["python", "-c", "import os; os.kill(os.getpid(), 15)"])
-    self.assertEqual(result.signal, 15)
-    self.assertEqual(result.output, "")
-
-  def testTimeoutClean(self):
-    cmd = "trap 'exit 0' TERM; read < %s" % self.fifo_file
-    result = RunCmd(["/bin/sh", "-c", cmd], timeout=0.2)
-    self.assertEqual(result.exit_code, 0)
-
-  def testTimeoutKill(self):
-    cmd = ["/bin/sh", "-c", "trap '' TERM; read < %s" % self.fifo_file]
-    timeout = 0.2
-    out, err, status, ta = utils._RunCmdPipe(cmd, {}, False, "/", False,
-                                             timeout, _linger_timeout=0.2)
-    self.assert_(status < 0)
-    self.assertEqual(-status, signal.SIGKILL)
-
-  def testTimeoutOutputAfterTerm(self):
-    cmd = "trap 'echo sigtermed; exit 1' TERM; read < %s" % self.fifo_file
-    result = RunCmd(["/bin/sh", "-c", cmd], timeout=0.2)
-    self.assert_(result.failed)
-    self.assertEqual(result.stdout, "sigtermed\n")
-
-  def testListRun(self):
-    """Test list runs"""
-    result = RunCmd(["true"])
-    self.assertEqual(result.signal, None)
-    self.assertEqual(result.exit_code, 0)
-    result = RunCmd(["/bin/sh", "-c", "exit 1"])
-    self.assertEqual(result.signal, None)
-    self.assertEqual(result.exit_code, 1)
-    result = RunCmd(["echo", "-n", self.magic])
-    self.assertEqual(result.signal, None)
-    self.assertEqual(result.exit_code, 0)
-    self.assertEqual(result.stdout, self.magic)
-
-  def testFileEmptyOutput(self):
-    """Test file output"""
-    result = RunCmd(["true"], output=self.fname)
-    self.assertEqual(result.signal, None)
-    self.assertEqual(result.exit_code, 0)
-    self.assertFileContent(self.fname, "")
-
-  def testLang(self):
-    """Test locale environment"""
-    old_env = os.environ.copy()
-    try:
-      os.environ["LANG"] = "en_US.UTF-8"
-      os.environ["LC_ALL"] = "en_US.UTF-8"
-      result = RunCmd(["locale"])
-      for line in result.output.splitlines():
-        key, value = line.split("=", 1)
-        # Ignore these variables, they're overridden by LC_ALL
-        if key == "LANG" or key == "LANGUAGE":
-          continue
-        self.failIf(value and value != "C" and value != '"C"',
-            "Variable %s is set to the invalid value '%s'" % (key, value))
-    finally:
-      os.environ = old_env
-
-  def testDefaultCwd(self):
-    """Test default working directory"""
-    self.failUnlessEqual(RunCmd(["pwd"]).stdout.strip(), "/")
-
-  def testCwd(self):
-    """Test default working directory"""
-    self.failUnlessEqual(RunCmd(["pwd"], cwd="/").stdout.strip(), "/")
-    self.failUnlessEqual(RunCmd(["pwd"], cwd="/tmp").stdout.strip(), "/tmp")
-    cwd = os.getcwd()
-    self.failUnlessEqual(RunCmd(["pwd"], cwd=cwd).stdout.strip(), cwd)
-
-  def testResetEnv(self):
-    """Test environment reset functionality"""
-    self.failUnlessEqual(RunCmd(["env"], reset_env=True).stdout.strip(), "")
-    self.failUnlessEqual(RunCmd(["env"], reset_env=True,
-                                env={"FOO": "bar",}).stdout.strip(), "FOO=bar")
-
-  def testNoFork(self):
-    """Test that nofork raise an error"""
-    self.assertFalse(utils._no_fork)
-    utils.DisableFork()
-    try:
-      self.assertTrue(utils._no_fork)
-      self.assertRaises(errors.ProgrammerError, RunCmd, ["true"])
-    finally:
-      utils._no_fork = False
-
-  def testWrongParams(self):
-    """Test wrong parameters"""
-    self.assertRaises(errors.ProgrammerError, RunCmd, ["true"],
-                      output="/dev/null", interactive=True)
-
-
-class TestRunParts(testutils.GanetiTestCase):
-  """Testing case for the RunParts function"""
-
-  def setUp(self):
-    self.rundir = tempfile.mkdtemp(prefix="ganeti-test", suffix=".tmp")
-
-  def tearDown(self):
-    shutil.rmtree(self.rundir)
-
-  def testEmpty(self):
-    """Test on an empty dir"""
-    self.failUnlessEqual(RunParts(self.rundir, reset_env=True), [])
-
-  def testSkipWrongName(self):
-    """Test that wrong files are skipped"""
-    fname = os.path.join(self.rundir, "00test.dot")
-    utils.WriteFile(fname, data="")
-    os.chmod(fname, stat.S_IREAD | stat.S_IEXEC)
-    relname = os.path.basename(fname)
-    self.failUnlessEqual(RunParts(self.rundir, reset_env=True),
-                         [(relname, constants.RUNPARTS_SKIP, None)])
-
-  def testSkipNonExec(self):
-    """Test that non executable files are skipped"""
-    fname = os.path.join(self.rundir, "00test")
-    utils.WriteFile(fname, data="")
-    relname = os.path.basename(fname)
-    self.failUnlessEqual(RunParts(self.rundir, reset_env=True),
-                         [(relname, constants.RUNPARTS_SKIP, None)])
-
-  def testError(self):
-    """Test error on a broken executable"""
-    fname = os.path.join(self.rundir, "00test")
-    utils.WriteFile(fname, data="")
-    os.chmod(fname, stat.S_IREAD | stat.S_IEXEC)
-    (relname, status, error) = RunParts(self.rundir, reset_env=True)[0]
-    self.failUnlessEqual(relname, os.path.basename(fname))
-    self.failUnlessEqual(status, constants.RUNPARTS_ERR)
-    self.failUnless(error)
-
-  def testSorted(self):
-    """Test executions are sorted"""
-    files = []
-    files.append(os.path.join(self.rundir, "64test"))
-    files.append(os.path.join(self.rundir, "00test"))
-    files.append(os.path.join(self.rundir, "42test"))
-
-    for fname in files:
-      utils.WriteFile(fname, data="")
-
-    results = RunParts(self.rundir, reset_env=True)
-
-    for fname in sorted(files):
-      self.failUnlessEqual(os.path.basename(fname), results.pop(0)[0])
-
-  def testOk(self):
-    """Test correct execution"""
-    fname = os.path.join(self.rundir, "00test")
-    utils.WriteFile(fname, data="#!/bin/sh\n\necho -n ciao")
-    os.chmod(fname, stat.S_IREAD | stat.S_IEXEC)
-    (relname, status, runresult) = RunParts(self.rundir, reset_env=True)[0]
-    self.failUnlessEqual(relname, os.path.basename(fname))
-    self.failUnlessEqual(status, constants.RUNPARTS_RUN)
-    self.failUnlessEqual(runresult.stdout, "ciao")
-
-  def testRunFail(self):
-    """Test correct execution, with run failure"""
-    fname = os.path.join(self.rundir, "00test")
-    utils.WriteFile(fname, data="#!/bin/sh\n\nexit 1")
-    os.chmod(fname, stat.S_IREAD | stat.S_IEXEC)
-    (relname, status, runresult) = RunParts(self.rundir, reset_env=True)[0]
-    self.failUnlessEqual(relname, os.path.basename(fname))
-    self.failUnlessEqual(status, constants.RUNPARTS_RUN)
-    self.failUnlessEqual(runresult.exit_code, 1)
-    self.failUnless(runresult.failed)
-
-  def testRunMix(self):
-    files = []
-    files.append(os.path.join(self.rundir, "00test"))
-    files.append(os.path.join(self.rundir, "42test"))
-    files.append(os.path.join(self.rundir, "64test"))
-    files.append(os.path.join(self.rundir, "99test"))
-
-    files.sort()
-
-    # 1st has errors in execution
-    utils.WriteFile(files[0], data="#!/bin/sh\n\nexit 1")
-    os.chmod(files[0], stat.S_IREAD | stat.S_IEXEC)
-
-    # 2nd is skipped
-    utils.WriteFile(files[1], data="")
-
-    # 3rd cannot execute properly
-    utils.WriteFile(files[2], data="")
-    os.chmod(files[2], stat.S_IREAD | stat.S_IEXEC)
-
-    # 4th execs
-    utils.WriteFile(files[3], data="#!/bin/sh\n\necho -n ciao")
-    os.chmod(files[3], stat.S_IREAD | stat.S_IEXEC)
-
-    results = RunParts(self.rundir, reset_env=True)
-
-    (relname, status, runresult) = results[0]
-    self.failUnlessEqual(relname, os.path.basename(files[0]))
-    self.failUnlessEqual(status, constants.RUNPARTS_RUN)
-    self.failUnlessEqual(runresult.exit_code, 1)
-    self.failUnless(runresult.failed)
-
-    (relname, status, runresult) = results[1]
-    self.failUnlessEqual(relname, os.path.basename(files[1]))
-    self.failUnlessEqual(status, constants.RUNPARTS_SKIP)
-    self.failUnlessEqual(runresult, None)
-
-    (relname, status, runresult) = results[2]
-    self.failUnlessEqual(relname, os.path.basename(files[2]))
-    self.failUnlessEqual(status, constants.RUNPARTS_ERR)
-    self.failUnless(runresult)
-
-    (relname, status, runresult) = results[3]
-    self.failUnlessEqual(relname, os.path.basename(files[3]))
-    self.failUnlessEqual(status, constants.RUNPARTS_RUN)
-    self.failUnlessEqual(runresult.output, "ciao")
-    self.failUnlessEqual(runresult.exit_code, 0)
-    self.failUnless(not runresult.failed)
-
-  def testMissingDirectory(self):
-    nosuchdir = utils.PathJoin(self.rundir, "no/such/directory")
-    self.assertEqual(RunParts(nosuchdir), [])
-
-
-class TestStartDaemon(testutils.GanetiTestCase):
-  def setUp(self):
-    self.tmpdir = tempfile.mkdtemp(prefix="ganeti-test")
-    self.tmpfile = os.path.join(self.tmpdir, "test")
-
-  def tearDown(self):
-    shutil.rmtree(self.tmpdir)
-
-  def testShell(self):
-    utils.StartDaemon("echo Hello World > %s" % self.tmpfile)
-    self._wait(self.tmpfile, 60.0, "Hello World")
-
-  def testShellOutput(self):
-    utils.StartDaemon("echo Hello World", output=self.tmpfile)
-    self._wait(self.tmpfile, 60.0, "Hello World")
-
-  def testNoShellNoOutput(self):
-    utils.StartDaemon(["pwd"])
-
-  def testNoShellNoOutputTouch(self):
-    testfile = os.path.join(self.tmpdir, "check")
-    self.failIf(os.path.exists(testfile))
-    utils.StartDaemon(["touch", testfile])
-    self._wait(testfile, 60.0, "")
-
-  def testNoShellOutput(self):
-    utils.StartDaemon(["pwd"], output=self.tmpfile)
-    self._wait(self.tmpfile, 60.0, "/")
-
-  def testNoShellOutputCwd(self):
-    utils.StartDaemon(["pwd"], output=self.tmpfile, cwd=os.getcwd())
-    self._wait(self.tmpfile, 60.0, os.getcwd())
-
-  def testShellEnv(self):
-    utils.StartDaemon("echo \"$GNT_TEST_VAR\"", output=self.tmpfile,
-                      env={ "GNT_TEST_VAR": "Hello World", })
-    self._wait(self.tmpfile, 60.0, "Hello World")
-
-  def testNoShellEnv(self):
-    utils.StartDaemon(["printenv", "GNT_TEST_VAR"], output=self.tmpfile,
-                      env={ "GNT_TEST_VAR": "Hello World", })
-    self._wait(self.tmpfile, 60.0, "Hello World")
-
-  def testOutputFd(self):
-    fd = os.open(self.tmpfile, os.O_WRONLY | os.O_CREAT)
-    try:
-      utils.StartDaemon(["pwd"], output_fd=fd, cwd=os.getcwd())
-    finally:
-      os.close(fd)
-    self._wait(self.tmpfile, 60.0, os.getcwd())
-
-  def testPid(self):
-    pid = utils.StartDaemon("echo $$ > %s" % self.tmpfile)
-    self._wait(self.tmpfile, 60.0, str(pid))
-
-  def testPidFile(self):
-    pidfile = os.path.join(self.tmpdir, "pid")
-    checkfile = os.path.join(self.tmpdir, "abort")
-
-    pid = utils.StartDaemon("while sleep 5; do :; done", pidfile=pidfile,
-                            output=self.tmpfile)
-    try:
-      fd = os.open(pidfile, os.O_RDONLY)
-      try:
-        # Check file is locked
-        self.assertRaises(errors.LockError, utils.LockFile, fd)
-
-        pidtext = os.read(fd, 100)
-      finally:
-        os.close(fd)
-
-      self.assertEqual(int(pidtext.strip()), pid)
-
-      self.assert_(utils.IsProcessAlive(pid))
-    finally:
-      # No matter what happens, kill daemon
-      utils.KillProcess(pid, timeout=5.0, waitpid=False)
-      self.failIf(utils.IsProcessAlive(pid))
-
-    self.assertEqual(utils.ReadFile(self.tmpfile), "")
-
-  def _wait(self, path, timeout, expected):
-    # Due to the asynchronous nature of daemon processes, polling is necessary.
-    # A timeout makes sure the test doesn't hang forever.
-    def _CheckFile():
-      if not (os.path.isfile(path) and
-              utils.ReadFile(path).strip() == expected):
-        raise utils.RetryAgain()
-
-    try:
-      utils.Retry(_CheckFile, (0.01, 1.5, 1.0), timeout)
-    except utils.RetryTimeout:
-      self.fail("Apparently the daemon didn't run in %s seconds and/or"
-                " didn't write the correct output" % timeout)
-
-  def testError(self):
-    self.assertRaises(errors.OpExecError, utils.StartDaemon,
-                      ["./does-NOT-EXIST/here/0123456789"])
-    self.assertRaises(errors.OpExecError, utils.StartDaemon,
-                      ["./does-NOT-EXIST/here/0123456789"],
-                      output=os.path.join(self.tmpdir, "DIR/NOT/EXIST"))
-    self.assertRaises(errors.OpExecError, utils.StartDaemon,
-                      ["./does-NOT-EXIST/here/0123456789"],
-                      cwd=os.path.join(self.tmpdir, "DIR/NOT/EXIST"))
-    self.assertRaises(errors.OpExecError, utils.StartDaemon,
-                      ["./does-NOT-EXIST/here/0123456789"],
-                      output=os.path.join(self.tmpdir, "DIR/NOT/EXIST"))
-
-    fd = os.open(self.tmpfile, os.O_WRONLY | os.O_CREAT)
-    try:
-      self.assertRaises(errors.ProgrammerError, utils.StartDaemon,
-                        ["./does-NOT-EXIST/here/0123456789"],
-                        output=self.tmpfile, output_fd=fd)
-    finally:
-      os.close(fd)
+     RunParts
 
 
 class TestParseCpuMask(unittest.TestCase):
@@ -578,85 +61,20 @@ class TestParseCpuMask(unittest.TestCase):
       self.assertRaises(errors.ParseError, utils.ParseCpuMask, data)
 
 
-class TestEtcHosts(testutils.GanetiTestCase):
-  """Test functions modifying /etc/hosts"""
+class TestParseMultiCpuMask(unittest.TestCase):
+  """Test case for the ParseMultiCpuMask function."""
 
-  def setUp(self):
-    testutils.GanetiTestCase.setUp(self)
-    self.tmpname = self._CreateTempFile()
-    handle = open(self.tmpname, 'w')
-    try:
-      handle.write('# This is a test file for /etc/hosts\n')
-      handle.write('127.0.0.1\tlocalhost\n')
-      handle.write('192.0.2.1 router gw\n')
-    finally:
-      handle.close()
-
-  def testSettingNewIp(self):
-    SetEtcHostsEntry(self.tmpname, '198.51.100.4', 'myhost.example.com',
-                     ['myhost'])
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1 router gw\n"
-      "198.51.100.4\tmyhost.example.com myhost\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testSettingExistingIp(self):
-    SetEtcHostsEntry(self.tmpname, '192.0.2.1', 'myhost.example.com',
-                     ['myhost'])
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1\tmyhost.example.com myhost\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testSettingDuplicateName(self):
-    SetEtcHostsEntry(self.tmpname, '198.51.100.4', 'myhost', ['myhost'])
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1 router gw\n"
-      "198.51.100.4\tmyhost\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testRemovingExistingHost(self):
-    RemoveEtcHostsEntry(self.tmpname, 'router')
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1 gw\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testRemovingSingleExistingHost(self):
-    RemoveEtcHostsEntry(self.tmpname, 'localhost')
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "192.0.2.1 router gw\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testRemovingNonExistingHost(self):
-    RemoveEtcHostsEntry(self.tmpname, 'myhost')
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1 router gw\n")
-    self.assertFileMode(self.tmpname, 0644)
-
-  def testRemovingAlias(self):
-    RemoveEtcHostsEntry(self.tmpname, 'gw')
-
-    self.assertFileContent(self.tmpname,
-      "# This is a test file for /etc/hosts\n"
-      "127.0.0.1\tlocalhost\n"
-      "192.0.2.1 router\n")
-    self.assertFileMode(self.tmpname, 0644)
+  def testWellFormed(self):
+    self.assertEqual(utils.ParseMultiCpuMask(""), [])
+    self.assertEqual(utils.ParseMultiCpuMask("1"), [[1]])
+    self.assertEqual(utils.ParseMultiCpuMask("0-2,4,5-5"), [[0, 1, 2, 4, 5]])
+    self.assertEqual(utils.ParseMultiCpuMask("all"), [[-1]])
+    self.assertEqual(utils.ParseMultiCpuMask("0-2:all:4,6-8"),
+      [[0, 1, 2], [-1], [4, 6, 7, 8]])
+
+  def testInvalidInput(self):
+    for data in ["garbage", "0,", "0-1-2", "2-1", "1-a", "all-all"]:
+      self.assertRaises(errors.ParseError, utils.ParseCpuMask, data)
 
 
 class TestGetMounts(unittest.TestCase):
@@ -679,12 +97,6 @@ class TestGetMounts(unittest.TestCase):
         ("none", "/proc", "proc", "rw,nosuid,nodev,noexec,relatime"),
       ])
 
-class TestNewUUID(unittest.TestCase):
-  """Test case for NewUUID"""
-
-  def runTest(self):
-    self.failUnless(utils.UUID_RE.match(utils.NewUUID()))
-
 
 class TestFirstFree(unittest.TestCase):
   """Test case for the FirstFree function"""
@@ -768,29 +180,29 @@ class TestForceDictType(unittest.TestCase):
 
   def testSimpleDict(self):
     self.assertEqual(self._fdt({}), {})
-    self.assertEqual(self._fdt({'a': 1}), {'a': 1})
-    self.assertEqual(self._fdt({'a': '1'}), {'a': 1})
-    self.assertEqual(self._fdt({'a': 1, 'b': 1}), {'a':1, 'b': True})
-    self.assertEqual(self._fdt({'b': 1, 'c': 'foo'}), {'b': True, 'c': 'foo'})
-    self.assertEqual(self._fdt({'b': 1, 'c': False}), {'b': True, 'c': ''})
-    self.assertEqual(self._fdt({'b': 'false'}), {'b': False})
-    self.assertEqual(self._fdt({'b': 'False'}), {'b': False})
-    self.assertEqual(self._fdt({'b': False}), {'b': False})
-    self.assertEqual(self._fdt({'b': 'true'}), {'b': True})
-    self.assertEqual(self._fdt({'b': 'True'}), {'b': True})
-    self.assertEqual(self._fdt({'d': '4'}), {'d': 4})
-    self.assertEqual(self._fdt({'d': '4M'}), {'d': 4})
+    self.assertEqual(self._fdt({"a": 1}), {"a": 1})
+    self.assertEqual(self._fdt({"a": "1"}), {"a": 1})
+    self.assertEqual(self._fdt({"a": 1, "b": 1}), {"a":1, "b": True})
+    self.assertEqual(self._fdt({"b": 1, "c": "foo"}), {"b": True, "c": "foo"})
+    self.assertEqual(self._fdt({"b": 1, "c": False}), {"b": True, "c": ""})
+    self.assertEqual(self._fdt({"b": "false"}), {"b": False})
+    self.assertEqual(self._fdt({"b": "False"}), {"b": False})
+    self.assertEqual(self._fdt({"b": False}), {"b": False})
+    self.assertEqual(self._fdt({"b": "true"}), {"b": True})
+    self.assertEqual(self._fdt({"b": "True"}), {"b": True})
+    self.assertEqual(self._fdt({"d": "4"}), {"d": 4})
+    self.assertEqual(self._fdt({"d": "4M"}), {"d": 4})
     self.assertEqual(self._fdt({"e": None, }), {"e": None, })
     self.assertEqual(self._fdt({"e": "Hello World", }), {"e": "Hello World", })
-    self.assertEqual(self._fdt({"e": False, }), {"e": '', })
+    self.assertEqual(self._fdt({"e": False, }), {"e": "", })
     self.assertEqual(self._fdt({"b": "hello", }, ["hello"]), {"b": "hello"})
 
   def testErrors(self):
-    self.assertRaises(errors.TypeEnforcementError, self._fdt, {'a': 'astring'})
+    self.assertRaises(errors.TypeEnforcementError, self._fdt, {"a": "astring"})
     self.assertRaises(errors.TypeEnforcementError, self._fdt, {"b": "hello"})
-    self.assertRaises(errors.TypeEnforcementError, self._fdt, {'c': True})
-    self.assertRaises(errors.TypeEnforcementError, self._fdt, {'d': 'astring'})
-    self.assertRaises(errors.TypeEnforcementError, self._fdt, {'d': '4 L'})
+    self.assertRaises(errors.TypeEnforcementError, self._fdt, {"c": True})
+    self.assertRaises(errors.TypeEnforcementError, self._fdt, {"d": "astring"})
+    self.assertRaises(errors.TypeEnforcementError, self._fdt, {"d": "4 L"})
     self.assertRaises(errors.TypeEnforcementError, self._fdt, {"e": object(), })
     self.assertRaises(errors.TypeEnforcementError, self._fdt, {"e": [], })
     self.assertRaises(errors.TypeEnforcementError, self._fdt, {"x": None, })
@@ -799,91 +211,6 @@ class TestForceDictType(unittest.TestCase):
                       {"b": "hello"}, {"b": "no-such-type"})
 
 
-class RunInSeparateProcess(unittest.TestCase):
-  def test(self):
-    for exp in [True, False]:
-      def _child():
-        return exp
-
-      self.assertEqual(exp, utils.RunInSeparateProcess(_child))
-
-  def testArgs(self):
-    for arg in [0, 1, 999, "Hello World", (1, 2, 3)]:
-      def _child(carg1, carg2):
-        return carg1 == "Foo" and carg2 == arg
-
-      self.assert_(utils.RunInSeparateProcess(_child, "Foo", arg))
-
-  def testPid(self):
-    parent_pid = os.getpid()
-
-    def _check():
-      return os.getpid() == parent_pid
-
-    self.failIf(utils.RunInSeparateProcess(_check))
-
-  def testSignal(self):
-    def _kill():
-      os.kill(os.getpid(), signal.SIGTERM)
-
-    self.assertRaises(errors.GenericError,
-                      utils.RunInSeparateProcess, _kill)
-
-  def testException(self):
-    def _exc():
-      raise errors.GenericError("This is a test")
-
-    self.assertRaises(errors.GenericError,
-                      utils.RunInSeparateProcess, _exc)
-
-
-class TestGenerateSelfSignedX509Cert(unittest.TestCase):
-  def setUp(self):
-    self.tmpdir = tempfile.mkdtemp()
-
-  def tearDown(self):
-    shutil.rmtree(self.tmpdir)
-
-  def _checkRsaPrivateKey(self, key):
-    lines = key.splitlines()
-    return ("-----BEGIN RSA PRIVATE KEY-----" in lines and
-            "-----END RSA PRIVATE KEY-----" in lines)
-
-  def _checkCertificate(self, cert):
-    lines = cert.splitlines()
-    return ("-----BEGIN CERTIFICATE-----" in lines and
-            "-----END CERTIFICATE-----" in lines)
-
-  def test(self):
-    for common_name in [None, ".", "Ganeti", "node1.example.com"]:
-      (key_pem, cert_pem) = utils.GenerateSelfSignedX509Cert(common_name, 300)
-      self._checkRsaPrivateKey(key_pem)
-      self._checkCertificate(cert_pem)
-
-      key = OpenSSL.crypto.load_privatekey(OpenSSL.crypto.FILETYPE_PEM,
-                                           key_pem)
-      self.assert_(key.bits() >= 1024)
-      self.assertEqual(key.bits(), constants.RSA_KEY_BITS)
-      self.assertEqual(key.type(), OpenSSL.crypto.TYPE_RSA)
-
-      x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
-                                             cert_pem)
-      self.failIf(x509.has_expired())
-      self.assertEqual(x509.get_issuer().CN, common_name)
-      self.assertEqual(x509.get_subject().CN, common_name)
-      self.assertEqual(x509.get_pubkey().bits(), constants.RSA_KEY_BITS)
-
-  def testLegacy(self):
-    cert1_filename = os.path.join(self.tmpdir, "cert1.pem")
-
-    utils.GenerateSelfSignedSslCert(cert1_filename, validity=1)
-
-    cert1 = utils.ReadFile(cert1_filename)
-
-    self.assert_(self._checkRsaPrivateKey(cert1))
-    self.assert_(self._checkCertificate(cert1))
-
-
 class TestValidateServiceName(unittest.TestCase):
   def testValid(self):
     testnames = [
@@ -910,124 +237,6 @@ class TestValidateServiceName(unittest.TestCase):
       self.assertRaises(errors.OpPrereqError, utils.ValidateServiceName, name)
 
 
-class TestParseAsn1Generalizedtime(unittest.TestCase):
-  def test(self):
-    # UTC
-    self.assertEqual(utils._ParseAsn1Generalizedtime("19700101000000Z"), 0)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20100222174152Z"),
-                     1266860512)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20380119031407Z"),
-                     (2**31) - 1)
-
-    # With offset
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20100222174152+0000"),
-                     1266860512)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20100223131652+0000"),
-                     1266931012)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20100223051808-0800"),
-                     1266931088)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("20100224002135+1100"),
-                     1266931295)
-    self.assertEqual(utils._ParseAsn1Generalizedtime("19700101000000-0100"),
-                     3600)
-
-    # Leap seconds are not supported by datetime.datetime
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime,
-                      "19841231235960+0000")
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime,
-                      "19920630235960+0000")
-
-    # Errors
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime, "")
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime, "invalid")
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime,
-                      "20100222174152")
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime,
-                      "Mon Feb 22 17:47:02 UTC 2010")
-    self.assertRaises(ValueError, utils._ParseAsn1Generalizedtime,
-                      "2010-02-22 17:42:02")
-
-
-class TestGetX509CertValidity(testutils.GanetiTestCase):
-  def setUp(self):
-    testutils.GanetiTestCase.setUp(self)
-
-    pyopenssl_version = distutils.version.LooseVersion(OpenSSL.__version__)
-
-    # Test whether we have pyOpenSSL 0.7 or above
-    self.pyopenssl0_7 = (pyopenssl_version >= "0.7")
-
-    if not self.pyopenssl0_7:
-      warnings.warn("This test requires pyOpenSSL 0.7 or above to"
-                    " function correctly")
-
-  def _LoadCert(self, name):
-    return OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
-                                           self._ReadTestData(name))
-
-  def test(self):
-    validity = utils.GetX509CertValidity(self._LoadCert("cert1.pem"))
-    if self.pyopenssl0_7:
-      self.assertEqual(validity, (1266919967, 1267524767))
-    else:
-      self.assertEqual(validity, (None, None))
-
-
-class TestSignX509Certificate(unittest.TestCase):
-  KEY = "My private key!"
-  KEY_OTHER = "Another key"
-
-  def test(self):
-    # Generate certificate valid for 5 minutes
-    (_, cert_pem) = utils.GenerateSelfSignedX509Cert(None, 300)
-
-    cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
-                                           cert_pem)
-
-    # No signature at all
-    self.assertRaises(errors.GenericError,
-                      utils.LoadSignedX509Certificate, cert_pem, self.KEY)
-
-    # Invalid input
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      "", self.KEY)
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      "X-Ganeti-Signature: \n", self.KEY)
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      "X-Ganeti-Sign: $1234$abcdef\n", self.KEY)
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      "X-Ganeti-Signature: $1234567890$abcdef\n", self.KEY)
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      "X-Ganeti-Signature: $1234$abc\n\n" + cert_pem, self.KEY)
-
-    # Invalid salt
-    for salt in list("-_@$,:;/\\ \t\n"):
-      self.assertRaises(errors.GenericError, utils.SignX509Certificate,
-                        cert_pem, self.KEY, "foo%sbar" % salt)
-
-    for salt in ["HelloWorld", "salt", string.letters, string.digits,
-                 utils.GenerateSecret(numbytes=4),
-                 utils.GenerateSecret(numbytes=16),
-                 "{123:456}".encode("hex")]:
-      signed_pem = utils.SignX509Certificate(cert, self.KEY, salt)
-
-      self._Check(cert, salt, signed_pem)
-
-      self._Check(cert, salt, "X-Another-Header: with a value\n" + signed_pem)
-      self._Check(cert, salt, (10 * "Hello World!\n") + signed_pem)
-      self._Check(cert, salt, (signed_pem + "\n\na few more\n"
-                               "lines----\n------ at\nthe end!"))
-
-  def _Check(self, cert, salt, pem):
-    (cert2, salt2) = utils.LoadSignedX509Certificate(pem, self.KEY)
-    self.assertEqual(salt, salt2)
-    self.assertEqual(cert.digest("sha1"), cert2.digest("sha1"))
-
-    # Other key
-    self.assertRaises(errors.GenericError, utils.LoadSignedX509Certificate,
-                      pem, self.KEY_OTHER)
-
-
 class TestReadLockedPidFile(unittest.TestCase):
   def setUp(self):
     self.tmpdir = tempfile.mkdtemp()
@@ -1065,60 +274,6 @@ class TestReadLockedPidFile(unittest.TestCase):
     self.assertRaises(EnvironmentError, utils.ReadLockedPidFile, path)
 
 
-class TestCertVerification(testutils.GanetiTestCase):
-  def setUp(self):
-    testutils.GanetiTestCase.setUp(self)
-
-    self.tmpdir = tempfile.mkdtemp()
-
-  def tearDown(self):
-    shutil.rmtree(self.tmpdir)
-
-  def testVerifyCertificate(self):
-    cert_pem = utils.ReadFile(self._TestDataFilename("cert1.pem"))
-    cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
-                                           cert_pem)
-
-    # Not checking return value as this certificate is expired
-    utils.VerifyX509Certificate(cert, 30, 7)
-
-
-class TestVerifyCertificateInner(unittest.TestCase):
-  def test(self):
-    vci = utils._VerifyCertificateInner
-
-    # Valid
-    self.assertEqual(vci(False, 1263916313, 1298476313, 1266940313, 30, 7),
-                     (None, None))
-
-    # Not yet valid
-    (errcode, msg) = vci(False, 1266507600, 1267544400, 1266075600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_WARNING)
-
-    # Expiring soon
-    (errcode, msg) = vci(False, 1266507600, 1267544400, 1266939600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_ERROR)
-
-    (errcode, msg) = vci(False, 1266507600, 1267544400, 1266939600, 30, 1)
-    self.assertEqual(errcode, utils.CERT_WARNING)
-
-    (errcode, msg) = vci(False, 1266507600, None, 1266939600, 30, 7)
-    self.assertEqual(errcode, None)
-
-    # Expired
-    (errcode, msg) = vci(True, 1266507600, 1267544400, 1266939600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_ERROR)
-
-    (errcode, msg) = vci(True, None, 1267544400, 1266939600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_ERROR)
-
-    (errcode, msg) = vci(True, 1266507600, None, 1266939600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_ERROR)
-
-    (errcode, msg) = vci(True, None, None, 1266939600, 30, 7)
-    self.assertEqual(errcode, utils.CERT_ERROR)
-
-
 class TestFindMatch(unittest.TestCase):
   def test(self):
     data = {
@@ -1149,42 +304,6 @@ class TestFindMatch(unittest.TestCase):
     self.assert_(utils.FindMatch(data, "Hello World") is None)
 
 
-class TimeMock:
-  def __init__(self, values):
-    self.values = values
-
-  def __call__(self):
-    return self.values.pop(0)
-
-
-class TestRunningTimeout(unittest.TestCase):
-  def setUp(self):
-    self.time_fn = TimeMock([0.0, 0.3, 4.6, 6.5])
-
-  def testRemainingFloat(self):
-    timeout = utils.RunningTimeout(5.0, True, _time_fn=self.time_fn)
-    self.assertAlmostEqual(timeout.Remaining(), 4.7)
-    self.assertAlmostEqual(timeout.Remaining(), 0.4)
-    self.assertAlmostEqual(timeout.Remaining(), -1.5)
-
-  def testRemaining(self):
-    self.time_fn = TimeMock([0, 2, 4, 5, 6])
-    timeout = utils.RunningTimeout(5, True, _time_fn=self.time_fn)
-    self.assertEqual(timeout.Remaining(), 3)
-    self.assertEqual(timeout.Remaining(), 1)
-    self.assertEqual(timeout.Remaining(), 0)
-    self.assertEqual(timeout.Remaining(), -1)
-
-  def testRemainingNonNegative(self):
-    timeout = utils.RunningTimeout(5.0, False, _time_fn=self.time_fn)
-    self.assertAlmostEqual(timeout.Remaining(), 4.7)
-    self.assertAlmostEqual(timeout.Remaining(), 0.4)
-    self.assertEqual(timeout.Remaining(), 0.0)
-
-  def testNegativeTimeout(self):
-    self.assertRaises(ValueError, utils.RunningTimeout, -1.0, True)
-
-
 class TestTryConvert(unittest.TestCase):
   def test(self):
     for src, fn, result in [
@@ -1196,21 +315,59 @@ class TestTryConvert(unittest.TestCase):
       self.assertEqual(utils.TryConvert(fn, src), result)
 
 
-class TestIsValidShellParam(unittest.TestCase):
-  def test(self):
-    for val, result in [
-      ("abc", True),
-      ("ab;cd", False),
-      ]:
-      self.assertEqual(utils.IsValidShellParam(val), result)
-
+class TestVerifyDictOptions(unittest.TestCase):
+  def setUp(self):
+    self.defaults = {
+      "first_key": "foobar",
+      "foobar": {
+        "key1": "value2",
+        "key2": "value1",
+        },
+      "another_key": "another_value",
+      }
 
-class TestBuildShellCmd(unittest.TestCase):
   def test(self):
-    self.assertRaises(errors.ProgrammerError, utils.BuildShellCmd,
-                      "ls %s", "ab;cd")
-    self.assertEqual(utils.BuildShellCmd("ls %s", "ab"), "ls ab")
+    some_keys = {
+      "first_key": "blubb",
+      "foobar": {
+        "key2": "foo",
+        },
+      }
+    utils.VerifyDictOptions(some_keys, self.defaults)
+
+  def testInvalid(self):
+    some_keys = {
+      "invalid_key": "blubb",
+      "foobar": {
+        "key2": "foo",
+        },
+      }
+    self.assertRaises(errors.OpPrereqError, utils.VerifyDictOptions,
+                      some_keys, self.defaults)
+
+  def testNestedInvalid(self):
+    some_keys = {
+      "foobar": {
+        "key2": "foo",
+        "key3": "blibb"
+        },
+      }
+    self.assertRaises(errors.OpPrereqError, utils.VerifyDictOptions,
+                      some_keys, self.defaults)
+
+  def testMultiInvalid(self):
+    some_keys = {
+        "foobar": {
+          "key1": "value3",
+          "key6": "Right here",
+        },
+        "invalid_with_sub": {
+          "sub1": "value3",
+        },
+      }
+    self.assertRaises(errors.OpPrereqError, utils.VerifyDictOptions,
+                      some_keys, self.defaults)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
   testutils.GanetiTestProgram()