From 4d1baa51dcc941873d8294fc9d468309f062ec51 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:56:09 +0100
Subject: [PATCH] Rename OpRemoveGroup and LURemoveGroup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/client/gnt_group.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 9ec8cd408..e0f2c4260 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -161,7 +161,7 @@ def RemoveGroup(opts, args):
"""
(group_name,) = args
- op = opcodes.OpRemoveGroup(group_name=group_name)
+ op = opcodes.OpGroupRemove(group_name=group_name)
SubmitOpCode(op, opts=opts)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c3c675ce3..7736416b9 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -10252,7 +10252,7 @@ class LUSetGroupParams(LogicalUnit):
-class LURemoveGroup(LogicalUnit):
+class LUGroupRemove(LogicalUnit):
HPATH = "group-remove"
HTYPE = constants.HTYPE_GROUP
REQ_BGL = False
diff --git a/lib/opcodes.py b/lib/opcodes.py
index f35c3a757..d9d67baf3 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1059,7 +1059,7 @@ class OpSetGroupParams(OpCode):
]
-class OpRemoveGroup(OpCode):
+class OpGroupRemove(OpCode):
"""Remove a node group from the cluster."""
OP_ID = "OP_GROUP_REMOVE"
OP_DSC_FIELD = "group_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 4c378dbf0..99561027d 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -614,7 +614,7 @@ class R_2_groups_name(baserlib.R_Generic):
"""Delete a node group.
"""
- op = opcodes.OpRemoveGroup(group_name=self.items[0],
+ op = opcodes.OpGroupRemove(group_name=self.items[0],
dry_run=bool(self.dryRun()))
return baserlib.SubmitJob([op])
--
GitLab