Revision 6402a260 Ganeti/HTools/Luxi.hs

b/Ganeti/HTools/Luxi.hs
70 70 
    let nnames = JSArray []
71 71 
        fnames = ["name",
72 72 
                  "disk_usage", "be/memory", "be/vcpus",
73 
                  "status", "pnode", "snodes", "tags"]
73 
                  "status", "pnode", "snodes", "tags", "oper_ram"]
74 74 
        fields = JSArray $ map (JSString . toJSString) fnames
75 75 
        use_locking = JSBool False
76 76 
    in JSArray [nnames, fields, use_locking]
......
101 101 
              -> JSValue
102 102 
              -> Result (String, Instance.Instance)
103 103 
parseInstance ktn (JSArray [ name, disk, mem, vcpus
104 
                           , status, pnode, snodes, tags ]) = do
104 
                           , status, pnode, snodes, tags, oram ]) = do
105 105 
  xname <- annotateResult "Parsing new instance" (fromJVal name)
106 106 
  let convert v = annotateResult ("Instance '" ++ xname ++ "'") (fromJVal v)
107 107 
  xdisk <- convert disk
108 
  xmem <- convert mem
108 
  xmem <- (case oram of
109 
             JSRational _ _ -> convert oram
110 
             _ -> convert mem)
109 111 
  xvcpus <- convert vcpus
110 112 
  xpnode <- convert pnode >>= lookupNode ktn xname
111 113 
  xsnodes <- convert snodes::Result [JSString]

Also available in: Unified diff