Revision 6286519f
| b/lib/cmdlib.py | ||
|---|---|---|
| 4849 | 4849 |
"version": 1, |
| 4850 | 4850 |
"cluster_name": self.sstore.GetClusterName(), |
| 4851 | 4851 |
"cluster_tags": list(cfg.GetClusterInfo().GetTags()), |
| 4852 |
"hypervisor_type": self.sstore.GetHypervisorType(), |
|
| 4852 | 4853 |
# we don't have job IDs |
| 4853 | 4854 |
} |
| 4854 | 4855 |
|
| 4856 |
i_list = [cfg.GetInstanceInfo(iname) for iname in cfg.GetInstanceList()] |
|
| 4857 |
|
|
| 4855 | 4858 |
# node data |
| 4856 | 4859 |
node_results = {}
|
| 4857 | 4860 |
node_list = cfg.GetNodeList() |
| ... | ... | |
| 4871 | 4874 |
except ValueError, err: |
| 4872 | 4875 |
raise errors.OpExecError("Node '%s' returned invalid value for '%s':"
|
| 4873 | 4876 |
" %s" % (nname, attr, str(err))) |
| 4877 |
# compute memory used by primary instances |
|
| 4878 |
i_p_mem = i_p_up_mem = 0 |
|
| 4879 |
for iinfo in i_list: |
|
| 4880 |
if iinfo.primary_node == nname: |
|
| 4881 |
i_p_mem += iinfo.memory |
|
| 4882 |
if iinfo.status == "up": |
|
| 4883 |
i_p_up_mem += iinfo.memory |
|
| 4884 |
|
|
| 4874 | 4885 |
# compute memory used by instances |
| 4875 | 4886 |
pnr = {
|
| 4876 | 4887 |
"tags": list(ninfo.GetTags()), |
| 4877 | 4888 |
"total_memory": remote_info['memory_total'], |
| 4878 | 4889 |
"reserved_memory": remote_info['memory_dom0'], |
| 4879 | 4890 |
"free_memory": remote_info['memory_free'], |
| 4891 |
"i_pri_memory": i_p_mem, |
|
| 4892 |
"i_pri_up_memory": i_p_up_mem, |
|
| 4880 | 4893 |
"total_disk": remote_info['vg_size'], |
| 4881 | 4894 |
"free_disk": remote_info['vg_free'], |
| 4882 | 4895 |
"primary_ip": ninfo.primary_ip, |
| ... | ... | |
| 4887 | 4900 |
|
| 4888 | 4901 |
# instance data |
| 4889 | 4902 |
instance_data = {}
|
| 4890 |
i_list = cfg.GetInstanceList() |
|
| 4891 |
for iname in i_list: |
|
| 4892 |
iinfo = cfg.GetInstanceInfo(iname) |
|
| 4903 |
for iinfo in i_list: |
|
| 4893 | 4904 |
nic_data = [{"mac": n.mac, "ip": n.ip, "bridge": n.bridge}
|
| 4894 | 4905 |
for n in iinfo.nics] |
| 4895 | 4906 |
pir = {
|
Also available in: Unified diff