Commit 4892d955 authored by René Nussbaumer's avatar René Nussbaumer
Browse files

htools/ExtLoader: Bring the pieces together



This make it possible to load from an Ialloc file
Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 9899796b
...@@ -44,6 +44,7 @@ import qualified Ganeti.HTools.Luxi as Luxi ...@@ -44,6 +44,7 @@ import qualified Ganeti.HTools.Luxi as Luxi
import qualified Ganeti.HTools.Rapi as Rapi import qualified Ganeti.HTools.Rapi as Rapi
import qualified Ganeti.HTools.Simu as Simu import qualified Ganeti.HTools.Simu as Simu
import qualified Ganeti.HTools.Text as Text import qualified Ganeti.HTools.Text as Text
import qualified Ganeti.HTools.IAlloc as IAlloc
import Ganeti.HTools.Loader (mergeData, checkData, ClusterData(..) import Ganeti.HTools.Loader (mergeData, checkData, ClusterData(..)
, commonSuffix) , commonSuffix)
...@@ -78,10 +79,12 @@ loadExternalData opts = do ...@@ -78,10 +79,12 @@ loadExternalData opts = do
lsock = optLuxi opts lsock = optLuxi opts
tfile = optDataFile opts tfile = optDataFile opts
simdata = optNodeSim opts simdata = optNodeSim opts
iallocsrc = optIAllocSrc opts
setRapi = mhost /= "" setRapi = mhost /= ""
setLuxi = isJust lsock setLuxi = isJust lsock
setSim = (not . null) simdata setSim = (not . null) simdata
setFile = isJust tfile setFile = isJust tfile
setIAllocSrc = isJust iallocsrc
allSet = filter id [setRapi, setLuxi, setFile] allSet = filter id [setRapi, setLuxi, setFile]
exTags = case optExTags opts of exTags = case optExTags opts of
Nothing -> [] Nothing -> []
...@@ -109,6 +112,7 @@ loadExternalData opts = do ...@@ -109,6 +112,7 @@ loadExternalData opts = do
| setLuxi -> wrapIO $ Luxi.loadData $ fromJust lsock | setLuxi -> wrapIO $ Luxi.loadData $ fromJust lsock
| setSim -> Simu.loadData simdata | setSim -> Simu.loadData simdata
| setFile -> wrapIO $ Text.loadData $ fromJust tfile | setFile -> wrapIO $ Text.loadData $ fromJust tfile
| setIAllocSrc -> wrapIO $ IAlloc.loadData $ fromJust iallocsrc
| otherwise -> return $ Bad "No backend selected! Exiting." | otherwise -> return $ Bad "No backend selected! Exiting."
let ldresult = input_data >>= mergeData util_data' exTags selInsts exInsts let ldresult = input_data >>= mergeData util_data' exTags selInsts exInsts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment