Revision 9a94c848 htools/Ganeti/HTools/Luxi.hs

b/htools/Ganeti/HTools/Luxi.hs
39 39
import qualified Ganeti.HTools.Node as Node
40 40
import qualified Ganeti.HTools.Instance as Instance
41 41
import Ganeti.HTools.JSON
42
import Ganeti.Query2 as Query2
42 43

  
43 44
{-# ANN module "HLint: ignore Eta reduce" #-}
44 45

  
......
99 100
queryNodesMsg =
100 101
  L.Query L.QRNode ["name", "mtotal", "mnode", "mfree", "dtotal", "dfree",
101 102
                    "ctotal", "offline", "drained", "vm_capable",
102
                    "ndp/spindle_count", "group.uuid"] ()
103
                    "ndp/spindle_count", "group.uuid"] Query2.EmptyFilter
103 104

  
104 105
-- | The input data for instance query.
105 106
queryInstancesMsg :: L.LuxiOp
......
107 108
  L.Query L.QRInstance ["name", "disk_usage", "be/memory", "be/vcpus",
108 109
                        "status", "pnode", "snodes", "tags", "oper_ram",
109 110
                        "be/auto_balance", "disk_template",
110
                        "be/spindle_use"] ()
111
                        "be/spindle_use"] Query2.EmptyFilter
111 112

  
112 113
-- | The input data for cluster query.
113 114
queryClusterInfoMsg :: L.LuxiOp
......
116 117
-- | The input data for node group query.
117 118
queryGroupsMsg :: L.LuxiOp
118 119
queryGroupsMsg =
119
  L.Query L.QRGroup ["uuid", "name", "alloc_policy", "ipolicy"] ()
120
  L.Query L.QRGroup ["uuid", "name", "alloc_policy", "ipolicy"]
121
   Query2.EmptyFilter
120 122

  
121 123
-- | Wraper over 'callMethod' doing node query.
122 124
queryNodes :: L.Client -> IO (Result JSValue)

Also available in: Unified diff