Revision 62377cf5 htools/Ganeti/HTools/Luxi.hs

b/htools/Ganeti/HTools/Luxi.hs
33 33
import qualified Text.JSON
34 34

  
35 35
import qualified Ganeti.Luxi as L
36
import qualified Ganeti.Qlang as Qlang
36 37
import Ganeti.HTools.Loader
37 38
import Ganeti.HTools.Types
38 39
import qualified Ganeti.HTools.Group as Group
39 40
import qualified Ganeti.HTools.Node as Node
40 41
import qualified Ganeti.HTools.Instance as Instance
41 42
import Ganeti.HTools.JSON
42
import Ganeti.Qlang as Qlang
43 43

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

  
......
78 78
fromJValWithStatus :: (Text.JSON.JSON a, Monad m) => (JSValue, JSValue) -> m a
79 79
fromJValWithStatus (st, v) = do
80 80
  st' <- fromJVal st
81
  L.checkRS st' v >>= fromJVal
81
  Qlang.checkRS st' v >>= fromJVal
82 82

  
83 83
-- | Annotate errors when converting values with owner/attribute for
84 84
-- better debugging.

Also available in: Unified diff