Revision cd3b4ff4 test/py/ganeti.objects_unittest.py

b/test/py/ganeti.objects_unittest.py
298 298
    inst = objects.Instance(name="fakeinstplain.example.com",
299 299
      primary_node="node3.example.com",
300 300
      disks=[
301
        objects.Disk(dev_type=constants.LD_LV, size=128,
301
        objects.Disk(dev_type=constants.DT_PLAIN, size=128,
302 302
                     logical_id=("myxenvg", "disk25494")),
303
        objects.Disk(dev_type=constants.LD_LV, size=512,
303
        objects.Disk(dev_type=constants.DT_PLAIN, size=512,
304 304
                     logical_id=("myxenvg", "disk29071")),
305 305
        ])
306 306

  
......
315 315
    inst = objects.Instance(name="fakeinstdrbd.example.com",
316 316
      primary_node="node10.example.com",
317 317
      disks=[
318
        objects.Disk(dev_type=constants.LD_DRBD8, size=786432,
318
        objects.Disk(dev_type=constants.DT_DRBD8, size=786432,
319 319
          logical_id=("node10.example.com", "node15.example.com",
320 320
                      12300, 0, 0, "secret"),
321 321
          children=[
322
            objects.Disk(dev_type=constants.LD_LV, size=786432,
322
            objects.Disk(dev_type=constants.DT_PLAIN, size=786432,
323 323
                         logical_id=("myxenvg", "disk0")),
324
            objects.Disk(dev_type=constants.LD_LV, size=128,
324
            objects.Disk(dev_type=constants.DT_PLAIN, size=128,
325 325
                         logical_id=("myxenvg", "meta0"))
326 326
          ],
327 327
          iv_name="disk/0")
......
368 368

  
369 369
  def testDiskState(self):
370 370
    node = objects.Node(name="node32087.example.com", disk_state={
371
      constants.LD_LV: {
371
      constants.DT_PLAIN: {
372 372
        "lv32352": objects.NodeDiskState(total=128),
373 373
        "lv2082": objects.NodeDiskState(total=512),
374 374
        },
......
381 381

  
382 382
    self.assertEqual(node2.name, "node32087.example.com")
383 383
    self.assertEqual(frozenset(node2.disk_state), frozenset([
384
      constants.LD_LV,
384
      constants.DT_PLAIN,
385 385
      ]))
386
    self.assertEqual(frozenset(node2.disk_state[constants.LD_LV]), frozenset([
387
      "lv32352",
388
      "lv2082",
389
      ]))
390
    self.assertEqual(node2.disk_state[constants.LD_LV]["lv2082"].total, 512)
391
    self.assertEqual(node2.disk_state[constants.LD_LV]["lv32352"].total, 128)
386
    self.assertEqual(frozenset(node2.disk_state[constants.DT_PLAIN]),
387
                     frozenset(["lv32352", "lv2082"]))
388
    self.assertEqual(node2.disk_state[constants.DT_PLAIN]["lv2082"].total, 512)
389
    self.assertEqual(node2.disk_state[constants.DT_PLAIN]["lv32352"].total, 128)
392 390

  
393 391
  def testFilterEsNdp(self):
394 392
    node1 = objects.Node(name="node11673.example.com", ndparams={

Also available in: Unified diff