Revision 1fc3812c htools/Ganeti/Query/Query.hs

b/htools/Ganeti/Query/Query.hs
161 161
      (fdefs, fgetters) = unzip selected
162 162
      live' = live && needsLiveData fgetters
163 163
  nodes <- resultT $ case wanted of
164
             [] -> Ok . Map.elems . fromContainer $ configNodes cfg
164
             [] -> Ok . niceSortKey nodeName .
165
                   Map.elems . fromContainer $ configNodes cfg
165 166
             _  -> mapM (getNode cfg) wanted
166 167
  -- runs first pass of the filter, without a runtime context; this
167 168
  -- will limit the nodes that we'll contact for runtime data
......
181 182
  let selected = getSelectedFields groupFieldsMap fields
182 183
      (fdefs, fgetters) = unzip selected
183 184
  groups <- case wanted of
184
              [] -> Ok . Map.elems . fromContainer $ configNodegroups cfg
185
              [] -> Ok . niceSortKey groupName .
186
                    Map.elems . fromContainer $ configNodegroups cfg
185 187
              _  -> mapM (getGroup cfg) wanted
186 188
  -- there is no live data for groups, so filtering is much simpler
187 189
  fgroups <- filterM (\n -> evaluateFilter cfg Nothing n cfilter) groups

Also available in: Unified diff