Add maybePrintInsts for the instance listing

[ganeti-local] / hail.hs

diff --git a/hail.hs b/hail.hs
index a408987..78eb8e1 100644 (file)
--- a/hail.hs
+++ b/hail.hs
@@ -37,11 +37,18 @@ import qualified Ganeti.HTools.Cluster as Cluster
 import Ganeti.HTools.CLI
 import Ganeti.HTools.IAlloc
 import Ganeti.HTools.Types
-import Ganeti.HTools.Loader (RqType(..), Request(..))
+import Ganeti.HTools.Loader (RqType(..), Request(..), ClusterData(..))
+import Ganeti.HTools.ExtLoader (loadExternalData)
 
 -- | Options list and functions
 options :: [OptType]
-options = [oPrintNodes, oShowVer, oShowHelp]
+options =
+    [ oPrintNodes
+    , oDataFile
+    , oNodeSim
+    , oShowVer
+    , oShowHelp
+    ]
 
 processResults :: (Monad m) =>
                   RqType -> Cluster.AllocSolution
@@ -61,37 +68,49 @@ processResults _ as =
 processRequest :: Request
                -> Result Cluster.AllocSolution
 processRequest request =
-  let Request rqtype gl nl il _ = request
+  let Request rqtype (ClusterData gl nl il _) = request
   in case rqtype of
        Allocate xi reqn -> Cluster.tryMGAlloc gl nl il xi reqn
        Relocate idx reqn exnodes -> Cluster.tryReloc nl il idx reqn exnodes
        Evacuate exnodes -> Cluster.tryEvac nl il exnodes
 
+-- | Reads the request from the data file(s)
+readRequest :: Options -> [String] -> IO Request
+readRequest opts args = do
+  when (null args) $ do
+         hPutStrLn stderr "Error: this program needs an input file."
+         exitWith $ ExitFailure 1
+
+  input_data <- readFile (head args)
+  r1 <- case (parseData input_data) of
+          Bad err -> do
+            hPutStrLn stderr $ "Error: " ++ err
+            exitWith $ ExitFailure 1
+          Ok rq -> return rq
+  r2 <- if isJust (optDataFile opts) ||  (not . null . optNodeSim) opts
+        then  do
+          cdata <- loadExternalData opts
+          let Request rqt _ = r1
+          return $ Request rqt cdata
+        else return r1
+  return r2
+
 -- | Main function.
 main :: IO ()
 main = do
   cmd_args <- System.getArgs
   (opts, args) <- parseOpts cmd_args "hail" options
 
-  when (null args) $ do
-         hPutStrLn stderr "Error: this program needs an input file."
-         exitWith $ ExitFailure 1
-
-  let input_file = head args
-      shownodes = optShowNodes opts
-  input_data <- readFile input_file
+  let shownodes = optShowNodes opts
 
-  request <- case (parseData input_data) of
-               Bad err -> do
-                 hPutStrLn stderr $ "Error: " ++ err
-                 exitWith $ ExitFailure 1
-               Ok rq -> return rq
+  request <- readRequest opts args
 
-  let Request rq _ nl _ _ = request
+  let Request rq cdata = request
 
   when (isJust shownodes) $ do
          hPutStrLn stderr "Initial cluster status:"
-         hPutStrLn stderr $ Cluster.printNodes nl (fromJust shownodes)
+         hPutStrLn stderr $ Cluster.printNodes (cdNodes cdata)
+                       (fromJust shownodes)
 
   let sols = processRequest request >>= processResults rq
   let (ok, info, rn) =