Rename OpSetGroupParams and LUSetGroupParams

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 032e282..882bbcd 100644 (file)
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -138,7 +138,7 @@ def SetGroupParams(opts, args):
     ToStderr("Please give at least one of the parameters.")
     return 1
 
-  op = opcodes.OpSetGroupParams(group_name=args[0], # pylint: disable-msg=W0142
+  op = opcodes.OpGroupSetParams(group_name=args[0], # pylint: disable-msg=W0142
                                 **all_changes)
   result = SubmitOrSend(op, opts)
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 4fd22d1..e4591a2 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10182,7 +10182,7 @@ class LUGroupQuery(NoHooksLU):
     return self.gq.OldStyleQuery(self)
 
 
-class LUSetGroupParams(LogicalUnit):
+class LUGroupSetParams(LogicalUnit):
   """Modifies the parameters of a node group.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 395c9c4..e1c38a5 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1047,7 +1047,7 @@ class OpGroupQuery(OpCode):
     ]
 
 
-class OpSetGroupParams(OpCode):
+class OpGroupSetParams(OpCode):
   """Change the parameters of a node group."""
   OP_ID = "OP_GROUP_SET_PARAMS"
   OP_DSC_FIELD = "group_name"

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index cfa3b26..5b2f818 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -623,12 +623,12 @@ class R_2_groups_name(baserlib.R_Generic):
 def _ParseModifyGroupRequest(name, data):
   """Parses a request for modifying a node group.
 
-  @rtype: L{opcodes.OpSetGroupParams}
+  @rtype: L{opcodes.OpGroupSetParams}
   @return: Group modify opcode
 
   """
   alloc_policy = baserlib.CheckParameter(data, "alloc_policy", default=None)
-  return opcodes.OpSetGroupParams(group_name=name, alloc_policy=alloc_policy)
+  return opcodes.OpGroupSetParams(group_name=name, alloc_policy=alloc_policy)
 
 
 class R_2_groups_name_modify(baserlib.R_Generic):