Commit 90ab1a95 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename OpRebootInstance and LURebootInstance


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent dc28c4e4
...@@ -701,7 +701,7 @@ def _RebootInstance(name, opts): ...@@ -701,7 +701,7 @@ def _RebootInstance(name, opts):
@return: the opcode needed for the operation @return: the opcode needed for the operation
""" """
return opcodes.OpRebootInstance(instance_name=name, return opcodes.OpInstanceReboot(instance_name=name,
reboot_type=opts.reboot_type, reboot_type=opts.reboot_type,
ignore_secondaries=opts.ignore_secondaries, ignore_secondaries=opts.ignore_secondaries,
shutdown_timeout=opts.shutdown_timeout) shutdown_timeout=opts.shutdown_timeout)
......
...@@ -5049,7 +5049,7 @@ class LUStartupInstance(LogicalUnit): ...@@ -5049,7 +5049,7 @@ class LUStartupInstance(LogicalUnit):
raise errors.OpExecError("Could not start instance: %s" % msg) raise errors.OpExecError("Could not start instance: %s" % msg)
class LURebootInstance(LogicalUnit): class LUInstanceReboot(LogicalUnit):
"""Reboot an instance. """Reboot an instance.
""" """
......
...@@ -849,7 +849,7 @@ class OpShutdownInstance(OpCode): ...@@ -849,7 +849,7 @@ class OpShutdownInstance(OpCode):
] ]
class OpRebootInstance(OpCode): class OpInstanceReboot(OpCode):
"""Reboot an instance.""" """Reboot an instance."""
OP_ID = "OP_INSTANCE_REBOOT" OP_ID = "OP_INSTANCE_REBOOT"
OP_DSC_FIELD = "instance_name" OP_DSC_FIELD = "instance_name"
......
...@@ -972,7 +972,7 @@ class R_2_instances_name_reboot(baserlib.R_Generic): ...@@ -972,7 +972,7 @@ class R_2_instances_name_reboot(baserlib.R_Generic):
reboot_type = self.queryargs.get('type', reboot_type = self.queryargs.get('type',
[constants.INSTANCE_REBOOT_HARD])[0] [constants.INSTANCE_REBOOT_HARD])[0]
ignore_secondaries = bool(self._checkIntVariable('ignore_secondaries')) ignore_secondaries = bool(self._checkIntVariable('ignore_secondaries'))
op = opcodes.OpRebootInstance(instance_name=instance_name, op = opcodes.OpInstanceReboot(instance_name=instance_name,
reboot_type=reboot_type, reboot_type=reboot_type,
ignore_secondaries=ignore_secondaries, ignore_secondaries=ignore_secondaries,
dry_run=bool(self.dryRun())) dry_run=bool(self.dryRun()))
......
...@@ -832,7 +832,7 @@ class Burner(object): ...@@ -832,7 +832,7 @@ class Burner(object):
Log("instance %s", instance, indent=1) Log("instance %s", instance, indent=1)
ops = [] ops = []
for reboot_type in self.opts.reboot_types: for reboot_type in self.opts.reboot_types:
op = opcodes.OpRebootInstance(instance_name=instance, op = opcodes.OpInstanceReboot(instance_name=instance,
reboot_type=reboot_type, reboot_type=reboot_type,
ignore_secondaries=False) ignore_secondaries=False)
Log("reboot with type '%s'", reboot_type, indent=2) Log("reboot with type '%s'", reboot_type, indent=2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment