From a6682fdcc173998be87b77043bfa56c0d12b1ca4 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:56:01 +0100
Subject: [PATCH] Rename OpSetClusterParams and LUSetClusterParams
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>
---
doc/design-2.2.rst | 2 +-
lib/client/gnt_cluster.py | 2 +-
lib/client/gnt_os.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/design-2.2.rst b/doc/design-2.2.rst
index 1eb0ee3e5..79163728a 100644
--- a/doc/design-2.2.rst
+++ b/doc/design-2.2.rst
@@ -716,7 +716,7 @@ hidden from the user and respectively the list of OSes which are
blacklisted from new installations.
These lists will be modifiable via ``gnt-os modify`` (implemented via
-``OpSetClusterParams``), such that even not-yet-existing OSes can be
+``OpClusterSetParams``), such that even not-yet-existing OSes can be
preseeded into a given state.
For the hidden OSes, they are fully functional except that they are not
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 924072ab3..de5a60dfb 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -789,7 +789,7 @@ def SetClusterParams(opts, args):
else:
opts.reserved_lvs = utils.UnescapeAndSplit(opts.reserved_lvs, sep=",")
- op = opcodes.OpSetClusterParams(vg_name=vg_name,
+ op = opcodes.OpClusterSetParams(vg_name=vg_name,
drbd_helper=drbd_helper,
enabled_hypervisors=hvlist,
hvparams=hvparams,
diff --git a/lib/client/gnt_os.py b/lib/client/gnt_os.py
index 9808d5ee1..3095a9e35 100644
--- a/lib/client/gnt_os.py
+++ b/lib/client/gnt_os.py
@@ -269,7 +269,7 @@ def ModifyOS(opts, args):
" must be passed")
return 1
- op = opcodes.OpSetClusterParams(os_hvp=os_hvp,
+ op = opcodes.OpClusterSetParams(os_hvp=os_hvp,
osparams=osp,
hidden_os=ohid,
blacklisted_os=oblk)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a98b0278b..2f248fda3 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2649,7 +2649,7 @@ class LUClusterRename(LogicalUnit):
return clustername
-class LUSetClusterParams(LogicalUnit):
+class LUClusterSetParams(LogicalUnit):
"""Change the parameters of the cluster.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index a5bb5a547..b8d4bfde9 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -486,7 +486,7 @@ class OpClusterRename(OpCode):
]
-class OpSetClusterParams(OpCode):
+class OpClusterSetParams(OpCode):
"""Change the parameters of the cluster.
@type vg_name: C{str} or C{None}
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 9dc165e34..e54509ee4 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -198,7 +198,7 @@ class R_2_cluster_modify(baserlib.R_Generic):
@return: a job id
"""
- op = baserlib.FillOpcode(opcodes.OpSetClusterParams, self.request_body,
+ op = baserlib.FillOpcode(opcodes.OpClusterSetParams, self.request_body,
None)
return baserlib.SubmitJob([op])
--
GitLab