Revision b513faa1 Ganeti/HTools/IAlloc.hs

b/Ganeti/HTools/IAlloc.hs
26 26
    | Relocate Int
27 27
    deriving (Show)
28 28

  
29
data Request = Request RqType IdxNode IdxInstance NameList NameList
29
data Request = Request RqType NodeList InstanceList String NameList NameList
30 30
    deriving (Show)
31 31

  
32 32
parseBaseInstance :: String
......
101 101
              ridx <- lookupNode kti rname rname
102 102
              return $ Relocate ridx
103 103
        other -> fail $ ("Invalid request type '" ++ other ++ "'")
104

  
105
  return $ Request rqtype nl il (swapPairs ktn) (swapPairs kti)
104
  (map_n, map_i, csf, xtn, xti) <- mergeData (ktn, nl, kti, il)
105
  return $ Request rqtype map_n map_i csf xtn xti
106 106

  
107 107
formatResponse :: Bool -> String -> [String] -> String
108 108
formatResponse success info nodes =

Also available in: Unified diff