From 246e180a111750fc3316062bba262152dd6718b4 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 14 Sep 2007 09:54:47 +0000
Subject: [PATCH] Change OpQueryNodes nodes attribute to names
Change this to have the exact same parameters as OpQueryInstances.
Also fix burnin which is broken since r146.
Reviewed-by: imsnah
---
lib/cmdlib.py | 6 +++---
lib/opcodes.py | 2 +-
scripts/gnt-node | 4 ++--
tools/burnin | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e8379d64a..cedcf9659 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1129,7 +1129,7 @@ class LUQueryNodes(NoHooksLU):
"""Logical unit for querying nodes.
"""
- _OP_REQP = ["output_fields", "nodes"]
+ _OP_REQP = ["output_fields", "names"]
def CheckPrereq(self):
"""Check prerequisites.
@@ -1146,13 +1146,13 @@ class LUQueryNodes(NoHooksLU):
dynamic=self.dynamic_fields,
selected=self.op.output_fields)
- self.wanted_nodes = _GetWantedNodes(self, self.op.nodes)
+ self.wanted = _GetWantedNodes(self, self.op.names)
def Exec(self, feedback_fn):
"""Computes the list of nodes and their attributes.
"""
- nodenames = self.wanted_nodes
+ nodenames = self.wanted
nodelist = [self.cfg.GetNodeInfo(name) for name in nodenames]
# begin data gathering
diff --git a/lib/opcodes.py b/lib/opcodes.py
index c306ec39f..c53504ade 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -113,7 +113,7 @@ class OpAddNode(OpCode):
class OpQueryNodes(OpCode):
"""Compute the list of nodes."""
OP_ID = "OP_NODE_QUERY"
- __slots__ = ["output_fields", "nodes"]
+ __slots__ = ["output_fields", "names"]
class OpQueryNodeVolumes(OpCode):
diff --git a/scripts/gnt-node b/scripts/gnt-node
index 80cff7dc6..ab4e16915 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -45,7 +45,7 @@ def ListNodes(opts, args):
else:
selected_fields = opts.output.split(",")
- op = opcodes.OpQueryNodes(output_fields=selected_fields, nodes=[])
+ op = opcodes.OpQueryNodes(output_fields=selected_fields, names=[])
output = SubmitOpCode(op)
if not opts.no_headers:
@@ -93,7 +93,7 @@ def ShowNodeConfig(opts, args):
"""
op = opcodes.OpQueryNodes(output_fields=["name", "pip", "sip",
"pinst_list", "sinst_list"],
- nodes=args)
+ names=args)
result = SubmitOpCode(op)
for name, primary_ip, secondary_ip, pinst, sinst in result:
diff --git a/tools/burnin b/tools/burnin
index 7661a96dc..d7c067958 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -82,8 +82,8 @@ def BurninCluster(opts, args):
logger.SetupLogging(debug=True, program="ganeti/burnin")
proc = mcpu.Processor()
- result = proc.ExecOpCode(opcodes.OpQueryNodes(output_fields=["name"]),
- Feedback)
+ result = proc.ExecOpCode(opcodes.OpQueryNodes(output_fields=["name"],
+ names=[]), Feedback)
nodelist = [data[0] for data in result]
Feedback("- Testing global parameters")
--
GitLab