Rename OpRenameGroup and LURenameGroup

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 e0f2c42..032e282 100644 (file)
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -176,7 +176,7 @@ def RenameGroup(opts, args):
 
   """
   old_name, new_name = args
-  op = opcodes.OpRenameGroup(old_name=old_name, new_name=new_name)
+  op = opcodes.OpGroupRename(old_name=old_name, new_name=new_name)
   SubmitOpCode(op, opts=opts)
 
 

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7736416..4fd22d1 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10314,7 +10314,7 @@ class LUGroupRemove(LogicalUnit):
     self.remove_locks[locking.LEVEL_NODEGROUP] = self.group_uuid
 
 
-class LURenameGroup(LogicalUnit):
+class LUGroupRename(LogicalUnit):
   HPATH = "group-rename"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False

diff --git a/lib/opcodes.py b/lib/opcodes.py
index d9d67ba..395c9c4 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1068,7 +1068,7 @@ class OpGroupRemove(OpCode):
     ]
 
 
-class OpRenameGroup(OpCode):
+class OpGroupRename(OpCode):
   """Rename a node group in the cluster."""
   OP_ID = "OP_GROUP_RENAME"
   OP_DSC_FIELD = "old_name"

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 9956102..cfa3b26 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -658,14 +658,14 @@ def _ParseRenameGroupRequest(name, data, dry_run):
   @type dry_run: bool
   @param dry_run: whether to perform a dry run
 
-  @rtype: L{opcodes.OpRenameGroup}
+  @rtype: L{opcodes.OpGroupRename}
   @return: Node group rename opcode
 
   """
   old_name = name
   new_name = baserlib.CheckParameter(data, "new_name")
 
-  return opcodes.OpRenameGroup(old_name=old_name, new_name=new_name,
+  return opcodes.OpGroupRename(old_name=old_name, new_name=new_name,
                                dry_run=dry_run)
 
 

diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index e3cf6e9..606baf2 100755 (executable)
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -423,7 +423,7 @@ class TestParseRenameGroupRequest(testutils.GanetiTestCase):
 
     op = self.Parse(name, data, False)
 
-    self.assert_(isinstance(op, opcodes.OpRenameGroup))
+    self.assert_(isinstance(op, opcodes.OpGroupRename))
     self.assertEqual(op.old_name, name)
     self.assertEqual(op.new_name, "ua0aiyoo")
     self.assertFalse(op.dry_run)
@@ -436,7 +436,7 @@ class TestParseRenameGroupRequest(testutils.GanetiTestCase):
 
     op = self.Parse(name, data, True)
 
-    self.assert_(isinstance(op, opcodes.OpRenameGroup))
+    self.assert_(isinstance(op, opcodes.OpGroupRename))
     self.assertEqual(op.old_name, name)
     self.assertEqual(op.new_name, "ua0aiyoo")
     self.assert_(op.dry_run)