Revision dc6a0f82 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
import Ganeti.Qlang as Qlang
43 43

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

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

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

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

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

Also available in: Unified diff