Revision a7ba5e53 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
165 | 165 |
|
166 | 166 |
|
167 | 167 |
def _GetWantedNodes(lu, nodes): |
168 |
"""Returns list of checked and expanded nodes. |
|
168 |
"""Returns list of checked and expanded node names.
|
|
169 | 169 |
|
170 | 170 |
Args: |
171 | 171 |
nodes: List of nodes (strings) or None for all |
... | ... | |
178 | 178 |
wanted = [] |
179 | 179 |
|
180 | 180 |
for name in nodes: |
181 |
node = lu.cfg.GetNodeInfo(lu.cfg.ExpandNodeName(name))
|
|
181 |
node = lu.cfg.ExpandNodeName(name)
|
|
182 | 182 |
if node is None: |
183 | 183 |
raise errors.OpPrereqError("No such node name '%s'" % name) |
184 | 184 |
wanted.append(node) |
185 | 185 |
|
186 | 186 |
else: |
187 |
wanted = [lu.cfg.GetNodeInfo(name) for name in lu.cfg.GetNodeList()]
|
|
188 |
return wanted
|
|
187 |
wanted = lu.cfg.GetNodeList()
|
|
188 |
return utils.NiceSort(wanted)
|
|
189 | 189 |
|
190 | 190 |
|
191 | 191 |
def _GetWantedInstances(lu, instances): |
192 |
"""Returns list of checked and expanded instances. |
|
192 |
"""Returns list of checked and expanded instance names.
|
|
193 | 193 |
|
194 | 194 |
Args: |
195 | 195 |
instances: List of instances (strings) or None for all |
... | ... | |
202 | 202 |
wanted = [] |
203 | 203 |
|
204 | 204 |
for name in instances: |
205 |
instance = lu.cfg.GetInstanceInfo(lu.cfg.ExpandInstanceName(name))
|
|
205 |
instance = lu.cfg.ExpandInstanceName(name)
|
|
206 | 206 |
if instance is None: |
207 | 207 |
raise errors.OpPrereqError("No such instance name '%s'" % name) |
208 | 208 |
wanted.append(instance) |
209 | 209 |
|
210 | 210 |
else: |
211 |
wanted = [lu.cfg.GetInstanceInfo(name) |
|
212 |
for name in lu.cfg.GetInstanceList()] |
|
213 |
return wanted |
|
211 |
wanted = lu.cfg.GetInstanceList() |
|
212 |
return utils.NiceSort(wanted) |
|
214 | 213 |
|
215 | 214 |
|
216 | 215 |
def _CheckOutputFields(static, dynamic, selected): |
... | ... | |
1236 | 1235 |
"""Computes the list of nodes and their attributes. |
1237 | 1236 |
|
1238 | 1237 |
""" |
1239 |
nodenames = utils.NiceSort([node.name for node in self.nodes])
|
|
1238 |
nodenames = self.nodes
|
|
1240 | 1239 |
volumes = rpc.call_node_volumes(nodenames) |
1241 | 1240 |
|
1242 | 1241 |
ilist = [self.cfg.GetInstanceInfo(iname) for iname |
... | ... | |
1634 | 1633 |
|
1635 | 1634 |
myname = socket.gethostname() |
1636 | 1635 |
|
1637 |
for node in [node.name for node in self.nodes]:
|
|
1636 |
for node in self.nodes:
|
|
1638 | 1637 |
if node == myname: |
1639 | 1638 |
continue |
1640 | 1639 |
if not ssh.CopyFileToNode(node, filename): |
... | ... | |
1680 | 1679 |
""" |
1681 | 1680 |
data = [] |
1682 | 1681 |
for node in self.nodes: |
1683 |
result = ssh.SSHCall(node.name, "root", self.op.command)
|
|
1684 |
data.append((node.name, result.output, result.exit_code))
|
|
1682 |
result = ssh.SSHCall(node, "root", self.op.command) |
|
1683 |
data.append((node, result.output, result.exit_code)) |
|
1685 | 1684 |
|
1686 | 1685 |
return data |
1687 | 1686 |
|
... | ... | |
3321 | 3320 |
ilist = [self.cfg.GetInstanceInfo(iname) for iname |
3322 | 3321 |
in self.cfg.GetInstanceList()] |
3323 | 3322 |
result = [] |
3324 |
for node in self.wanted_nodes:
|
|
3323 |
for node in [self.cfg.GetNodeInfo(name) for name in self.wanted_nodes]:
|
|
3325 | 3324 |
result.append((node.name, node.primary_ip, node.secondary_ip, |
3326 | 3325 |
[inst.name for inst in ilist |
3327 | 3326 |
if inst.primary_node == node.name], |
... | ... | |
3453 | 3452 |
that node. |
3454 | 3453 |
|
3455 | 3454 |
""" |
3456 |
return rpc.call_export_list([node.name for node in self.nodes])
|
|
3455 |
return rpc.call_export_list(self.nodes)
|
|
3457 | 3456 |
|
3458 | 3457 |
|
3459 | 3458 |
class LUExportInstance(LogicalUnit): |
Also available in: Unified diff