Revision b003b8c0

b/htools/Ganeti/HTools/IAlloc.hs
70 70
  vcpus <- extract "vcpus"
71 71
  tags  <- extract "tags"
72 72
  dt    <- extract "disk_template"
73
  return (n, Instance.create n mem disk vcpus Running tags True 0 0 dt 1)
73
  su    <- extract "spindle_usage"
74
  return (n, Instance.create n mem disk vcpus Running tags True 0 0 dt su)
74 75

  
75 76
-- | Parses an instance as found in the cluster instance list.
76 77
parseInstance :: NameAssoc -- ^ The node name-to-index association list
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)
b/htools/Ganeti/HTools/Rapi.hs
123 123
  tags <- extract "tags" a
124 124
  auto_balance <- extract "auto_balance" beparams
125 125
  dt <- extract "disk_template" a
126
  su <- extract "spindle_usage" beparams
126 127
  let inst = Instance.create name mem disk vcpus running tags
127
             auto_balance pnode snode dt 1
128
             auto_balance pnode snode dt su
128 129
  return (name, inst)
129 130

  
130 131
-- | Construct a node from a JSON object.

Also available in: Unified diff