Rename OpQueryGroups and LUQueryGroups

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

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c5cba85..c3c675c 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10166,7 +10166,7 @@ class _GroupQuery(_QueryBase):
                                 group_to_nodes, group_to_instances)
 
 
-class LUQueryGroups(NoHooksLU):
+class LUGroupQuery(NoHooksLU):
   """Logical unit for querying node groups.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 80d0f7c..f35c3a7 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1038,7 +1038,7 @@ class OpGroupAssignNodes(OpCode):
     ]
 
 
-class OpQueryGroups(OpCode):
+class OpGroupQuery(OpCode):
   """Compute the list of node groups."""
   OP_ID = "OP_GROUP_QUERY"
   OP_PARAMS = [

diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index c7d953d..3f2aea1 100644 (file)
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -298,7 +298,7 @@ class ClientOps:
       if use_locking:
         raise errors.OpPrereqError("Sync queries are not allowed",
                                    errors.ECODE_INVAL)
-      op = opcodes.OpQueryGroups(names=names, output_fields=fields)
+      op = opcodes.OpGroupQuery(names=names, output_fields=fields)
       return self._Query(op)
 
     elif method == luxi.REQ_QUERY_EXPORTS: