Revision b45222ce
b/Ganeti/HTools/Luxi.hs | ||
---|---|---|
131 | 131 |
xname <- annotateResult "Parsing new node" (fromJVal name) |
132 | 132 |
let convert v = annotateResult ("Node '" ++ xname ++ "'") (fromJVal v) |
133 | 133 |
xoffline <- convert offline |
134 |
node <- (if xoffline |
|
134 |
xdrained <- convert drained |
|
135 |
node <- (if xoffline || xdrained |
|
135 | 136 |
then return $ Node.create xname 0 0 0 0 0 0 True |
136 | 137 |
else do |
137 |
xdrained <- convert drained |
|
138 | 138 |
xmtotal <- convert mtotal |
139 | 139 |
xmnode <- convert mnode |
140 | 140 |
xmfree <- convert mfree |
... | ... | |
142 | 142 |
xdfree <- convert dfree |
143 | 143 |
xctotal <- convert ctotal |
144 | 144 |
return $ Node.create xname xmtotal xmnode xmfree |
145 |
xdtotal xdfree xctotal (xoffline || xdrained))
|
|
145 |
xdtotal xdfree xctotal False)
|
|
146 | 146 |
return (xname, node) |
147 | 147 |
|
148 | 148 |
parseNode v = fail ("Invalid node query result: " ++ show v) |
b/Ganeti/HTools/Rapi.hs | ||
---|---|---|
98 | 98 |
name <- tryFromObj "Parsing new node" a "name" |
99 | 99 |
let extract s = tryFromObj ("Node '" ++ name ++ "'") a s |
100 | 100 |
offline <- extract "offline" |
101 |
node <- (if offline |
|
101 |
drained <- extract "drained" |
|
102 |
node <- (if offline || drained |
|
102 | 103 |
then return $ Node.create name 0 0 0 0 0 0 True |
103 | 104 |
else do |
104 |
drained <- extract "drained" |
|
105 | 105 |
mtotal <- extract "mtotal" |
106 | 106 |
mnode <- extract "mnode" |
107 | 107 |
mfree <- extract "mfree" |
... | ... | |
109 | 109 |
dfree <- extract "dfree" |
110 | 110 |
ctotal <- extract "ctotal" |
111 | 111 |
return $ Node.create name mtotal mnode mfree |
112 |
dtotal dfree ctotal (offline || drained))
|
|
112 |
dtotal dfree ctotal False)
|
|
113 | 113 |
return (name, node) |
114 | 114 |
|
115 | 115 |
-- | Builds the cluster data from an URL. |
Also available in: Unified diff