diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index ec6b5ea6f390a716189dd5d0de5a2c2434baba8e..bece1abc080a225f907241adf226e8bc58082db0 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -761,10 +761,10 @@ def ReplaceDisks(opts, args):
# replace secondary
mode = constants.REPLACE_DISK_CHG
- op = opcodes.OpReplaceDisks(instance_name=args[0], disks=disks,
- remote_node=new_2ndary, mode=mode,
- iallocator=iallocator,
- early_release=opts.early_release)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=args[0], disks=disks,
+ remote_node=new_2ndary, mode=mode,
+ iallocator=iallocator,
+ early_release=opts.early_release)
SubmitOrSend(op, opts)
return 0
diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 74dfe609ab32aec414ca7e3453e8c5fe101428fe..ba4c276ec34fff7286737b2c98b76d3fc5fdfcee 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -1,7 +1,7 @@
#
#
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -275,10 +275,10 @@ def EvacuateNode(opts, args):
iname = row[0]
node = row[1]
ToStdout("Will relocate instance %s to node %s", iname, node)
- op = opcodes.OpReplaceDisks(instance_name=iname,
- remote_node=node, disks=[],
- mode=constants.REPLACE_DISK_CHG,
- early_release=opts.early_release)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=iname,
+ remote_node=node, disks=[],
+ mode=constants.REPLACE_DISK_CHG,
+ early_release=opts.early_release)
jex.QueueJob(iname, op)
results = jex.GetResults()
bad_cnt = len([row for row in results if not row[0]])
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 38729e63765255a2630c387be9e53418622bbf94..010f1ac0d38b6c69678b41f19ba6f5c63da24068 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7745,7 +7745,7 @@ class LUInstanceConsole(NoHooksLU):
return console.ToDict()
-class LUReplaceDisks(LogicalUnit):
+class LUInstanceReplaceDisks(LogicalUnit):
"""Replace the disks of an instance.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index f97a66acbaf396bf09f543d4aabbd512858a5007..7b2865a83a898fe7f42260b347d242ac64595af5 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -861,7 +861,7 @@ class OpInstanceReboot(OpCode):
]
-class OpReplaceDisks(OpCode):
+class OpInstanceReplaceDisks(OpCode):
"""Replace the disks of an instance."""
OP_ID = "OP_INSTANCE_REPLACE_DISKS"
OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index cfbbc86c78712a98a107f14884a953c3f414db9f..0400d0d70bd8234a904281ea69d95777bb7c04f1 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -433,10 +433,10 @@ class R_2_nodes_name_evacuate(baserlib.R_Generic):
if dry_run:
jid = None
else:
- op = opcodes.OpReplaceDisks(instance_name=iname,
- remote_node=node, disks=[],
- mode=constants.REPLACE_DISK_CHG,
- early_release=early_r)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=iname,
+ remote_node=node, disks=[],
+ mode=constants.REPLACE_DISK_CHG,
+ early_release=early_r)
jid = baserlib.SubmitJob([op])
jobs.append((jid, iname, node))
@@ -1098,11 +1098,11 @@ class R_2_instances_name_replace_disks(baserlib.R_Generic):
else:
disks = []
- op = opcodes.OpReplaceDisks(instance_name=instance_name,
- remote_node=remote_node,
- mode=mode,
- disks=disks,
- iallocator=iallocator)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=instance_name,
+ remote_node=remote_node,
+ mode=mode,
+ disks=disks,
+ iallocator=iallocator)
return baserlib.SubmitJob([op])
diff --git a/tools/burnin b/tools/burnin
index 2f9aab703271d951d328aafc7bea992493b4968b..65194105611a1388a916d2adf4979df7d7dd31d9 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -605,14 +605,15 @@ class Burner(object):
def BurnReplaceDisks1D8(self):
"""Replace disks on primary and secondary for drbd8."""
Log("Replacing disks on the same nodes")
+ early_release = self.opts.early_release
for instance in self.instances:
Log("instance %s", instance, indent=1)
ops = []
for mode in constants.REPLACE_DISK_SEC, constants.REPLACE_DISK_PRI:
- op = opcodes.OpReplaceDisks(instance_name=instance,
- mode=mode,
- disks=[i for i in range(self.disk_count)],
- early_release=self.opts.early_release)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=instance,
+ mode=mode,
+ disks=list(range(self.disk_count)),
+ early_release=early_release)
Log("run %s", mode, indent=2)
ops.append(op)
self.ExecOrQueue(instance, ops)
@@ -632,12 +633,12 @@ class Burner(object):
msg = "with iallocator %s" % self.opts.iallocator
else:
msg = tnode
- op = opcodes.OpReplaceDisks(instance_name=instance,
- mode=mode,
- remote_node=tnode,
- iallocator=self.opts.iallocator,
- disks=[],
- early_release=self.opts.early_release)
+ op = opcodes.OpInstanceReplaceDisks(instance_name=instance,
+ mode=mode,
+ remote_node=tnode,
+ iallocator=self.opts.iallocator,
+ disks=[],
+ early_release=self.opts.early_release)
Log("run %s %s", mode, msg, indent=2)
self.ExecOrQueue(instance, [op])