Revision 1c3231aa test/py/ganeti.config_unittest.py

b/test/py/ganeti.config_unittest.py
328 328
    cluster_serial += 1
329 329

  
330 330
    # Create two nodes
331
    node1 = objects.Node(name="node1", group=grp1.uuid, ndparams={})
331
    node1 = objects.Node(name="node1", group=grp1.uuid, ndparams={},
332
                         uuid="node1-uuid")
332 333
    node1_serial = 1
333
    node2 = objects.Node(name="node2", group=grp2.uuid, ndparams={})
334
    node2 = objects.Node(name="node2", group=grp2.uuid, ndparams={},
335
                         uuid="node2-uuid")
334 336
    node2_serial = 1
335 337
    cfg.AddNode(node1, "job")
336 338
    cfg.AddNode(node2, "job")
337 339
    cluster_serial += 2
338
    self.assertEqual(set(cfg.GetNodeList()), set(["node1", "node2", me.name]))
340
    self.assertEqual(set(cfg.GetNodeList()),
341
                     set(["node1-uuid", "node2-uuid",
342
                          cfg.GetNodeInfoByName(me.name).uuid]))
339 343

  
340 344
    def _VerifySerials():
341 345
      self.assertEqual(cfg.GetClusterInfo().serial_no, cluster_serial)
......
346 350

  
347 351
    _VerifySerials()
348 352

  
349
    self.assertEqual(set(grp1.members), set(["node1"]))
350
    self.assertEqual(set(grp2.members), set(["node2"]))
353
    self.assertEqual(set(grp1.members), set(["node1-uuid"]))
354
    self.assertEqual(set(grp2.members), set(["node2-uuid"]))
351 355

  
352 356
    # Check invalid nodes and groups
353 357
    self.assertRaises(errors.ConfigurationError, cfg.AssignGroupNodes, [
......
359 363

  
360 364
    self.assertEqual(node1.group, grp1.uuid)
361 365
    self.assertEqual(node2.group, grp2.uuid)
362
    self.assertEqual(set(grp1.members), set(["node1"]))
363
    self.assertEqual(set(grp2.members), set(["node2"]))
366
    self.assertEqual(set(grp1.members), set(["node1-uuid"]))
367
    self.assertEqual(set(grp2.members), set(["node2-uuid"]))
364 368

  
365 369
    # Another no-op
366 370
    cfg.AssignGroupNodes([])
......
370 374
    # Assign to the same group (should be a no-op)
371 375
    self.assertEqual(node2.group, grp2.uuid)
372 376
    cfg.AssignGroupNodes([
373
      (node2.name, grp2.uuid),
377
      (node2.uuid, grp2.uuid),
374 378
      ])
375 379
    cluster_serial += 1
376 380
    self.assertEqual(node2.group, grp2.uuid)
377 381
    _VerifySerials()
378
    self.assertEqual(set(grp1.members), set(["node1"]))
379
    self.assertEqual(set(grp2.members), set(["node2"]))
382
    self.assertEqual(set(grp1.members), set(["node1-uuid"]))
383
    self.assertEqual(set(grp2.members), set(["node2-uuid"]))
380 384

  
381 385
    # Assign node 2 to group 1
382 386
    self.assertEqual(node2.group, grp2.uuid)
383 387
    cfg.AssignGroupNodes([
384
      (node2.name, grp1.uuid),
388
      (node2.uuid, grp1.uuid),
385 389
      ])
386 390
    cluster_serial += 1
387 391
    node2_serial += 1
......
389 393
    grp2_serial += 1
390 394
    self.assertEqual(node2.group, grp1.uuid)
391 395
    _VerifySerials()
392
    self.assertEqual(set(grp1.members), set(["node1", "node2"]))
396
    self.assertEqual(set(grp1.members), set(["node1-uuid", "node2-uuid"]))
393 397
    self.assertFalse(grp2.members)
394 398

  
395 399
    # And assign both nodes to group 2
......
397 401
    self.assertEqual(node2.group, grp1.uuid)
398 402
    self.assertNotEqual(grp1.uuid, grp2.uuid)
399 403
    cfg.AssignGroupNodes([
400
      (node1.name, grp2.uuid),
401
      (node2.name, grp2.uuid),
404
      (node1.uuid, grp2.uuid),
405
      (node2.uuid, grp2.uuid),
402 406
      ])
403 407
    cluster_serial += 1
404 408
    node1_serial += 1
......
409 413
    self.assertEqual(node2.group, grp2.uuid)
410 414
    _VerifySerials()
411 415
    self.assertFalse(grp1.members)
412
    self.assertEqual(set(grp2.members), set(["node1", "node2"]))
416
    self.assertEqual(set(grp2.members), set(["node1-uuid", "node2-uuid"]))
413 417

  
414 418
    # Destructive tests
415 419
    orig_group = node2.group
......
419 423
                        for node in cfg.GetAllNodesInfo().values())
420 424
      node2.group = "68b3d087-6ea5-491c-b81f-0a47d90228c5"
421 425
      self.assertRaises(errors.ConfigurationError, cfg.AssignGroupNodes, [
422
        ("node2", grp2.uuid),
426
        (node2.uuid, grp2.uuid),
423 427
        ])
424 428
      _VerifySerials()
425 429
    finally:

Also available in: Unified diff