projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: move the test declaration in QC.hs
[ganeti-local]
/
hn1.hs
diff --git
a/hn1.hs
b/hn1.hs
index
e7fc122
..
e51f428
100644
(file)
--- a/
hn1.hs
+++ b/
hn1.hs
@@
-16,9
+16,9
@@
import Text.Printf (printf)
import qualified Ganeti.HTools.Container as Container
import qualified Ganeti.HTools.Instance as Instance
import qualified Ganeti.HTools.Container as Container
import qualified Ganeti.HTools.Instance as Instance
+import qualified Ganeti.HTools.Node as Node
import qualified Ganeti.HTools.Cluster as Cluster
import qualified Ganeti.HTools.CLI as CLI
import qualified Ganeti.HTools.Cluster as Cluster
import qualified Ganeti.HTools.CLI as CLI
-import Ganeti.HTools.Types
-- | Command line options structure.
data Options = Options
-- | Command line options structure.
data Options = Options
@@
-71,7
+71,7
@@
defaultOptions = Options
we find a valid solution or we exceed the maximum depth.
-}
we find a valid solution or we exceed the maximum depth.
-}
-iterateDepth :: NodeList
+iterateDepth :: Node.List
-> [Instance.Instance]
-> Int
-> Int
-> [Instance.Instance]
-> Int
-> Int
@@
-145,7
+145,7
@@
main = do
hPutStrLn stderr "Error: this program doesn't take any arguments."
exitWith $ ExitFailure 1
hPutStrLn stderr "Error: this program doesn't take any arguments."
exitWith $ ExitFailure 1
- (nl, il, csf, ktn, kti) <- CLI.loadExternalData opts
+ (nl, il, csf) <- CLI.loadExternalData opts
printf "Loaded %d nodes, %d instances\n"
(Container.size nl)
printf "Loaded %d nodes, %d instances\n"
(Container.size nl)
@@
-197,7
+197,7
@@
main = do
(Cluster.printStats ns)
printf "Solution (delta=%d):\n" $! min_d
(Cluster.printStats ns)
printf "Solution (delta=%d):\n" $! min_d
- let (sol_strs, cmd_strs) = Cluster.printSolution il ktn kti solution
+ let (sol_strs, cmd_strs) = Cluster.printSolution ns il solution
putStr $ unlines $ sol_strs
when (optShowCmds opts) $
do
putStr $ unlines $ sol_strs
when (optShowCmds opts) $
do
@@
-211,6
+211,6
@@
main = do
(final_mem, final_disk) = Cluster.totalResources ns
putStrLn ""
putStrLn "Final cluster status:"
(final_mem, final_disk) = Cluster.totalResources ns
putStrLn ""
putStrLn "Final cluster status:"
- putStrLn $ Cluster.printNodes ktn ns
+ putStrLn $ Cluster.printNodes ns
printf "Original: mem=%d disk=%d\n" orig_mem orig_disk
printf "Final: mem=%d disk=%d\n" final_mem final_disk
printf "Original: mem=%d disk=%d\n" orig_mem orig_disk
printf "Final: mem=%d disk=%d\n" final_mem final_disk