Add a simple type alias for nicer type signatures

[ganeti-local] / htools / Ganeti / HTools / Loader.hs

diff --git a/htools/Ganeti/HTools/Loader.hs b/htools/Ganeti/HTools/Loader.hs
index caac6c6..446cc10 100644 (file)
--- a/htools/Ganeti/HTools/Loader.hs
+++ b/htools/Ganeti/HTools/Loader.hs
@@ -91,7 +91,7 @@ data ClusterData = ClusterData
   , cdInstances :: Instance.List -- ^ The instance list
   , cdTags      :: [String]      -- ^ The cluster tags
   , cdIPolicy   :: IPolicy       -- ^ The cluster instance policy
-  } deriving (Show, Read)
+  } deriving (Show, Read, Eq)
 
 -- | The priority of a match in a lookup result.
 data MatchPriority = ExactMatch
@@ -241,8 +241,7 @@ updateMovable :: [String]           -- ^ Selected instances (if not empty)
               -> Instance.Instance  -- ^ Target Instance
               -> Instance.Instance  -- ^ Target Instance with updated attribute
 updateMovable selinsts exinsts inst =
-  if Instance.sNode inst == Node.noSecondary ||
-     Instance.name inst `elem` exinsts ||
+  if Instance.name inst `elem` exinsts ||
      not (null selinsts || Instance.name inst `elem` selinsts)
     then Instance.setMovable inst False
     else inst
@@ -341,7 +340,7 @@ nodeImem :: Node.Node -> Instance.List -> Int
 nodeImem node il =
   let rfind = flip Container.find il
       il' = map rfind $ Node.pList node
-      oil' = filter (not . Instance.instanceOffline) il'
+      oil' = filter Instance.notOffline il'
   in sum . map Instance.mem $ oil'