diff --git a/htools/Ganeti/HTools/IAlloc.hs b/htools/Ganeti/HTools/IAlloc.hs index 8c4a415cf84fbcabe46269251c06f7398fdac054..26b7ea6988190ce149ff23aaea082f40385c514f 100644 --- a/htools/Ganeti/HTools/IAlloc.hs +++ b/htools/Ganeti/HTools/IAlloc.hs @@ -47,7 +47,7 @@ import qualified Ganeti.Constants as C import Ganeti.HTools.CLI import Ganeti.HTools.Loader import Ganeti.HTools.ExtLoader (loadExternalData) -import Ganeti.HTools.Utils +import Ganeti.HTools.JSON import Ganeti.HTools.Types {-# ANN module "HLint: ignore Eta reduce" #-} diff --git a/htools/Ganeti/HTools/Luxi.hs b/htools/Ganeti/HTools/Luxi.hs index 38bb266fc879cb98427422a5438122b1fdeb1030..744aa05443afb810b0a0fb903f1a545b824b0578 100644 --- a/htools/Ganeti/HTools/Luxi.hs +++ b/htools/Ganeti/HTools/Luxi.hs @@ -38,8 +38,7 @@ import Ganeti.HTools.Types import qualified Ganeti.HTools.Group as Group import qualified Ganeti.HTools.Node as Node import qualified Ganeti.HTools.Instance as Instance -import Ganeti.HTools.Utils (fromJVal, tryFromObj, asJSObject, - fromObj) +import Ganeti.HTools.JSON {-# ANN module "HLint: ignore Eta reduce" #-} diff --git a/htools/Ganeti/HTools/QC.hs b/htools/Ganeti/HTools/QC.hs index 435d37823ea40a10e7b1a4210168d97a5d36ac1d..4f749b690e054b5f25f7753c00df5e36bbc1a905 100644 --- a/htools/Ganeti/HTools/QC.hs +++ b/htools/Ganeti/HTools/QC.hs @@ -55,6 +55,7 @@ import qualified Ganeti.HTools.Container as Container import qualified Ganeti.HTools.ExtLoader import qualified Ganeti.HTools.IAlloc as IAlloc import qualified Ganeti.HTools.Instance as Instance +import qualified Ganeti.HTools.JSON as JSON import qualified Ganeti.HTools.Loader as Loader import qualified Ganeti.HTools.Luxi import qualified Ganeti.HTools.Node as Node @@ -313,9 +314,9 @@ prop_Utils_commaSplitJoin s = -- value. prop_Utils_fromObjWithDefault def_value random_key = -- a missing key will be returned with the default - Utils.fromObjWithDefault [] random_key def_value == Just def_value && + JSON.fromObjWithDefault [] random_key def_value == Just def_value && -- a found key will be returned as is, not with default - Utils.fromObjWithDefault [(random_key, J.showJSON def_value)] + JSON.fromObjWithDefault [(random_key, J.showJSON def_value)] random_key (def_value+1) == Just def_value where _types = def_value :: Integer diff --git a/htools/Ganeti/HTools/Rapi.hs b/htools/Ganeti/HTools/Rapi.hs index 261609ba5fb5058ab3266272d347a88ca386580d..803196492d51b0648e403b225921f7f3cd39cf2f 100644 --- a/htools/Ganeti/HTools/Rapi.hs +++ b/htools/Ganeti/HTools/Rapi.hs @@ -40,9 +40,9 @@ import Text.JSON (JSObject, fromJSObject, decodeStrict) import Text.JSON.Types (JSValue(..)) import Text.Printf (printf) -import Ganeti.HTools.Utils import Ganeti.HTools.Loader import Ganeti.HTools.Types +import Ganeti.HTools.JSON import qualified Ganeti.HTools.Group as Group import qualified Ganeti.HTools.Node as Node import qualified Ganeti.HTools.Instance as Instance diff --git a/htools/Ganeti/HTools/Utils.hs b/htools/Ganeti/HTools/Utils.hs index b1898ebe780af088f235e59084371d6f84f3341d..d43f3730fa12f5c22d2ef439e7a5948f29f2af6a 100644 --- a/htools/Ganeti/HTools/Utils.hs +++ b/htools/Ganeti/HTools/Utils.hs @@ -31,17 +31,6 @@ module Ganeti.HTools.Utils , select , applyIf , commaJoin - , readEitherString - , JSRecord - , loadJSArray - , fromObj - , fromObjWithDefault - , maybeFromObj - , tryFromObj - , fromJVal - , asJSObject - , asObjectList - , fromJResult , tryRead , formatTable , parseUnit @@ -52,9 +41,6 @@ import Data.List import Debug.Trace --- we will re-export these for our existing users -import Ganeti.HTools.JSON - -- * Debug functions -- | To be used only for debugging, breaks referential integrity. diff --git a/htools/Ganeti/Luxi.hs b/htools/Ganeti/Luxi.hs index 0af433007b38de12c6b84c3e2d545209d709fe4c..df4c4988fab3124bb460986630ef7c9e0a75416a 100644 --- a/htools/Ganeti/Luxi.hs +++ b/htools/Ganeti/Luxi.hs @@ -46,7 +46,7 @@ import Text.JSON.Types import System.Timeout import qualified Network.Socket as S -import Ganeti.HTools.Utils +import Ganeti.HTools.JSON import Ganeti.HTools.Types import Ganeti.Constants diff --git a/htools/Ganeti/OpCodes.hs b/htools/Ganeti/OpCodes.hs index 96905c79da7e21f466b5afdbb86357e425075da6..3ecc6455fd3a731529a548a2ca39564c60c12648 100644 --- a/htools/Ganeti/OpCodes.hs +++ b/htools/Ganeti/OpCodes.hs @@ -32,12 +32,11 @@ module Ganeti.OpCodes ) where import Text.JSON (readJSON, showJSON, makeObj, JSON) -import qualified Text.JSON as J import qualified Ganeti.Constants as C import Ganeti.THH -import Ganeti.HTools.Utils +import Ganeti.HTools.JSON -- | Replace disks type. $(declareSADT "ReplaceDisksMode"