Revision 880ab678

b/test/data/instance-prim-sec.txt
6 6
     {
7 7
       "children": [
8 8
         {
9
           "dev_type": "lvm",
9
           "dev_type": "plain",
10 10
           "logical_id": [
11 11
             "xenvg",
12 12
             "df9ff3f6-a833-48ff-8bd5-bff2eaeab759.disk0_data"
......
20 20
           "uuid": "eaff6322-1bfb-4d59-b306-4535730917cc"
21 21
         },
22 22
         {
23
           "dev_type": "lvm",
23
           "dev_type": "plain",
24 24
           "logical_id": [
25 25
             "xenvg",
26 26
             "df9ff3f6-a833-48ff-8bd5-bff2eaeab759.disk0_meta"
......
34 34
           "uuid": "bf512e95-2a49-4cb3-8d1f-30a503f6bf1b"
35 35
         }
36 36
       ],
37
       "dev_type": "drbd8",
37
       "dev_type": "drbd",
38 38
       "iv_name": "disk/0",
39 39
       "logical_id": [
40 40
         "60e687a0-21fc-4577-997f-ccd08925fa65",
b/test/py/ganeti.constants_unittest.py
80 80
    self.failUnless(constants.OP_PRIO_HIGH > constants.OP_PRIO_HIGHEST)
81 81

  
82 82
  def testDiskDefaults(self):
83
    self.failUnless(set(constants.DISK_LD_DEFAULTS.keys()) ==
84
                    constants.DISK_TEMPLATES)
83
    self.failUnless(
84
        set(constants.DISK_LD_DEFAULTS.keys()) ==
85
        set(constants.DISK_TEMPLATES) - set([constants.DT_DISKLESS]))
85 86
    self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) ==
86 87
                    constants.DISK_TEMPLATES)
87 88

  

Also available in: Unified diff