Revision b003b8c0 htools/Ganeti/HTools/Luxi.hs

b/htools/Ganeti/HTools/Luxi.hs
106 106
queryInstancesMsg =
107 107
  L.Query L.QRInstance ["name", "disk_usage", "be/memory", "be/vcpus",
108 108
                        "status", "pnode", "snodes", "tags", "oper_ram",
109
                        "be/auto_balance", "disk_template"] ()
109
                        "be/auto_balance", "disk_template",
110
                        "be/spindle_usage"] ()
110 111

  
111 112
-- | The input data for cluster query.
112 113
queryClusterInfoMsg :: L.LuxiOp
......
145 146
              -> Result (String, Instance.Instance)
146 147
parseInstance ktn [ name, disk, mem, vcpus
147 148
                  , status, pnode, snodes, tags, oram
148
                  , auto_balance, disk_template ] = do
149
                  , auto_balance, disk_template, su ] = do
149 150
  xname <- annotateResult "Parsing new instance" (fromJValWithStatus name)
150 151
  let convert a = genericConvert "Instance" xname a
151 152
  xdisk <- convert "disk_usage" disk
......
162 163
  xtags <- convert "tags" tags
163 164
  xauto_balance <- convert "auto_balance" auto_balance
164 165
  xdt <- convert "disk_template" disk_template
166
  xsu <- convert "be/spindle_usage" su
165 167
  let inst = Instance.create xname xmem xdisk xvcpus
166
             xrunning xtags xauto_balance xpnode snode xdt 1
168
             xrunning xtags xauto_balance xpnode snode xdt xsu
167 169
  return (xname, inst)
168 170

  
169 171
parseInstance _ v = fail ("Invalid instance query result: " ++ show v)

Also available in: Unified diff