Revision cd3b4ff4 test/py/ganeti.hypervisor.hv_xen_unittest.py

b/test/py/ganeti.hypervisor.hv_xen_unittest.py
269 269

  
270 270
  def testManyDisks(self):
271 271
    for offset in [0, 1, 10]:
272
      disks = [(objects.Disk(dev_type=constants.LD_LV), "/tmp/disk/%s" % idx)
272
      disks = [(objects.Disk(dev_type=constants.DT_PLAIN), "/tmp/disk/%s" % idx)
273 273
               for idx in range(len(hv_xen._DISK_LETTERS) + offset)]
274 274

  
275 275
      if offset == 0:
......
288 288

  
289 289
  def testTwoLvDisksWithMode(self):
290 290
    disks = [
291
      (objects.Disk(dev_type=constants.LD_LV, mode=constants.DISK_RDWR),
291
      (objects.Disk(dev_type=constants.DT_PLAIN, mode=constants.DISK_RDWR),
292 292
       "/tmp/diskFirst"),
293
      (objects.Disk(dev_type=constants.LD_LV, mode=constants.DISK_RDONLY),
293
      (objects.Disk(dev_type=constants.DT_PLAIN, mode=constants.DISK_RDONLY),
294 294
       "/tmp/diskLast"),
295 295
      ]
296 296

  
......
302 302

  
303 303
  def testFileDisks(self):
304 304
    disks = [
305
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
305
      (objects.Disk(dev_type=constants.DT_FILE, mode=constants.DISK_RDWR,
306 306
                    physical_id=[constants.FD_LOOP]),
307 307
       "/tmp/diskFirst"),
308
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDONLY,
308
      (objects.Disk(dev_type=constants.DT_FILE, mode=constants.DISK_RDONLY,
309 309
                    physical_id=[constants.FD_BLKTAP]),
310 310
       "/tmp/diskTwo"),
311
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
311
      (objects.Disk(dev_type=constants.DT_FILE, mode=constants.DISK_RDWR,
312 312
                    physical_id=[constants.FD_LOOP]),
313 313
       "/tmp/diskThree"),
314
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
314
      (objects.Disk(dev_type=constants.DT_FILE, mode=constants.DISK_RDWR,
315 315
                    physical_id=[constants.FD_BLKTAP]),
316 316
       "/tmp/diskLast"),
317 317
      ]
......
326 326

  
327 327
  def testInvalidFileDisk(self):
328 328
    disks = [
329
      (objects.Disk(dev_type=constants.LD_FILE, mode=constants.DISK_RDWR,
329
      (objects.Disk(dev_type=constants.DT_FILE, mode=constants.DISK_RDWR,
330 330
                    physical_id=["#unknown#"]),
331 331
       "/tmp/diskinvalid"),
332 332
      ]
......
678 678
      hvp[constants.HV_VNC_PASSWORD_FILE] = self.vncpw_path
679 679

  
680 680
    disks = [
681
      (objects.Disk(dev_type=constants.LD_LV, mode=constants.DISK_RDWR),
681
      (objects.Disk(dev_type=constants.DT_PLAIN, mode=constants.DISK_RDWR),
682 682
       utils.PathJoin(self.tmpdir, "disk0")),
683
      (objects.Disk(dev_type=constants.LD_LV, mode=constants.DISK_RDONLY),
683
      (objects.Disk(dev_type=constants.DT_PLAIN, mode=constants.DISK_RDONLY),
684 684
       utils.PathJoin(self.tmpdir, "disk1")),
685 685
      ]
686 686

  

Also available in: Unified diff