Revision a46f34d7
| b/Ganeti/HTools/Instance.hs | ||
|---|---|---|
| 39 | 39 |
, setMovable |
| 40 | 40 |
, specOf |
| 41 | 41 |
, shrinkByType |
| 42 |
, runningStates |
|
| 42 | 43 |
) where |
| 43 | 44 |
|
| 44 | 45 |
import qualified Ganeti.HTools.Types as T |
| ... | ... | |
| 77 | 78 |
unitCpu :: Int |
| 78 | 79 |
unitCpu = 1 |
| 79 | 80 |
|
| 81 |
-- | Running instance states. |
|
| 82 |
runningStates :: [String] |
|
| 83 |
runningStates = ["running", "ERROR_up"] |
|
| 84 |
|
|
| 80 | 85 |
-- | A simple name for the int, instance association list. |
| 81 | 86 |
type AssocList = [(T.Idx, Instance)] |
| 82 | 87 |
|
| ... | ... | |
| 96 | 101 |
, mem = mem_init |
| 97 | 102 |
, dsk = dsk_init |
| 98 | 103 |
, vcpus = vcpus_init |
| 99 |
, running = run_init == "running" || run_init == "ERROR_up"
|
|
| 104 |
, running = run_init `elem` runningStates
|
|
| 100 | 105 |
, runSt = run_init |
| 101 | 106 |
, pNode = pn |
| 102 | 107 |
, sNode = sn |
| b/Ganeti/HTools/QC.hs | ||
|---|---|---|
| 170 | 170 |
let run_st = Instance.running inst |
| 171 | 171 |
run_tx = Instance.runSt inst |
| 172 | 172 |
in |
| 173 |
run_tx == "running" || run_tx == "ERROR_up" ==> run_st
|
|
| 173 |
run_tx `elem` Instance.runningStates ==> run_st
|
|
| 174 | 174 |
|
| 175 | 175 |
prop_Instance_runStatus_False inst = |
| 176 | 176 |
let run_st = Instance.running inst |
| 177 | 177 |
run_tx = Instance.runSt inst |
| 178 | 178 |
in |
| 179 |
run_tx /= "running" && run_tx /= "ERROR_up" ==> not run_st
|
|
| 179 |
run_tx `notElem` Instance.runningStates ==> not run_st
|
|
| 180 | 180 |
|
| 181 | 181 |
testInstance = |
| 182 | 182 |
[ run prop_Instance_setIdx |
Also available in: Unified diff