Revision 90d033ef
| b/htools/Ganeti/Config.hs | ||
|---|---|---|
| 38 | 38 |
, getGroup |
| 39 | 39 |
, getGroupNdParams |
| 40 | 40 |
, getGroupIpolicy |
| 41 |
, getGroupDiskParams |
|
| 41 | 42 |
, getGroupNodes |
| 42 | 43 |
, getGroupInstances |
| 43 | 44 |
, getGroupOfNode |
| ... | ... | |
| 187 | 188 |
getGroupIpolicy cfg ng = |
| 188 | 189 |
fillIPolicy (clusterIpolicy $ configCluster cfg) (groupIpolicy ng) |
| 189 | 190 |
|
| 191 |
-- | Computes a group\'s (merged) disk params. |
|
| 192 |
getGroupDiskParams :: ConfigData -> NodeGroup -> DiskParams |
|
| 193 |
getGroupDiskParams cfg ng = |
|
| 194 |
Container $ |
|
| 195 |
fillDict (fromContainer . clusterDiskparams $ configCluster cfg) |
|
| 196 |
(fromContainer $ groupDiskparams ng) [] |
|
| 197 |
|
|
| 190 | 198 |
-- | Get nodes of a given node group. |
| 191 | 199 |
getGroupNodes :: ConfigData -> String -> [Node] |
| 192 | 200 |
getGroupNodes cfg gname = |
| b/htools/Ganeti/Query/Group.hs | ||
|---|---|---|
| 54 | 54 |
"Custom node parameters", |
| 55 | 55 |
FieldSimple (rsNormal . groupNdparams)) |
| 56 | 56 |
, (FieldDefinition "diskparams" "DiskParameters" QFTOther |
| 57 |
"Disk parameters (merged)", FieldSimple (\_ -> rsNoData)) |
|
| 57 |
"Disk parameters (merged)", |
|
| 58 |
FieldConfig (\cfg -> rsNormal . getGroupDiskParams cfg)) |
|
| 58 | 59 |
, (FieldDefinition "ipolicy" "InstancePolicy" QFTOther |
| 59 | 60 |
"Instance policy limitations (merged)", |
| 60 | 61 |
FieldConfig (\cfg ng -> rsNormal (getGroupIpolicy cfg ng))) |
| b/htools/Ganeti/Query/Query.hs | ||
|---|---|---|
| 175 | 175 |
return QueryResult { qresFields = fdefs, qresData = fdata }
|
| 176 | 176 |
|
| 177 | 177 |
queryInner cfg _ (Query QRGroup fields qfilter) wanted = return $ do |
| 178 |
-- FIXME: want_diskparams is defaulted to false and not taken as parameter |
|
| 179 |
-- This is because the type for DiskParams is right now too generic for merges |
|
| 180 |
-- (or else I cannot see how to do this with curent implementation) |
|
| 181 | 178 |
cfilter <- compileFilter groupFieldsMap qfilter |
| 182 | 179 |
let selected = getSelectedFields groupFieldsMap fields |
| 183 | 180 |
(fdefs, fgetters) = unzip selected |
Also available in: Unified diff