Revision f25b8f58 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 14571 | 14571 |
|
| 14572 | 14572 |
data["nodegroups"] = self._ComputeNodeGroupData(cfg) |
| 14573 | 14573 |
|
| 14574 |
config_ndata = self._ComputeBasicNodeData(ninfo) |
|
| 14574 |
config_ndata = self._ComputeBasicNodeData(cfg, ninfo)
|
|
| 14575 | 14575 |
data["nodes"] = self._ComputeDynamicNodeData(ninfo, node_data, node_iinfo, |
| 14576 | 14576 |
i_list, config_ndata) |
| 14577 | 14577 |
assert len(data["nodes"]) == len(ninfo), \ |
| ... | ... | |
| 14597 | 14597 |
return ng |
| 14598 | 14598 |
|
| 14599 | 14599 |
@staticmethod |
| 14600 |
def _ComputeBasicNodeData(node_cfg): |
|
| 14600 |
def _ComputeBasicNodeData(cfg, node_cfg):
|
|
| 14601 | 14601 |
"""Compute global node data. |
| 14602 | 14602 |
|
| 14603 | 14603 |
@rtype: dict |
| ... | ... | |
| 14615 | 14615 |
"group": ninfo.group, |
| 14616 | 14616 |
"master_capable": ninfo.master_capable, |
| 14617 | 14617 |
"vm_capable": ninfo.vm_capable, |
| 14618 |
"ndparams": cfg.GetNdParams(ninfo), |
|
| 14618 | 14619 |
}) |
| 14619 | 14620 |
for ninfo in node_cfg.values()) |
| 14620 | 14621 |
|
Also available in: Unified diff