From: Iustin Pop <[email protected]>
---
lib/client/gnt_instance.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
test/ganeti.rapi.rlib2_unittest.py | 2 +-
tools/burnin | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index e99c9d2..7fe1d28 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -504,7 +504,7 @@ def ReinstallInstance(opts, args):
jex = JobExecutor(verbose=multi_on, opts=opts)
for instance_name in inames:
- op = opcodes.OpReinstallInstance(instance_name=instance_name,
+ op = opcodes.OpInstanceReinstall(instance_name=instance_name,
os_type=os_name,
force_variant=opts.force_variant,
osparams=opts.osparams)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a387350..e1b0fe4 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5186,7 +5186,7 @@ class LUShutdownInstance(LogicalUnit):
_ShutdownInstanceDisks(self, instance)
-class LUReinstallInstance(LogicalUnit):
+class LUInstanceReinstall(LogicalUnit):
"""Reinstall an instance.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 0f8827d..f7fad1a 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -791,7 +791,7 @@ class OpInstanceCreate(OpCode):
]
-class OpReinstallInstance(OpCode):
+class OpInstanceReinstall(OpCode):
"""Reinstall an instance's OS."""
OP_ID = "OP_INSTANCE_REINSTALL"
OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index f06cbc8..3c2338b 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1033,7 +1033,7 @@ def _ParseInstanceReinstallRequest(name, data):
ops = [
opcodes.OpShutdownInstance(instance_name=name),
- opcodes.OpReinstallInstance(instance_name=name, os_type=ostype,
+ opcodes.OpInstanceReinstall(instance_name=name, os_type=ostype,
osparams=osparams),
]
diff --git a/test/ganeti.rapi.rlib2_unittest.py
b/test/ganeti.rapi.rlib2_unittest.py
index 2c3d9e4..ece7b03 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -367,7 +367,7 @@ class
TestParseInstanceReinstallRequest(testutils.GanetiTestCase):
def _Check(self, ops, name):
expcls = [
opcodes.OpShutdownInstance,
- opcodes.OpReinstallInstance,
+ opcodes.OpInstanceReinstall,
opcodes.OpStartupInstance,
]
diff --git a/tools/burnin b/tools/burnin
index 611a7b9..f839e39 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -815,9 +815,9 @@ class Burner(object):
for instance in self.instances:
Log("instance %s", instance, indent=1)
op1 = self.StopInstanceOp(instance)
- op2 = opcodes.OpReinstallInstance(instance_name=instance)
+ op2 = opcodes.OpInstanceReinstall(instance_name=instance)
Log("reinstall without passing the OS", indent=2)
- op3 = opcodes.OpReinstallInstance(instance_name=instance,
+ op3 = opcodes.OpInstanceReinstall(instance_name=instance,
os_type=self.opts.os)
Log("reinstall specifying the OS", indent=2)
op4 = self.StartInstanceOp(instance)
--
1.7.2.3
