[PATCH devel-2.4 17/58] Rename OpAssignGroupNodes and LUAssignGroupNodes

[Iustin Pop]

From: Iustin Pop <ius...@google.com>

---
 lib/client/gnt_group.py        |    2 +-
 lib/cmdlib.py                  |    2 +-
 lib/opcodes.py                 |    2 +-
 lib/rapi/rlib2.py              |    2 +-
 test/ganeti.cmdlib_unittest.py |    6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index d3041ab..9ec8cd4 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -63,7 +63,7 @@ def AssignNodes(opts, args):
   group_name = args[0]
   node_names = args[1:]
 
-  op = opcodes.OpAssignGroupNodes(group_name=group_name, nodes=node_names,
+  op = opcodes.OpGroupAssignNodes(group_name=group_name, nodes=node_names,
                                   force=opts.force)
   SubmitOpCode(op, opts=opts)
 
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ecf0bc9..c5cba85 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -9975,7 +9975,7 @@ class LUGroupAdd(LogicalUnit):
     del self.remove_locks[locking.LEVEL_NODEGROUP]
 
 
-class LUAssignGroupNodes(NoHooksLU):
+class LUGroupAssignNodes(NoHooksLU):
   """Logical unit for assigning nodes to groups.
 
   """
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 4f6ed28..80d0f7c 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1027,7 +1027,7 @@ class OpGroupAdd(OpCode):
     ]
 
 
-class OpAssignGroupNodes(OpCode):
+class OpGroupAssignNodes(OpCode):
   """Assign nodes to a node group."""
   OP_ID = "OP_GROUP_ASSIGN_NODES"
   OP_DSC_FIELD = "group_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index d1bd1c0..4c378db 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -695,7 +695,7 @@ class R_2_groups_name_assign_nodes(baserlib.R_Generic):
     @return: a job id
 
     """
-    op = baserlib.FillOpcode(opcodes.OpAssignGroupNodes, self.request_body, {
+    op = baserlib.FillOpcode(opcodes.OpGroupAssignNodes, self.request_body, {
       "group_name": self.items[0],
       "dry_run": self.dryRun(),
       "force": self.useForce(),
diff --git a/test/ganeti.cmdlib_unittest.py b/test/ganeti.cmdlib_unittest.py
index c967458..65a08fe 100755
--- a/test/ganeti.cmdlib_unittest.py
+++ b/test/ganeti.cmdlib_unittest.py
@@ -157,7 +157,7 @@ class TestLUQuery(unittest.TestCase):
                       "xyz")
 
 
-class TestLUAssignGroupNodes(unittest.TestCase):
+class TestLUGroupAssignNodes(unittest.TestCase):
 
   def testCheckAssignmentForSplitInstances(self):
     node_data = dict((name, objects.Node(name=name, group=group))
@@ -190,7 +190,7 @@ class TestLUAssignGroupNodes(unittest.TestCase):
 
     # Test first with the existing state.
     (new, prev) = \
-      cmdlib.LUAssignGroupNodes.CheckAssignmentForSplitInstances([],
+      cmdlib.LUGroupAssignNodes.CheckAssignmentForSplitInstances([],
                                                                  node_data,
                                                                  instance_data)
 
@@ -199,7 +199,7 @@ class TestLUAssignGroupNodes(unittest.TestCase):
 
     # And now some changes.
     (new, prev) = \
-      cmdlib.LUAssignGroupNodes.CheckAssignmentForSplitInstances([("n1b",
+      cmdlib.LUGroupAssignNodes.CheckAssignmentForSplitInstances([("n1b",
                                                                    "g3")],
                                                                  node_data,
                                                                  instance_data)
-- 
1.7.2.3