Revision 17e7af2b 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"] |
|
73 |
"status", "pnode", "snodes", "tags"]
|
|
74 | 74 |
fields = JSArray $ map (JSString . toJSString) fnames |
75 | 75 |
use_locking = JSBool False |
76 | 76 |
in JSArray [nnames, fields, use_locking] |
... | ... | |
94 | 94 |
-> JSValue |
95 | 95 |
-> Result (String, Instance.Instance) |
96 | 96 |
parseInstance ktn (JSArray [ name, disk, mem, vcpus |
97 |
, status, pnode, snodes ]) = do |
|
97 |
, status, pnode, snodes, tags ]) = do
|
|
98 | 98 |
xname <- annotateResult "Parsing new instance" (fromJVal name) |
99 | 99 |
let convert v = annotateResult ("Instance '" ++ xname ++ "'") (fromJVal v) |
100 | 100 |
xdisk <- convert disk |
... | ... | |
105 | 105 |
snode <- (if null xsnodes then return Node.noSecondary |
106 | 106 |
else lookupNode ktn xname (fromJSString $ head xsnodes)) |
107 | 107 |
xrunning <- convert status |
108 |
let inst = Instance.create xname xmem xdisk xvcpus xrunning xpnode snode |
|
108 |
xtags <- convert tags |
|
109 |
let inst = Instance.create xname xmem xdisk xvcpus |
|
110 |
xrunning xtags xpnode snode |
|
109 | 111 |
return (xname, inst) |
110 | 112 |
|
111 | 113 |
parseInstance _ v = fail ("Invalid instance query result: " ++ show v) |
Also available in: Unified diff