Rename OpDestroyCluster and LUDestroyCluster

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

diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 6a6efeb..3f45a5b 100644 (file)
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -166,7 +166,7 @@ def DestroyCluster(opts, args):
              " destroy this cluster, supply the --yes-do-it option.")
     return 1
 
-  op = opcodes.OpDestroyCluster()
+  op = opcodes.OpClusterDestroy()
   master = SubmitOpCode(op, opts=opts)
   # if we reached this, the opcode didn't fail; we can proceed to
   # shutdown all the daemons

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e00262f..1aac802 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1111,7 +1111,7 @@ class LUPostInitCluster(LogicalUnit):
     return True
 
 
-class LUDestroyCluster(LogicalUnit):
+class LUClusterDestroy(LogicalUnit):
   """Logical unit for destroying the cluster.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 1ac573b..24c8bdd 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -381,7 +381,7 @@ class OpPostInitCluster(OpCode):
   OP_ID = "OP_CLUSTER_POST_INIT"
 
 
-class OpDestroyCluster(OpCode):
+class OpClusterDestroy(OpCode):
   """Destroy the cluster.
 
   This opcode has no other parameters. All the state is irreversibly