Revision 31ccfc0e test/py/cmdlib/cluster_unittest.py

b/test/py/cmdlib/cluster_unittest.py
501 501

  
502 502
    self.mcpu.assertLogContainsRegex("but did not enable")
503 503

  
504
  def testResetDrbdHelper(self):
504
  def testResetDrbdHelperDrbdDisabled(self):
505 505
    drbd_helper = ""
506 506
    self.cfg.SetEnabledDiskTemplates([constants.DT_DISKLESS])
507 507
    op = opcodes.OpClusterSetParams(drbd_helper=drbd_helper)
......
509 509

  
510 510
    self.assertEqual(None, self.cluster.drbd_usermode_helper)
511 511

  
512
  def testResetDrbdHelperDrbdEnabled(self):
513
    drbd_helper = ""
514
    self.cluster.enabled_disk_templates = [constants.DT_DRBD8]
515
    op = opcodes.OpClusterSetParams(drbd_helper=drbd_helper)
516
    self.ExecOpCodeExpectOpPrereqError(
517
        op, "Cannot disable drbd helper while DRBD is enabled.")
518

  
519
  def testEnableDrbdNoHelper(self):
520
    self.cluster.enabled_disk_templates = [constants.DT_DISKLESS]
521
    self.cluster.drbd_usermode_helper = None
522
    enabled_disk_templates = [constants.DT_DRBD8]
523
    op = opcodes.OpClusterSetParams(
524
        enabled_disk_templates=enabled_disk_templates)
525
    self.ExecOpCodeExpectOpPrereqError(
526
        op, "Cannot enable DRBD without a DRBD usermode helper set")
527

  
528
  def testEnableDrbdHelperSet(self):
529
    drbd_helper = "/bin/random_helper"
530
    self.rpc.call_drbd_helper.return_value = \
531
      self.RpcResultsBuilder() \
532
        .AddSuccessfulNode(self.master, drbd_helper) \
533
        .Build()
534
    self.cfg.SetEnabledDiskTemplates([constants.DT_DISKLESS])
535
    self.cluster.drbd_usermode_helper = drbd_helper
536
    enabled_disk_templates = [constants.DT_DRBD8]
537
    op = opcodes.OpClusterSetParams(
538
        enabled_disk_templates=enabled_disk_templates,
539
        ipolicy={constants.IPOLICY_DTS: enabled_disk_templates})
540
    self.ExecOpCode(op)
541

  
542
    self.assertEqual(drbd_helper, self.cluster.drbd_usermode_helper)
543

  
512 544
  def testDrbdHelperAlreadySet(self):
513 545
    drbd_helper = "/bin/true"
514 546
    self.rpc.call_drbd_helper.return_value = \
515 547
      self.RpcResultsBuilder() \
516 548
        .AddSuccessfulNode(self.master, "/bin/true") \
517 549
        .Build()
518
    self.cluster.enabled_disk_templates = [constants.DT_DISKLESS]
550
    self.cfg.SetEnabledDiskTemplates([constants.DT_DISKLESS])
519 551
    op = opcodes.OpClusterSetParams(drbd_helper=drbd_helper)
520 552
    self.ExecOpCode(op)
521 553

  
......
529 561
        .AddSuccessfulNode(self.master, "/bin/true") \
530 562
        .Build()
531 563
    self.cluster.drbd_usermode_helper = "/bin/false"
532
    self.cluster.enabled_disk_templates = [constants.DT_DRBD8]
564
    self.cfg.SetEnabledDiskTemplates([constants.DT_DRBD8])
533 565
    op = opcodes.OpClusterSetParams(drbd_helper=drbd_helper)
534 566
    self.ExecOpCode(op)
535 567

  

Also available in: Unified diff