Rename OpRemoveGroup and LURemoveGroup

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

diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 9ec8cd4..e0f2c42 100644 (file)
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -161,7 +161,7 @@ def RemoveGroup(opts, args):
 
   """
   (group_name,) = args
-  op = opcodes.OpRemoveGroup(group_name=group_name)
+  op = opcodes.OpGroupRemove(group_name=group_name)
   SubmitOpCode(op, opts=opts)
 
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c3c675c..7736416 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10252,7 +10252,7 @@ class LUSetGroupParams(LogicalUnit):
 
 
 
-class LURemoveGroup(LogicalUnit):
+class LUGroupRemove(LogicalUnit):
   HPATH = "group-remove"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False

diff --git a/lib/opcodes.py b/lib/opcodes.py
index f35c3a7..d9d67ba 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1059,7 +1059,7 @@ class OpSetGroupParams(OpCode):
     ]
 
 
-class OpRemoveGroup(OpCode):
+class OpGroupRemove(OpCode):
   """Remove a node group from the cluster."""
   OP_ID = "OP_GROUP_REMOVE"
   OP_DSC_FIELD = "group_name"

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 4c378db..9956102 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -614,7 +614,7 @@ class R_2_groups_name(baserlib.R_Generic):
     """Delete a node group.
 
     """
-    op = opcodes.OpRemoveGroup(group_name=self.items[0],
+    op = opcodes.OpGroupRemove(group_name=self.items[0],
                                dry_run=bool(self.dryRun()))
 
     return baserlib.SubmitJob([op])