Revision b05f29a6 tools/burnin

b/tools/burnin
347 347
    self._SetDebug(ops)
348 348
    return self.MaybeRetry(rval, "opcode", self._ExecOp, *ops)
349 349

  
350
  def ExecOrQueue(self, name, *ops):
350
  def ExecOrQueue(self, name, ops):
351 351
    """Execute an opcode and manage the exec buffer."""
352 352
    if self.opts.parallel:
353 353
      self._SetDebug(ops)
354 354
      self.queued_ops.append((ops, name))
355 355
    else:
356
      return self.ExecOp(self.queue_retry, *ops)
356
      return self.ExecOp(self.queue_retry, *ops) # pylint: disable-msg=W0142
357 357

  
358 358
  def StartBatch(self, retry):
359 359
    """Start a new batch of jobs.
......
544 544
                                    hvparams=self.hvp,
545 545
                                    )
546 546

  
547
      self.ExecOrQueue(instance, op)
547
      self.ExecOrQueue(instance, [op])
548 548
      self.to_rem.append(instance)
549 549

  
550 550
  @_DoBatch(False)
......
558 558
          op = opcodes.OpGrowDisk(instance_name=instance, disk=idx,
559 559
                                  amount=growth, wait_for_sync=True)
560 560
          Log("increase disk/%s by %s MB", idx, growth, indent=2)
561
          self.ExecOrQueue(instance, op)
561
          self.ExecOrQueue(instance, [op])
562 562

  
563 563
  @_DoBatch(True)
564 564
  def BurnReplaceDisks1D8(self):
......
574 574
                                    early_release=self.opts.early_release)
575 575
        Log("run %s", mode, indent=2)
576 576
        ops.append(op)
577
      self.ExecOrQueue(instance, *ops) # pylint: disable-msg=W0142
577
      self.ExecOrQueue(instance, ops)
578 578

  
579 579
  @_DoBatch(True)
580 580
  def BurnReplaceDisks2(self):
......
598 598
                                  disks=[],
599 599
                                  early_release=self.opts.early_release)
600 600
      Log("run %s %s", mode, msg, indent=2)
601
      self.ExecOrQueue(instance, op)
601
      self.ExecOrQueue(instance, [op])
602 602

  
603 603
  @_DoCheckInstances
604 604
  @_DoBatch(False)
......
609 609
      Log("instance %s", instance, indent=1)
610 610
      op = opcodes.OpFailoverInstance(instance_name=instance,
611 611
                                      ignore_consistency=False)
612
      self.ExecOrQueue(instance, op)
612
      self.ExecOrQueue(instance, [op])
613 613

  
614 614
  @_DoCheckInstances
615 615
  @_DoBatch(False)
......
622 622
      Log("instance %s", instance, indent=1)
623 623
      op = opcodes.OpMoveInstance(instance_name=instance,
624 624
                                  target_node=tnode)
625
      self.ExecOrQueue(instance, op)
625
      self.ExecOrQueue(instance, [op])
626 626

  
627 627
  @_DoBatch(False)
628 628
  def BurnMigrate(self):
......
636 636
      op2 = opcodes.OpMigrateInstance(instance_name=instance, live=True,
637 637
                                      cleanup=True)
638 638
      Log("migration and migration cleanup", indent=2)
639
      self.ExecOrQueue(instance, op1, op2)
639
      self.ExecOrQueue(instance, [op1, op2])
640 640

  
641 641
  @_DoCheckInstances
642 642
  @_DoBatch(False)
......
703 703
      Log("remove instance", indent=2)
704 704
      Log(import_log_msg, indent=2)
705 705
      Log("remove export", indent=2)
706
      self.ExecOrQueue(instance, exp_op, rem_op, imp_op, erem_op)
706
      self.ExecOrQueue(instance, [exp_op, rem_op, imp_op, erem_op])
707 707

  
708 708
  @staticmethod
709 709
  def StopInstanceOp(instance):
......
730 730
      Log("instance %s", instance, indent=1)
731 731
      op1 = self.StopInstanceOp(instance)
732 732
      op2 = self.StartInstanceOp(instance)
733
      self.ExecOrQueue(instance, op1, op2)
733
      self.ExecOrQueue(instance, [op1, op2])
734 734

  
735 735
  @_DoBatch(False)
736 736
  def BurnRemove(self):
......
740 740
      Log("instance %s", instance, indent=1)
741 741
      op = opcodes.OpRemoveInstance(instance_name=instance,
742 742
                                    ignore_failures=True)
743
      self.ExecOrQueue(instance, op)
743
      self.ExecOrQueue(instance, [op])
744 744

  
745 745
  def BurnRename(self):
746 746
    """Rename the instances.
......
778 778
                                        os_type=self.opts.os)
779 779
      Log("reinstall specifying the OS", indent=2)
780 780
      op4 = self.StartInstanceOp(instance)
781
      self.ExecOrQueue(instance, op1, op2, op3, op4)
781
      self.ExecOrQueue(instance, [op1, op2, op3, op4])
782 782

  
783 783
  @_DoCheckInstances
784 784
  @_DoBatch(True)
......
794 794
                                      ignore_secondaries=False)
795 795
        Log("reboot with type '%s'", reboot_type, indent=2)
796 796
        ops.append(op)
797
      self.ExecOrQueue(instance, *ops) # pylint: disable-msg=W0142
797
      self.ExecOrQueue(instance, ops)
798 798

  
799 799
  @_DoCheckInstances
800 800
  @_DoBatch(True)
......
810 810
      Log("activate disks when online", indent=2)
811 811
      Log("activate disks when offline", indent=2)
812 812
      Log("deactivate disks (when offline)", indent=2)
813
      self.ExecOrQueue(instance, op_act, op_stop, op_act, op_deact, op_start)
813
      self.ExecOrQueue(instance, [op_act, op_stop, op_act, op_deact, op_start])
814 814

  
815 815
  @_DoCheckInstances
816 816
  @_DoBatch(False)
......
828 828
      op_start = self.StartInstanceOp(instance)
829 829
      Log("adding a disk", indent=2)
830 830
      Log("removing last disk", indent=2)
831
      self.ExecOrQueue(instance, op_add, op_stop, op_rem, op_start)
831
      self.ExecOrQueue(instance, [op_add, op_stop, op_rem, op_start])
832 832

  
833 833
  @_DoBatch(False)
834 834
  def BurnAddRemoveNICs(self):
......
842 842
        instance_name=instance, nics=[(constants.DDM_REMOVE, {})])
843 843
      Log("adding a NIC", indent=2)
844 844
      Log("removing last NIC", indent=2)
845
      self.ExecOrQueue(instance, op_add, op_rem)
845
      self.ExecOrQueue(instance, [op_add, op_rem])
846 846

  
847 847
  def ConfdCallback(self, reply):
848 848
    """Callback for confd queries"""

Also available in: Unified diff