From f13973c48dd77515a7f4300a7751a9ca517c6729 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 13:06:57 +0100
Subject: [PATCH] Rename OpSetNodeParams and LUSetNodeParams
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>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/client/gnt_node.py | 4 ++--
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index ec33caa78..b2ab0b9bd 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -488,7 +488,7 @@ def PowerNode(opts, args):
opcodelist = []
if oob_command == constants.OOB_POWER_OFF:
- opcodelist.append(opcodes.OpSetNodeParams(node_name=node, offline=True,
+ opcodelist.append(opcodes.OpNodeSetParams(node_name=node, offline=True,
auto_promote=opts.auto_promote))
opcodelist.append(opcodes.OpOobCommand(node_name=node, command=oob_command))
@@ -680,7 +680,7 @@ def SetNodeParams(opts, args):
ToStderr("Please give at least one of the parameters.")
return 1
- op = opcodes.OpSetNodeParams(node_name=args[0],
+ op = opcodes.OpNodeSetParams(node_name=args[0],
master_candidate=opts.master_candidate,
offline=opts.offline,
drained=opts.drained,
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index ae6c5cb6f..8298ad549 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4191,7 +4191,7 @@ class LUNodeAdd(LogicalUnit):
self.context.AddNode(new_node, self.proc.GetECId())
-class LUSetNodeParams(LogicalUnit):
+class LUNodeSetParams(LogicalUnit):
"""Modifies the parameters of a node.
@cvar _F2R: a dictionary from tuples of flags (mc, drained, offline)
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 0257be40b..027b26519 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -691,7 +691,7 @@ class OpRepairNodeStorage(OpCode):
]
-class OpSetNodeParams(OpCode):
+class OpNodeSetParams(OpCode):
"""Change the parameters of a node."""
OP_ID = "OP_NODE_SET_PARAMS"
OP_DSC_FIELD = "node_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index ce72460e9..db1c357c5 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -395,7 +395,7 @@ class R_2_nodes_name_role(baserlib.R_Generic):
else:
raise http.HttpBadRequest("Can't set '%s' role" % role)
- op = opcodes.OpSetNodeParams(node_name=node_name,
+ op = opcodes.OpNodeSetParams(node_name=node_name,
master_candidate=candidate,
offline=offline,
drained=drained,
--
GitLab