Rename OpSetClusterParams and LUSetClusterParams

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/doc/design-2.2.rst b/doc/design-2.2.rst
index 1eb0ee3..7916372 100644 (file)
--- 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 924072a..de5a60d 100644 (file)
--- 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 9808d5e..3095a9e 100644 (file)
--- 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 a98b027..2f248fd 100644 (file)
--- 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 a5bb5a5..b8d4bfd 100644 (file)
--- 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 9dc165e..e54509e 100644 (file)
--- 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])