Revision f43c898d

b/lib/masterd/iallocator.py
657 657 
          "free_spindles": free_spindles,
658 658 
          "total_cpus": self._GetAttributeFromHypervisorNodeData(
659 659 
              hv_info, ninfo.name, "cpu_total"),
660 
          "reserved_cpus": self._GetAttributeFromHypervisorNodeData(
661 
            hv_info, ninfo.name, "cpu_dom0"),
660 662 
          "i_pri_memory": i_p_mem,
661 663 
          "i_pri_up_memory": i_p_up_mem,
662 664 
          }
b/lib/query.py
1154 1154 
             " for detecting reboots by tracking changes"),
1155 1155 
  "cnodes": ("CNodes", QFT_NUMBER, "cpu_nodes",
1156 1156 
             "Number of NUMA domains on node (if exported by hypervisor)"),
1157 
  "cnos": ("CNOs", QFT_NUMBER, "cpu_dom0",
1158 
            "Number of logical processors used by the node OS (dom0 for Xen)"),
1157 1159 
  "csockets": ("CSockets", QFT_NUMBER, "cpu_sockets",
1158 1160 
               "Number of physical CPU sockets (if exported by hypervisor)"),
1159 1161 
  "ctotal": ("CTotal", QFT_NUMBER, "cpu_total", "Number of logical processors"),
b/lib/rapi/rlib2.py
84 84 
            "dtotal", "dfree", "sptotal", "spfree",
85 85 
            "mtotal", "mnode", "mfree",
86 86 
            "pinst_cnt", "sinst_cnt",
87 
            "ctotal", "cnodes", "csockets",
87 
            "ctotal", "cnos", "cnodes", "csockets",
88 88 
            "pip", "sip", "role",
89 89 
            "pinst_list", "sinst_list",
90 90 
            "master_capable", "vm_capable",
b/src/Ganeti/Query/Node.hs
57 57 
     \ for detecting reboots by tracking changes")
58 58 
  , ("cnodes", "CNodes", QFTNumber, "cpu_nodes",
59 59 
     "Number of NUMA domains on node (if exported by hypervisor)")
60 
  , ("cnos", "CNOs", QFTNumber, "cpu_dom0",
61 
     "Number of logical processors used by the node OS (dom0 for Xen)")
60 62 
  , ("csockets", "CSockets", QFTNumber, "cpu_sockets",
61 63 
     "Number of physical CPU sockets (if exported by hypervisor)")
62 64 
  , ("ctotal", "CTotal", QFTNumber, "cpu_total",
......
84 86 
  J.showJSON $ rpcResNodeInfoBootId res
85 87 
nodeLiveFieldExtract "cnodes" res =
86 88 
  jsonHead (rpcResNodeInfoHvInfo res) hvInfoCpuNodes
89 
nodeLiveFieldExtract "cnos" res =
90 
  jsonHead (rpcResNodeInfoHvInfo res) hvInfoCpuDom0
87 91 
nodeLiveFieldExtract "csockets" res =
88 92 
  jsonHead (rpcResNodeInfoHvInfo res) hvInfoCpuSockets
89 93 
nodeLiveFieldExtract "ctotal" res =
b/src/Ganeti/Rpc.hs
357 357 
  , simpleField "cpu_total" [t| Int |]
358 358 
  , simpleField "cpu_nodes" [t| Int |]
359 359 
  , simpleField "cpu_sockets" [t| Int |]
360 
  , simpleField "cpu_dom0" [t| Int |]
360 361 
  ])
361 362 

  		





  362
  363
  
    
$(buildObject "RpcResultNodeInfo" "rpcResNodeInfo"


  		












  

    
      b/test/py/ganeti.query_unittest.py
    
  






  429
  429
  
    
    fake_live_data = {


  		





  430
  430
  
    
      "bootid": "a2504766-498e-4b25-b21e-d23098dc3af4",


  		





  431
  431
  
    
      "cnodes": 4,


  		





  
  432
  
    
      "cnos": 3,


  		





  432
  433
  
    
      "csockets": 4,


  		





  433
  434
  
    
      "ctotal": 8,


  		





  434
  435
  
    
      "mnode": 128,


  		












Also available in:
  Unified diff