As discussed offline, I've renamed *AssignNodes to *AssignGroupNodes:
diff --git lib/client/gnt_group.py lib/client/gnt_group.py
index b78a696..9b14c25 100644
--- lib/client/gnt_group.py
+++ lib/client/gnt_group.py
@@ -63,8 +63,8 @@ def AssignNodes(opts, args):
group_name = args[0]
node_names = args[1:]
- op = opcodes.OpAssignNodes(group_name=group_name, nodes=node_names,
- force=opts.force)
+ op = opcodes.OpAssignGroupNodes(group_name=group_name, nodes=node_names,
+ force=opts.force)
SubmitOpCode(op, opts=opts)
diff --git lib/cmdlib.py lib/cmdlib.py
index e2d9566..c95c18f 100644
--- lib/cmdlib.py
+++ lib/cmdlib.py
@@ -9953,7 +9953,7 @@ class LUAddGroup(LogicalUnit):
del self.remove_locks[locking.LEVEL_NODEGROUP]
-class LUAssignNodes(NoHooksLU):
+class LUAssignGroupNodes(NoHooksLU):
"""Logical unit for assigning nodes to groups.
"""
diff --git lib/mcpu.py lib/mcpu.py
index 1896384..f221d89 100644
--- lib/mcpu.py
+++ lib/mcpu.py
@@ -190,7 +190,7 @@ class Processor(object):
opcodes.OpGrowDisk: cmdlib.LUGrowDisk,
# node group lu
opcodes.OpAddGroup: cmdlib.LUAddGroup,
- opcodes.OpAssignNodes: cmdlib.LUAssignNodes,
+ opcodes.OpAssignGroupNodes: cmdlib.LUAssignGroupNodes,
opcodes.OpQueryGroups: cmdlib.LUQueryGroups,
opcodes.OpSetGroupParams: cmdlib.LUSetGroupParams,
opcodes.OpRemoveGroup: cmdlib.LURemoveGroup,
diff --git lib/opcodes.py lib/opcodes.py
index 03f6000..83fd49e 100644
--- lib/opcodes.py
+++ lib/opcodes.py
@@ -1024,7 +1024,7 @@ class OpAddGroup(OpCode):
]
-class OpAssignNodes(OpCode):
+class OpAssignGroupNodes(OpCode):
"""Assign nodes to a node group."""
OP_ID = "OP_ASSIGN_NODES"
OP_DSC_FIELD = "group_name"
diff --git test/ganeti.cmdlib_unittest.py test/ganeti.cmdlib_unittest.py
index d747c61..d39fbb0 100755
--- test/ganeti.cmdlib_unittest.py
+++ test/ganeti.cmdlib_unittest.py
@@ -157,7 +157,7 @@ class TestLUQuery(unittest.TestCase):
"xyz")
-class TestLUAssignNodes(unittest.TestCase):
+class TestLUAssignGroupNodes(unittest.TestCase):
def testCheckAssignmentForSplitInstances(self):
node_data = dict((name, objects.Node(name=name, group=group))
@@ -190,18 +190,19 @@ class TestLUAssignNodes(unittest.TestCase):
# Test first with the existing state.
(new, prev) = \
- cmdlib.LUAssignNodes.CheckAssignmentForSplitInstances([],
- node_data,
- instance_data)
+ cmdlib.LUAssignGroupNodes.CheckAssignmentForSplitInstances([],
+ node_data,
+ instance_data)
self.assertEqual([], new)
self.assertEqual(set(["inst3b", "inst3c"]), set(prev))
# And now some changes.
(new, prev) = \
- cmdlib.LUAssignNodes.CheckAssignmentForSplitInstances([("n1b", "g3")],
- node_data,
- instance_data)
+ cmdlib.LUAssignGroupNodes.CheckAssignmentForSplitInstances([("n1b",
+ "g3")],
+ node_data,
+ instance_data)
self.assertEqual(set(["inst1a", "inst1b"]), set(new))
self.assertEqual(set(["inst3c"]), set(prev))
--
Adeodato Simo | [email protected]
Corp Computing Services SRE (Dublin)
