Move the RqType and Request types to Loader.hs

[ganeti-local] / hail.hs

diff --git a/hail.hs b/hail.hs
index b879ae1..a8b1c07 100644 (file)
--- a/hail.hs
+++ b/hail.hs
@@ -22,6 +22,7 @@ import qualified Ganeti.HTools.Instance as Instance
 import qualified Ganeti.HTools.CLI as CLI
 import Ganeti.HTools.IAlloc
 import Ganeti.HTools.Types
+import Ganeti.HTools.Loader (RqType(..), Request(..))
 
 -- | Command line options structure.
 data Options = Options
@@ -51,15 +52,19 @@ options =
       "show help"
     ]
 
+-- | Compute online nodes from a Node.List
+getOnline :: Node.List -> [Node.Node]
+getOnline = filter (not . Node.offline) . Container.elems
+
 -- | Try to allocate an instance on the cluster
 tryAlloc :: (Monad m) =>
-            NodeList
-         -> InstanceList
+            Node.List
+         -> Instance.List
          -> Instance.Instance
          -> Int
-         -> m [(Maybe NodeList, [Node.Node])]
+         -> m [(Maybe Node.List, [Node.Node])]
 tryAlloc nl _ inst 2 =
-    let all_nodes = Container.elems nl
+    let all_nodes = getOnline nl
         all_pairs = liftM2 (,) all_nodes all_nodes
         ok_pairs = filter (\(x, y) -> Node.idx x /= Node.idx y) all_pairs
         sols = map (\(p, s) ->
@@ -68,7 +73,7 @@ tryAlloc nl _ inst 2 =
     in return sols
 
 tryAlloc nl _ inst 1 =
-    let all_nodes = Container.elems nl
+    let all_nodes = getOnline nl
         sols = map (\p -> (fst $ Cluster.allocateOnSingle nl inst p, [p]))
                all_nodes
     in return sols
@@ -79,24 +84,22 @@ tryAlloc _ _ _ reqn = fail $ "Unsupported number of alllocation \
 
 -- | Try to allocate an instance on the cluster
 tryReloc :: (Monad m) =>
-            NodeList
-         -> InstanceList
-         -> Int
+            Node.List
+         -> Instance.List
+         -> Idx
          -> Int
-         -> [Int]
-         -> m [(Maybe NodeList, [Node.Node])]
+         -> [Ndx]
+         -> m [(Maybe Node.List, [Node.Node])]
 tryReloc nl il xid 1 ex_idx =
-    let all_nodes = Container.elems nl
+    let all_nodes = getOnline nl
         inst = Container.find xid il
-        valid_nodes = filter (not . flip elem ex_idx . idx) all_nodes
+        ex_idx' = (Instance.pnode inst):ex_idx
+        valid_nodes = filter (not . flip elem ex_idx' . Node.idx) all_nodes
         valid_idxes = map Node.idx valid_nodes
-        nl' = Container.map (\n -> if elem (Node.idx n) ex_idx then
-                                       Node.setOffline n True
-                                   else n) nl
         sols1 = map (\x -> let (mnl, _, _, _) =
-                                    Cluster.applyMove nl' inst
+                                    Cluster.applyMove nl inst
                                                (Cluster.ReplaceSecondary x)
-                            in (mnl, [Container.find x nl'])
+                            in (mnl, [Container.find x nl])
                      ) valid_idxes
     in return sols1
 
@@ -104,8 +107,8 @@ tryReloc _ _ _ reqn _  = fail $ "Unsupported number of relocation \
                                 \destinations required (" ++ (show reqn) ++
                                                   "), only one supported"
 
-filterFails :: (Monad m) => [(Maybe NodeList, [Node.Node])]
-            -> m [(NodeList, [Node.Node])]
+filterFails :: (Monad m) => [(Maybe Node.List, [Node.Node])]
+            -> m [(Node.List, [Node.Node])]
 filterFails sols =
     if null sols then fail "No nodes onto which to allocate at all"
     else let sols' = filter (isJust . fst) sols
@@ -114,7 +117,7 @@ filterFails sols =
             else
                 return $ map (\(x, y) -> (fromJust x, y)) sols'
 
-processResults :: (Monad m) => [(NodeList, [Node.Node])]
+processResults :: (Monad m) => [(Node.List, [Node.Node])]
                -> m (String, [Node.Node])
 processResults sols =
     let sols' = map (\(nl', ns) -> (Cluster.compCV  nl', ns)) sols
@@ -154,7 +157,7 @@ main = do
   let sols = new_nodes >>= filterFails >>= processResults
   let (ok, info, rn) = case sols of
                Ok (info, sn) -> (True, "Request successful: " ++ info,
-                                     map ((++ csf) . name) sn)
+                                     map ((++ csf) . Node.name) sn)
                Bad s -> (False, "Request failed: " ++ s, [])
       resp = formatResponse ok info rn
   putStrLn resp