Rename OpShutdownInstance and LUShutdownInstance

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 187ce7f..2b8964b 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -718,7 +718,7 @@ def _ShutdownInstance(name, opts):
   @return: the opcode needed for the operation
 
   """
-  return opcodes.OpShutdownInstance(instance_name=name,
+  return opcodes.OpInstanceShutdown(instance_name=name,
                                     timeout=opts.timeout,
                                     ignore_offline_nodes=opts.ignore_offline)
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1a53038..6770eda 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5124,7 +5124,7 @@ class LUInstanceReboot(LogicalUnit):
     self.cfg.MarkInstanceUp(instance.name)
 
 
-class LUShutdownInstance(LogicalUnit):
+class LUInstanceShutdown(LogicalUnit):
   """Shutdown an instance.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 6fb2859..198f361 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -838,7 +838,7 @@ class OpStartupInstance(OpCode):
     ]
 
 
-class OpShutdownInstance(OpCode):
+class OpInstanceShutdown(OpCode):
   """Shutdown an instance."""
   OP_ID = "OP_INSTANCE_SHUTDOWN"
   OP_DSC_FIELD = "instance_name"

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 96594b4..098da38 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1013,7 +1013,7 @@ class R_2_instances_name_shutdown(baserlib.R_Generic):
 
     """
     instance_name = self.items[0]
-    op = opcodes.OpShutdownInstance(instance_name=instance_name,
+    op = opcodes.OpInstanceShutdown(instance_name=instance_name,
                                     dry_run=bool(self.dryRun()))
 
     return baserlib.SubmitJob([op])
@@ -1032,7 +1032,7 @@ def _ParseInstanceReinstallRequest(name, data):
   osparams = baserlib.CheckParameter(data, "osparams", default=None)
 
   ops = [
-    opcodes.OpShutdownInstance(instance_name=name),
+    opcodes.OpInstanceShutdown(instance_name=name),
     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 d010018..fc0158c 100755 (executable)
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -366,7 +366,7 @@ class TestParseInstanceReinstallRequest(testutils.GanetiTestCase):
 
   def _Check(self, ops, name):
     expcls = [
-      opcodes.OpShutdownInstance,
+      opcodes.OpInstanceShutdown,
       opcodes.OpInstanceReinstall,
       opcodes.OpStartupInstance,
       ]

diff --git a/tools/burnin b/tools/burnin
index 3a68610..1c493ed 100755 (executable)
--- a/tools/burnin
+++ b/tools/burnin
@@ -752,7 +752,7 @@ class Burner(object):
   @staticmethod
   def StopInstanceOp(instance):
     """Stop given instance."""
-    return opcodes.OpShutdownInstance(instance_name=instance)
+    return opcodes.OpInstanceShutdown(instance_name=instance)
 
   @staticmethod
   def StartInstanceOp(instance):