Revision ee3e37a7

b/lib/client/gnt_instance.py
718 718
  @return: the opcode needed for the operation
719 719

  
720 720
  """
721
  return opcodes.OpShutdownInstance(instance_name=name,
721
  return opcodes.OpInstanceShutdown(instance_name=name,
722 722
                                    timeout=opts.timeout,
723 723
                                    ignore_offline_nodes=opts.ignore_offline)
724 724

  
b/lib/cmdlib.py
5124 5124
    self.cfg.MarkInstanceUp(instance.name)
5125 5125

  
5126 5126

  
5127
class LUShutdownInstance(LogicalUnit):
5127
class LUInstanceShutdown(LogicalUnit):
5128 5128
  """Shutdown an instance.
5129 5129

  
5130 5130
  """
b/lib/opcodes.py
838 838
    ]
839 839

  
840 840

  
841
class OpShutdownInstance(OpCode):
841
class OpInstanceShutdown(OpCode):
842 842
  """Shutdown an instance."""
843 843
  OP_ID = "OP_INSTANCE_SHUTDOWN"
844 844
  OP_DSC_FIELD = "instance_name"
b/lib/rapi/rlib2.py
1013 1013

  
1014 1014
    """
1015 1015
    instance_name = self.items[0]
1016
    op = opcodes.OpShutdownInstance(instance_name=instance_name,
1016
    op = opcodes.OpInstanceShutdown(instance_name=instance_name,
1017 1017
                                    dry_run=bool(self.dryRun()))
1018 1018

  
1019 1019
    return baserlib.SubmitJob([op])
......
1032 1032
  osparams = baserlib.CheckParameter(data, "osparams", default=None)
1033 1033

  
1034 1034
  ops = [
1035
    opcodes.OpShutdownInstance(instance_name=name),
1035
    opcodes.OpInstanceShutdown(instance_name=name),
1036 1036
    opcodes.OpInstanceReinstall(instance_name=name, os_type=ostype,
1037 1037
                                osparams=osparams),
1038 1038
    ]
b/test/ganeti.rapi.rlib2_unittest.py
366 366

  
367 367
  def _Check(self, ops, name):
368 368
    expcls = [
369
      opcodes.OpShutdownInstance,
369
      opcodes.OpInstanceShutdown,
370 370
      opcodes.OpInstanceReinstall,
371 371
      opcodes.OpStartupInstance,
372 372
      ]
b/tools/burnin
752 752
  @staticmethod
753 753
  def StopInstanceOp(instance):
754 754
    """Stop given instance."""
755
    return opcodes.OpShutdownInstance(instance_name=instance)
755
    return opcodes.OpInstanceShutdown(instance_name=instance)
756 756

  
757 757
  @staticmethod
758 758
  def StartInstanceOp(instance):

Also available in: Unified diff