Commit 3cd2d4b1 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename OpRemoveInstance and LURemoveInstance


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 5073fd8f
...@@ -538,7 +538,7 @@ def RemoveInstance(opts, args): ...@@ -538,7 +538,7 @@ def RemoveInstance(opts, args):
if not AskUser(usertext): if not AskUser(usertext):
return 1 return 1
op = opcodes.OpRemoveInstance(instance_name=instance_name, op = opcodes.OpInstanceRemove(instance_name=instance_name,
ignore_failures=opts.ignore_failures, ignore_failures=opts.ignore_failures,
shutdown_timeout=opts.shutdown_timeout) shutdown_timeout=opts.shutdown_timeout)
SubmitOrSend(op, opts, cl=cl) SubmitOrSend(op, opts, cl=cl)
......
...@@ -5437,7 +5437,7 @@ class LURenameInstance(LogicalUnit): ...@@ -5437,7 +5437,7 @@ class LURenameInstance(LogicalUnit):
return inst.name return inst.name
class LURemoveInstance(LogicalUnit): class LUInstanceRemove(LogicalUnit):
"""Remove an instance. """Remove an instance.
""" """
......
...@@ -803,7 +803,7 @@ class OpInstanceReinstall(OpCode): ...@@ -803,7 +803,7 @@ class OpInstanceReinstall(OpCode):
] ]
class OpRemoveInstance(OpCode): class OpInstanceRemove(OpCode):
"""Remove an instance.""" """Remove an instance."""
OP_ID = "OP_INSTANCE_REMOVE" OP_ID = "OP_INSTANCE_REMOVE"
OP_DSC_FIELD = "instance_name" OP_DSC_FIELD = "instance_name"
......
...@@ -933,7 +933,7 @@ class R_2_instances_name(baserlib.R_Generic): ...@@ -933,7 +933,7 @@ class R_2_instances_name(baserlib.R_Generic):
"""Delete an instance. """Delete an instance.
""" """
op = opcodes.OpRemoveInstance(instance_name=self.items[0], op = opcodes.OpInstanceRemove(instance_name=self.items[0],
ignore_failures=False, ignore_failures=False,
dry_run=bool(self.dryRun())) dry_run=bool(self.dryRun()))
return baserlib.SubmitJob([op]) return baserlib.SubmitJob([op])
......
...@@ -715,7 +715,7 @@ class Burner(object): ...@@ -715,7 +715,7 @@ class Burner(object):
target_node=enode, target_node=enode,
mode=constants.EXPORT_MODE_LOCAL, mode=constants.EXPORT_MODE_LOCAL,
shutdown=True) shutdown=True)
rem_op = opcodes.OpRemoveInstance(instance_name=instance, rem_op = opcodes.OpInstanceRemove(instance_name=instance,
ignore_failures=True) ignore_failures=True)
imp_dir = utils.PathJoin(constants.EXPORT_DIR, full_name) imp_dir = utils.PathJoin(constants.EXPORT_DIR, full_name)
imp_op = opcodes.OpInstanceCreate(instance_name=instance, imp_op = opcodes.OpInstanceCreate(instance_name=instance,
...@@ -781,7 +781,7 @@ class Burner(object): ...@@ -781,7 +781,7 @@ class Burner(object):
Log("Removing instances") Log("Removing instances")
for instance in self.to_rem: for instance in self.to_rem:
Log("instance %s", instance, indent=1) Log("instance %s", instance, indent=1)
op = opcodes.OpRemoveInstance(instance_name=instance, op = opcodes.OpInstanceRemove(instance_name=instance,
ignore_failures=True) ignore_failures=True)
self.ExecOrQueue(instance, [op]) self.ExecOrQueue(instance, [op])
......
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