Revision 262a08a2 Ganeti/HTools/IAlloc.hs

b/Ganeti/HTools/IAlloc.hs
17 17
                  makeObj, encodeStrict, decodeStrict,
18 18
                  fromJSObject, toJSString)
19 19
--import Text.Printf (printf)
20
import qualified Ganeti.HTools.Container as Container
20 21
import qualified Ganeti.HTools.Node as Node
21 22
import qualified Ganeti.HTools.Instance as Instance
22 23
import Ganeti.HTools.Loader
......
28 29
    | Relocate Int Int [Int]
29 30
    deriving (Show)
30 31

  
31
data Request = Request RqType NodeList InstanceList String
32
data Request = Request RqType Node.List Instance.List String
32 33
    deriving (Show)
33 34

  
34 35
parseBaseInstance :: String
......
110 111
              ridx <- lookupNode kti rname rname
111 112
              ex_nodes <- fromObj "relocate_from" request
112 113
              let ex_nodes' = map (stripSuffix $ length csf) ex_nodes
113
              ex_idex <- mapM (findByName map_n) ex_nodes'
114
              ex_idex <- mapM (Container.findByName map_n) ex_nodes'
114 115
              return $ Relocate ridx req_nodes ex_idex
115 116
        other -> fail $ ("Invalid request type '" ++ other ++ "'")
116 117
  return $ Request rqtype map_n map_i csf

Also available in: Unified diff