Fixing renaming of DISK_LD_DEFAULTS

This fixes the somewhat over-eager renaming of
DISK_LD_DEFAULTS to DISK_DT_DEFAULTS, which clashes
with another occurence of DISK_DT_DEFAULTS. This
patch just undoes the renaming and additionally fixes
a test regarding shared file storage.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index d9434a1..b41d870 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -2187,7 +2187,7 @@ NDC_GLOBALS = compat.UniqueFrozenset([
   ND_EXCLUSIVE_STORAGE,
   ])
 
-DISK_DT_DEFAULTS = {
+DISK_LD_DEFAULTS = {
   DT_DRBD8: {
     LDP_RESYNC_RATE: CLASSIC_DRBD_SYNC_SPEED,
     LDP_BARRIERS: _autoconf.DRBD_BARRIERS,
@@ -2222,12 +2222,12 @@ DISK_DT_DEFAULTS = {
   }
 
 # readability shortcuts
-_LV_DEFAULTS = DISK_DT_DEFAULTS[DT_PLAIN]
-_DRBD_DEFAULTS = DISK_DT_DEFAULTS[DT_DRBD8]
+_LV_DEFAULTS = DISK_LD_DEFAULTS[DT_PLAIN]
+_DRBD_DEFAULTS = DISK_LD_DEFAULTS[DT_DRBD8]
 
 DISK_DT_DEFAULTS = {
   DT_PLAIN: {
-    LV_STRIPES: DISK_DT_DEFAULTS[DT_PLAIN][LDP_STRIPES],
+    LV_STRIPES: DISK_LD_DEFAULTS[DT_PLAIN][LDP_STRIPES],
     },
   DT_DRBD8: {
     DRBD_RESYNC_RATE: _DRBD_DEFAULTS[LDP_RESYNC_RATE],
@@ -2251,7 +2251,7 @@ DISK_DT_DEFAULTS = {
   DT_SHARED_FILE: {},
   DT_BLOCK: {},
   DT_RBD: {
-    RBD_POOL: DISK_DT_DEFAULTS[DT_RBD][LDP_POOL]
+    RBD_POOL: DISK_LD_DEFAULTS[DT_RBD][LDP_POOL]
     },
   DT_EXT: {},
   }

diff --git a/lib/masterd/instance.py b/lib/masterd/instance.py
index fe0aa45..a4936a4 100644 (file)
--- a/lib/masterd/instance.py
+++ b/lib/masterd/instance.py
@@ -1184,7 +1184,7 @@ class ExportInstanceHelper:
                             " result '%s'", idx, src_node, result.payload)
       else:
         disk_id = tuple(result.payload)
-        disk_params = constants.DISK_DT_DEFAULTS[constants.DT_PLAIN].copy()
+        disk_params = constants.DISK_LD_DEFAULTS[constants.DT_PLAIN].copy()
         new_dev = objects.Disk(dev_type=constants.DT_PLAIN, size=disk.size,
                                logical_id=disk_id, physical_id=disk_id,
                                iv_name=disk.iv_name,

diff --git a/lib/objects.py b/lib/objects.py
index 9811eb4..65ab3c7 100644 (file)
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -852,7 +852,7 @@ class Disk(ConfigObject):
     result = list()
     dt_params = disk_params[disk_template]
     if disk_template == constants.DT_DRBD8:
-      result.append(FillDict(constants.DISK_DT_DEFAULTS[constants.DT_DRBD8], {
+      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_DRBD8], {
         constants.LDP_RESYNC_RATE: dt_params[constants.DRBD_RESYNC_RATE],
         constants.LDP_BARRIERS: dt_params[constants.DRBD_DISK_BARRIERS],
         constants.LDP_NO_META_FLUSH: dt_params[constants.DRBD_META_BARRIERS],
@@ -869,33 +869,33 @@ class Disk(ConfigObject):
         }))
 
       # data LV
-      result.append(FillDict(constants.DISK_DT_DEFAULTS[constants.DT_PLAIN], {
+      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_PLAIN], {
         constants.LDP_STRIPES: dt_params[constants.DRBD_DATA_STRIPES],
         }))
 
       # metadata LV
-      result.append(FillDict(constants.DISK_DT_DEFAULTS[constants.DT_PLAIN], {
+      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_PLAIN], {
         constants.LDP_STRIPES: dt_params[constants.DRBD_META_STRIPES],
         }))
 
     elif disk_template in (constants.DT_FILE, constants.DT_SHARED_FILE):
-      result.append(constants.DISK_DT_DEFAULTS[disk_template])
+      result.append(constants.DISK_LD_DEFAULTS[disk_template])
 
     elif disk_template == constants.DT_PLAIN:
-      result.append(FillDict(constants.DISK_DT_DEFAULTS[constants.DT_PLAIN], {
+      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_PLAIN], {
         constants.LDP_STRIPES: dt_params[constants.LV_STRIPES],
         }))
 
     elif disk_template == constants.DT_BLOCK:
-      result.append(constants.DISK_DT_DEFAULTS[constants.DT_BLOCK])
+      result.append(constants.DISK_LD_DEFAULTS[constants.DT_BLOCK])
 
     elif disk_template == constants.DT_RBD:
-      result.append(FillDict(constants.DISK_DT_DEFAULTS[constants.DT_RBD], {
+      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_RBD], {
         constants.LDP_POOL: dt_params[constants.RBD_POOL],
         }))
 
     elif disk_template == constants.DT_EXT:
-      result.append(constants.DISK_DT_DEFAULTS[constants.DT_EXT])
+      result.append(constants.DISK_LD_DEFAULTS[constants.DT_EXT])
 
     return result
 

diff --git a/lib/storage/bdev.py b/lib/storage/bdev.py
index 5a9e495..98ef0ee 100644 (file)
--- a/lib/storage/bdev.py
+++ b/lib/storage/bdev.py
@@ -1737,7 +1737,7 @@ def _VerifyDiskParams(disk):
   """Verifies if all disk parameters are set.
 
   """
-  missing = set(constants.DISK_DT_DEFAULTS[disk.dev_type]) - set(disk.params)
+  missing = set(constants.DISK_LD_DEFAULTS[disk.dev_type]) - set(disk.params)
   if missing:
     raise errors.ProgrammerError("Block device is missing disk parameters: %s" %
                                  missing)

diff --git a/test/py/ganeti.cmdlib_unittest.py b/test/py/ganeti.cmdlib_unittest.py
index 2cc304a..1165eef 100755 (executable)
--- a/test/py/ganeti.cmdlib_unittest.py
+++ b/test/py/ganeti.cmdlib_unittest.py
@@ -1322,7 +1322,7 @@ class TestGenerateDiskTemplate(unittest.TestCase):
 
       self._SetUpLUWithTemplates([disk_template])
       result = self._TestTrivialDisk(disk_template, disk_info, 2,
-        constants.DT_FILE, file_storage_dir="/tmp",
+        disk_template, file_storage_dir="/tmp",
         file_driver=constants.FD_BLKTAP)
 
       self.assertEqual(map(operator.attrgetter("logical_id"), result), [
@@ -1364,7 +1364,7 @@ class TestGenerateDiskTemplate(unittest.TestCase):
 
   def testDrbd8(self):
     gdt = instance.GenerateDiskTemplate
-    drbd8_defaults = constants.DISK_DT_DEFAULTS[constants.DT_DRBD8]
+    drbd8_defaults = constants.DISK_LD_DEFAULTS[constants.DT_DRBD8]
     drbd8_default_metavg = drbd8_defaults[constants.LDP_DEFAULT_METAVG]
 
     disk_info = [{

diff --git a/test/py/ganeti.constants_unittest.py b/test/py/ganeti.constants_unittest.py
index f4961d9..248124f 100755 (executable)
--- a/test/py/ganeti.constants_unittest.py
+++ b/test/py/ganeti.constants_unittest.py
@@ -80,7 +80,7 @@ class TestConstants(unittest.TestCase):
     self.failUnless(constants.OP_PRIO_HIGH > constants.OP_PRIO_HIGHEST)
 
   def testDiskDefaults(self):
-    self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) ==
+    self.failUnless(set(constants.DISK_LD_DEFAULTS.keys()) ==
                     constants.DISK_TEMPLATES)
     self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) ==
                     constants.DISK_TEMPLATES)