[PATCH master 3/6] Replace instance states hardcoded with constants

[Iustin Pop]

---
 htools/Ganeti/HTools/Instance.hs |    3 ++-
 htools/Ganeti/HTools/QC.hs       |   13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/htools/Ganeti/HTools/Instance.hs b/htools/Ganeti/HTools/Instance.hs
index 9ac113c..759f622 100644
--- a/htools/Ganeti/HTools/Instance.hs
+++ b/htools/Ganeti/HTools/Instance.hs
@@ -45,6 +45,7 @@ module Ganeti.HTools.Instance
 
 import qualified Ganeti.HTools.Types as T
 import qualified Ganeti.HTools.Container as Container
+import qualified Ganeti.Constants as C
 
 -- * Type declarations
 
@@ -75,7 +76,7 @@ instance T.Element Instance where
 
 -- | Running instance states.
 runningStates :: [String]
-runningStates = ["running", "ERROR_up"]
+runningStates = [C.inststRunning, C.inststErrorup]
 
 -- | A simple name for the int, instance association list.
 type AssocList = [(T.Idx, Instance)]
diff --git a/htools/Ganeti/HTools/QC.hs b/htools/Ganeti/HTools/QC.hs
index 2234c7a..40a7c9f 100644
--- a/htools/Ganeti/HTools/QC.hs
+++ b/htools/Ganeti/HTools/QC.hs
@@ -64,6 +64,7 @@ import qualified Ganeti.HTools.Text as Text
 import qualified Ganeti.HTools.Types as Types
 import qualified Ganeti.HTools.Utils as Utils
 import qualified Ganeti.HTools.Version
+import qualified Ganeti.Constants as C
 
 -- * Constants
 
@@ -177,10 +178,14 @@ instance Arbitrary Instance.Instance where
       name <- getFQDN
       mem <- choose (0, maxMem)
       dsk <- choose (0, maxDsk)
-      run_st <- elements ["ERROR_up", "ERROR_down", "ADMIN_down"
-                         , "ERROR_nodedown", "ERROR_nodeoffline"
-                         , "running"
-                         , "no_such_status1", "no_such_status2"]
+      run_st <- elements [ C.inststErrorup
+                         , C.inststErrordown
+                         , C.inststAdmindown
+                         , C.inststNodedown
+                         , C.inststNodeoffline
+                         , C.inststRunning
+                         , "no_such_status1"
+                         , "no_such_status2"]
       pn <- arbitrary
       sn <- arbitrary
       vcpus <- choose (0, maxCpu)
-- 
1.7.3.1