Revision cd3b4ff4 test/py/ganeti.cmdlib_unittest.py

b/test/py/ganeti.cmdlib_unittest.py
197 197
        disks = []
198 198
        disk_template = constants.DT_DISKLESS
199 199
      else:
200
        disks = [objects.Disk(dev_type=constants.LD_DRBD8,
200
        disks = [objects.Disk(dev_type=constants.DT_DRBD8,
201 201
                              logical_id=[pnode, snode, 1, 17, 17])]
202 202
        disk_template = constants.DT_DRBD8
203 203

  
......
604 604

  
605 605
  def testWithoutOldData(self):
606 606
    new = {
607
      constants.LD_LV: {
607
      constants.DT_PLAIN: {
608 608
        "xenvg": {
609 609
          constants.DS_DISK_RESERVED: 1024,
610 610
          },
......
1293 1293
      }]
1294 1294

  
1295 1295
    result = self._TestTrivialDisk(constants.DT_PLAIN, disk_info, 3,
1296
                                   constants.LD_LV)
1296
                                   constants.DT_PLAIN)
1297 1297

  
1298 1298
    self.assertEqual(map(operator.attrgetter("logical_id"), result), [
1299 1299
      ("testvg", "ec0-uq0.disk3"),
......
1322 1322

  
1323 1323
      self._SetUpLUWithTemplates([disk_template])
1324 1324
      result = self._TestTrivialDisk(disk_template, disk_info, 2,
1325
        constants.LD_FILE, file_storage_dir="/tmp",
1325
        constants.DT_FILE, file_storage_dir="/tmp",
1326 1326
        file_driver=constants.FD_BLKTAP)
1327 1327

  
1328 1328
      self.assertEqual(map(operator.attrgetter("logical_id"), result), [
......
1339 1339
      }]
1340 1340

  
1341 1341
    result = self._TestTrivialDisk(constants.DT_BLOCK, disk_info, 10,
1342
                                   constants.LD_BLOCKDEV)
1342
                                   constants.DT_BLOCK)
1343 1343

  
1344 1344
    self.assertEqual(map(operator.attrgetter("logical_id"), result), [
1345 1345
      (constants.BLOCKDEV_DRIVER_MANUAL, "/tmp/some/block/dev"),
......
1355 1355
      }]
1356 1356

  
1357 1357
    result = self._TestTrivialDisk(constants.DT_RBD, disk_info, 0,
1358
                                   constants.LD_RBD)
1358
                                   constants.DT_RBD)
1359 1359

  
1360 1360
    self.assertEqual(map(operator.attrgetter("logical_id"), result), [
1361 1361
      ("rbd", "ec0-uq0.rbd.disk0"),
......
1364 1364

  
1365 1365
  def testDrbd8(self):
1366 1366
    gdt = instance.GenerateDiskTemplate
1367
    drbd8_defaults = constants.DISK_LD_DEFAULTS[constants.LD_DRBD8]
1367
    drbd8_defaults = constants.DISK_DT_DEFAULTS[constants.DT_DRBD8]
1368 1368
    drbd8_default_metavg = drbd8_defaults[constants.LDP_DEFAULT_METAVG]
1369 1369

  
1370 1370
    disk_info = [{
......
1411 1411

  
1412 1412
    for (idx, disk) in enumerate(result):
1413 1413
      self.assertTrue(isinstance(disk, objects.Disk))
1414
      self.assertEqual(disk.dev_type, constants.LD_DRBD8)
1414
      self.assertEqual(disk.dev_type, constants.DT_DRBD8)
1415 1415
      self.assertEqual(disk.size, disk_info[idx][constants.IDISK_SIZE])
1416 1416
      self.assertEqual(disk.mode, disk_info[idx][constants.IDISK_MODE])
1417 1417

  
1418 1418
      for child in disk.children:
1419 1419
        self.assertTrue(isinstance(disk, objects.Disk))
1420
        self.assertEqual(child.dev_type, constants.LD_LV)
1420
        self.assertEqual(child.dev_type, constants.DT_PLAIN)
1421 1421
        self.assertTrue(child.children is None)
1422 1422

  
1423 1423
      self.assertEqual(map(operator.attrgetter("logical_id"), disk.children),
......
1528 1528
                 cfg=_ConfigForDiskWipe(node_name))
1529 1529

  
1530 1530
    disks = [
1531
      objects.Disk(dev_type=constants.LD_LV),
1532
      objects.Disk(dev_type=constants.LD_LV),
1533
      objects.Disk(dev_type=constants.LD_LV),
1531
      objects.Disk(dev_type=constants.DT_PLAIN),
1532
      objects.Disk(dev_type=constants.DT_PLAIN),
1533
      objects.Disk(dev_type=constants.DT_PLAIN),
1534 1534
      ]
1535 1535

  
1536 1536
    inst = objects.Instance(name="inst21201",
......
1553 1553
                 cfg=_ConfigForDiskWipe(node_uuid))
1554 1554

  
1555 1555
    disks = [
1556
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk0",
1556
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk0",
1557 1557
                   size=100 * 1024),
1558
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk1",
1558
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk1",
1559 1559
                   size=500 * 1024),
1560
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk2", size=256),
1560
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk2", size=256),
1561 1561
      ]
1562 1562

  
1563 1563
    inst = objects.Instance(name="inst562",
......
1599 1599

  
1600 1600
  def testNormalWipe(self):
1601 1601
    disks = [
1602
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk0", size=1024),
1603
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk1",
1602
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk0", size=1024),
1603
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk1",
1604 1604
                   size=500 * 1024),
1605
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk2", size=128),
1606
      objects.Disk(dev_type=constants.LD_LV, logical_id="disk3",
1605
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk2", size=128),
1606
      objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk3",
1607 1607
                   size=constants.MAX_WIPE_CHUNK),
1608 1608
      ]
1609 1609

  
......
1629 1629
  def testWipeWithStartOffset(self):
1630 1630
    for start_offset in [0, 280, 8895, 1563204]:
1631 1631
      disks = [
1632
        objects.Disk(dev_type=constants.LD_LV, logical_id="disk0",
1632
        objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk0",
1633 1633
                     size=128),
1634
        objects.Disk(dev_type=constants.LD_LV, logical_id="disk1",
1634
        objects.Disk(dev_type=constants.DT_PLAIN, logical_id="disk1",
1635 1635
                     size=start_offset + (100 * 1024)),
1636 1636
        ]
1637 1637

  

Also available in: Unified diff