Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / test / py / ganeti.constants_unittest.py

diff --git a/test/py/ganeti.constants_unittest.py b/test/py/ganeti.constants_unittest.py
index 9b7edcd..cb1cdf1 100755 (executable)
--- a/test/py/ganeti.constants_unittest.py
+++ b/test/py/ganeti.constants_unittest.py
@@ -80,8 +80,9 @@ class TestConstants(unittest.TestCase):
     self.failUnless(constants.OP_PRIO_HIGH > constants.OP_PRIO_HIGHEST)
 
   def testDiskDefaults(self):
-    self.failUnless(set(constants.DISK_LD_DEFAULTS.keys()) ==
-                    constants.LOGICAL_DISK_TYPES)
+    self.failUnless(
+        set(constants.DISK_LD_DEFAULTS.keys()) ==
+        set(constants.DISK_TEMPLATES) - set([constants.DT_DISKLESS]))
     self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) ==
                     constants.DISK_TEMPLATES)
 
@@ -98,6 +99,12 @@ class TestConstants(unittest.TestCase):
     self.assertTrue(constants.DEFAULT_ENABLED_HYPERVISOR in
                     constants.HYPER_TYPES)
 
+  def testExtraLogfiles(self):
+    for daemon in constants.DAEMONS_EXTRA_LOGBASE:
+      self.assertTrue(daemon in constants.DAEMONS)
+      for log_reason in constants.DAEMONS_EXTRA_LOGBASE[daemon]:
+        self.assertTrue(log_reason in constants.VALID_EXTRA_LOGREASONS)
+
 
 class TestExportedNames(unittest.TestCase):
   _VALID_NAME_RE = re.compile(r"^[A-Z][A-Z0-9_]+$")
@@ -150,6 +157,17 @@ class TestConfdConstants(unittest.TestCase):
     self.assertFalse(utils.FindDuplicates(constants.CONFD_REPL_STATUSES),
                      msg="Duplicated confd reply status code")
 
+class TestDiskTemplateConstants(unittest.TestCase):
+
+  def testPreference(self):
+    self.assertEqual(set(constants.DISK_TEMPLATE_PREFERENCE),
+                     set(constants.DISK_TEMPLATES))
+
+  def testMapToStorageTypes(self):
+    for disk_template in constants.DISK_TEMPLATES:
+      self.assertTrue(
+          constants.MAP_DISK_TEMPLATE_STORAGE_TYPE[disk_template] is not None)
+
 
 if __name__ == "__main__":
   testutils.GanetiTestProgram()