Revision 2c9336a4 htools/Ganeti/HTools/Text.hs
| b/htools/Ganeti/HTools/Text.hs | ||
|---|---|---|
| 57 | 57 |
serializeGroup :: Group.Group -> String |
| 58 | 58 |
serializeGroup grp = |
| 59 | 59 |
printf "%s|%s|%s" (Group.name grp) (Group.uuid grp) |
| 60 |
(apolToString (Group.allocPolicy grp))
|
|
| 60 |
(allocPolicyToString (Group.allocPolicy grp))
|
|
| 61 | 61 |
|
| 62 | 62 |
-- | Generate group file data from a group list. |
| 63 | 63 |
serializeGroups :: Group.List -> String |
| ... | ... | |
| 97 | 97 |
iname (Instance.mem inst) (Instance.dsk inst) |
| 98 | 98 |
(Instance.vcpus inst) (Instance.runSt inst) |
| 99 | 99 |
(if Instance.autoBalance inst then "Y" else "N") |
| 100 |
pnode snode (dtToString (Instance.diskTemplate inst))
|
|
| 100 |
pnode snode (diskTemplateToString (Instance.diskTemplate inst))
|
|
| 101 | 101 |
(intercalate "," (Instance.tags inst)) |
| 102 | 102 |
|
| 103 | 103 |
-- | Generate instance file data from instance objects. |
| ... | ... | |
| 121 | 121 |
-> m (String, Group.Group) -- ^ The result, a tuple of group |
| 122 | 122 |
-- UUID and group object |
| 123 | 123 |
loadGroup [name, gid, apol] = do |
| 124 |
xapol <- apolFromString apol
|
|
| 124 |
xapol <- allocPolicyFromString apol
|
|
| 125 | 125 |
return (gid, Group.create name gid xapol) |
| 126 | 126 |
|
| 127 | 127 |
loadGroup s = fail $ "Invalid/incomplete group data: '" ++ show s ++ "'" |
| ... | ... | |
| 167 | 167 |
"N" -> return False |
| 168 | 168 |
_ -> fail $ "Invalid auto_balance value '" ++ auto_bal ++ |
| 169 | 169 |
"' for instance " ++ name |
| 170 |
disk_template <- annotateResult ("Instance " ++ name) (dtFromString dt)
|
|
| 170 |
disk_template <- annotateResult ("Instance " ++ name)
|
|
| 171 |
(diskTemplateFromString dt) |
|
| 171 | 172 |
when (sidx == pidx) $ fail $ "Instance " ++ name ++ |
| 172 | 173 |
" has same primary and secondary node - " ++ pnode |
| 173 | 174 |
let vtags = sepSplit ',' tags |
Also available in: Unified diff