Revision acd34ea7 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 10185 | 10185 |
i_list = [(inst, cluster_info.FillBE(inst)) for inst in iinfo] |
| 10186 | 10186 |
|
| 10187 | 10187 |
# node data |
| 10188 |
node_results = {}
|
|
| 10189 | 10188 |
node_list = cfg.GetNodeList() |
| 10190 | 10189 |
|
| 10191 | 10190 |
if self.mode == constants.IALLOCATOR_MODE_ALLOC: |
| ... | ... | |
| 10200 | 10199 |
node_iinfo = \ |
| 10201 | 10200 |
self.rpc.call_all_instances_info(node_list, |
| 10202 | 10201 |
cluster_info.enabled_hypervisors) |
| 10202 |
|
|
| 10203 |
data["nodes"] = self._ComputeNodeData(cfg, node_data, node_iinfo, i_list) |
|
| 10204 |
|
|
| 10205 |
data["instances"] = self._ComputeInstanceData(cluster_info, i_list) |
|
| 10206 |
|
|
| 10207 |
self.in_data = data |
|
| 10208 |
|
|
| 10209 |
@staticmethod |
|
| 10210 |
def _ComputeNodeData(cfg, node_data, node_iinfo, i_list): |
|
| 10211 |
"""Compute global node data. |
|
| 10212 |
|
|
| 10213 |
""" |
|
| 10214 |
node_results = {}
|
|
| 10203 | 10215 |
for nname, nresult in node_data.items(): |
| 10204 | 10216 |
# first fill in static (config-based) values |
| 10205 | 10217 |
ninfo = cfg.GetNodeInfo(nname) |
| ... | ... | |
| 10256 | 10268 |
pnr.update(pnr_dyn) |
| 10257 | 10269 |
|
| 10258 | 10270 |
node_results[nname] = pnr |
| 10259 |
data["nodes"] = node_results |
|
| 10260 | 10271 |
|
| 10261 |
# instance data |
|
| 10272 |
return node_results |
|
| 10273 |
|
|
| 10274 |
@staticmethod |
|
| 10275 |
def _ComputeInstanceData(cluster_info, i_list): |
|
| 10276 |
"""Compute global instance data. |
|
| 10277 |
|
|
| 10278 |
""" |
|
| 10262 | 10279 |
instance_data = {}
|
| 10263 | 10280 |
for iinfo, beinfo in i_list: |
| 10264 | 10281 |
nic_data = [] |
| ... | ... | |
| 10288 | 10305 |
pir["disks"]) |
| 10289 | 10306 |
instance_data[iinfo.name] = pir |
| 10290 | 10307 |
|
| 10291 |
data["instances"] = instance_data |
|
| 10292 |
|
|
| 10293 |
self.in_data = data |
|
| 10308 |
return instance_data |
|
| 10294 | 10309 |
|
| 10295 | 10310 |
def _AddNewInstance(self): |
| 10296 | 10311 |
"""Add new instance data to allocator structure. |
Also available in: Unified diff