Revision 6a5e7dbe htools/Ganeti/Jobs.hs

b/htools/Ganeti/Jobs.hs
46 46
instance JSON OpStatus where
47 47
    showJSON os = showJSON w
48 48
      where w = case os of
49
              OP_STATUS_QUEUED -> C.jobStatusQueued
50
              OP_STATUS_WAITING -> C.jobStatusWaiting
51
              OP_STATUS_CANCELING -> C.jobStatusCanceling
52
              OP_STATUS_RUNNING -> C.jobStatusRunning
53
              OP_STATUS_CANCELED -> C.jobStatusCanceled
54
              OP_STATUS_SUCCESS -> C.jobStatusSuccess
55
              OP_STATUS_ERROR -> C.jobStatusError
49
              OP_STATUS_QUEUED    -> C.opStatusQueued
50
              OP_STATUS_WAITING   -> C.opStatusWaiting
51
              OP_STATUS_CANCELING -> C.opStatusCanceling
52
              OP_STATUS_RUNNING   -> C.opStatusRunning
53
              OP_STATUS_CANCELED  -> C.opStatusCanceled
54
              OP_STATUS_SUCCESS   -> C.opStatusSuccess
55
              OP_STATUS_ERROR     -> C.opStatusError
56 56
    readJSON s = case readJSON s of
57
      J.Ok v | v == C.jobStatusQueued -> J.Ok OP_STATUS_QUEUED
58
             | v == C.jobStatusWaiting -> J.Ok OP_STATUS_WAITING
59
             | v == C.jobStatusCanceling -> J.Ok OP_STATUS_CANCELING
60
             | v == C.jobStatusRunning -> J.Ok OP_STATUS_RUNNING
61
             | v == C.jobStatusCanceled -> J.Ok OP_STATUS_CANCELED
62
             | v == C.jobStatusSuccess -> J.Ok OP_STATUS_SUCCESS
63
             | v == C.jobStatusError -> J.Ok OP_STATUS_ERROR
57
      J.Ok v | v == C.opStatusQueued    -> J.Ok OP_STATUS_QUEUED
58
             | v == C.opStatusWaiting   -> J.Ok OP_STATUS_WAITING
59
             | v == C.opStatusCanceling -> J.Ok OP_STATUS_CANCELING
60
             | v == C.opStatusRunning   -> J.Ok OP_STATUS_RUNNING
61
             | v == C.opStatusCanceled  -> J.Ok OP_STATUS_CANCELED
62
             | v == C.opStatusSuccess   -> J.Ok OP_STATUS_SUCCESS
63
             | v == C.opStatusError     -> J.Ok OP_STATUS_ERROR
64 64
             | otherwise -> J.Error ("Unknown opcode status " ++ v)
65 65
      _ -> J.Error ("Cannot parse opcode status " ++ show s)
66 66

  
......
79 79
instance JSON JobStatus where
80 80
    showJSON js = showJSON w
81 81
        where w = case js of
82
                JOB_STATUS_QUEUED -> "queued"
83
                JOB_STATUS_WAITING -> "waiting"
84
                JOB_STATUS_CANCELING -> "canceling"
85
                JOB_STATUS_RUNNING -> "running"
86
                JOB_STATUS_CANCELED -> "canceled"
87
                JOB_STATUS_SUCCESS -> "success"
88
                JOB_STATUS_ERROR -> "error"
82
                JOB_STATUS_QUEUED    -> C.jobStatusQueued
83
                JOB_STATUS_WAITING   -> C.jobStatusWaiting
84
                JOB_STATUS_CANCELING -> C.jobStatusCanceling
85
                JOB_STATUS_RUNNING   -> C.jobStatusRunning
86
                JOB_STATUS_CANCELED  -> C.jobStatusCanceled
87
                JOB_STATUS_SUCCESS   -> C.jobStatusSuccess
88
                JOB_STATUS_ERROR     -> C.jobStatusError
89 89
    readJSON s = case readJSON s of
90
      J.Ok "queued" -> J.Ok JOB_STATUS_QUEUED
91
      J.Ok "waiting" -> J.Ok JOB_STATUS_WAITING
92
      J.Ok "canceling" -> J.Ok JOB_STATUS_CANCELING
93
      J.Ok "running" -> J.Ok JOB_STATUS_RUNNING
94
      J.Ok "success" -> J.Ok JOB_STATUS_SUCCESS
95
      J.Ok "canceled" -> J.Ok JOB_STATUS_CANCELED
96
      J.Ok "error" -> J.Ok JOB_STATUS_ERROR
90
      J.Ok v | v == C.jobStatusQueued    -> J.Ok JOB_STATUS_QUEUED
91
             | v == C.jobStatusWaiting   -> J.Ok JOB_STATUS_WAITING
92
             | v == C.jobStatusCanceling -> J.Ok JOB_STATUS_CANCELING
93
             | v == C.jobStatusRunning   -> J.Ok JOB_STATUS_RUNNING
94
             | v == C.jobStatusSuccess   -> J.Ok JOB_STATUS_SUCCESS
95
             | v == C.jobStatusCanceled  -> J.Ok JOB_STATUS_CANCELED
96
             | v == C.jobStatusError     -> J.Ok JOB_STATUS_ERROR
97
             | otherwise -> J.Error ("Unknown job status " ++ v)
97 98
      _ -> J.Error ("Unknown job status " ++ show s)

Also available in: Unified diff