Revision 1eaddbc6
| b/lib/constants.py | ||
|---|---|---|
| 1498 | 1498 |
JOB_STATUS_CANCELED = "canceled" |
| 1499 | 1499 |
JOB_STATUS_SUCCESS = "success" |
| 1500 | 1500 |
JOB_STATUS_ERROR = "error" |
| 1501 |
JOBS_PENDING = frozenset([ |
|
| 1502 |
JOB_STATUS_QUEUED, |
|
| 1503 |
JOB_STATUS_WAITING, |
|
| 1504 |
JOB_STATUS_CANCELING, |
|
| 1505 |
]) |
|
| 1501 | 1506 |
JOBS_FINALIZED = frozenset([ |
| 1502 | 1507 |
JOB_STATUS_CANCELED, |
| 1503 | 1508 |
JOB_STATUS_SUCCESS, |
| 1504 | 1509 |
JOB_STATUS_ERROR, |
| 1505 | 1510 |
]) |
| 1506 | 1511 |
JOB_STATUS_ALL = frozenset([ |
| 1507 |
JOB_STATUS_QUEUED, |
|
| 1508 |
JOB_STATUS_WAITING, |
|
| 1509 |
JOB_STATUS_CANCELING, |
|
| 1510 | 1512 |
JOB_STATUS_RUNNING, |
| 1511 |
]) | JOBS_FINALIZED |
|
| 1513 |
]) | JOBS_PENDING | JOBS_FINALIZED
|
|
| 1512 | 1514 |
|
| 1513 | 1515 |
# OpCode status |
| 1514 | 1516 |
# not yet finalized |
| b/lib/rapi/client.py | ||
|---|---|---|
| 80 | 80 |
JOB_STATUS_CANCELED = "canceled" |
| 81 | 81 |
JOB_STATUS_SUCCESS = "success" |
| 82 | 82 |
JOB_STATUS_ERROR = "error" |
| 83 |
JOB_STATUS_PENDING = frozenset([ |
|
| 84 |
JOB_STATUS_QUEUED, |
|
| 85 |
JOB_STATUS_WAITING, |
|
| 86 |
JOB_STATUS_CANCELING, |
|
| 87 |
]) |
|
| 83 | 88 |
JOB_STATUS_FINALIZED = frozenset([ |
| 84 | 89 |
JOB_STATUS_CANCELED, |
| 85 | 90 |
JOB_STATUS_SUCCESS, |
| 86 | 91 |
JOB_STATUS_ERROR, |
| 87 | 92 |
]) |
| 88 | 93 |
JOB_STATUS_ALL = frozenset([ |
| 89 |
JOB_STATUS_QUEUED, |
|
| 90 |
JOB_STATUS_WAITING, |
|
| 91 |
JOB_STATUS_CANCELING, |
|
| 92 | 94 |
JOB_STATUS_RUNNING, |
| 93 |
]) | JOB_STATUS_FINALIZED |
|
| 95 |
]) | JOB_STATUS_PENDING | JOB_STATUS_FINALIZED
|
|
| 94 | 96 |
|
| 95 | 97 |
# Legacy name |
| 96 | 98 |
JOB_STATUS_WAITLOCK = JOB_STATUS_WAITING |
| b/test/ganeti.constants_unittest.py | ||
|---|---|---|
| 85 | 85 |
self.failUnless(set(constants.DISK_DT_DEFAULTS.keys()) == |
| 86 | 86 |
constants.DISK_TEMPLATES) |
| 87 | 87 |
|
| 88 |
def testJobStatus(self): |
|
| 89 |
self.assertFalse(constants.JOBS_PENDING & constants.JOBS_FINALIZED) |
|
| 90 |
self.assertFalse(constants.JOBS_PENDING - constants.JOB_STATUS_ALL) |
|
| 91 |
self.assertFalse(constants.JOBS_FINALIZED - constants.JOB_STATUS_ALL) |
|
| 92 |
|
|
| 88 | 93 |
|
| 89 | 94 |
class TestExportedNames(unittest.TestCase): |
| 90 | 95 |
_VALID_NAME_RE = re.compile(r"^[A-Z][A-Z0-9_]+$") |
| b/test/ganeti.rapi.client_unittest.py | ||
|---|---|---|
| 114 | 114 |
self.assertEqual(client.JOB_STATUS_CANCELED, constants.JOB_STATUS_CANCELED) |
| 115 | 115 |
self.assertEqual(client.JOB_STATUS_SUCCESS, constants.JOB_STATUS_SUCCESS) |
| 116 | 116 |
self.assertEqual(client.JOB_STATUS_ERROR, constants.JOB_STATUS_ERROR) |
| 117 |
self.assertEqual(client.JOB_STATUS_PENDING, constants.JOBS_PENDING) |
|
| 117 | 118 |
self.assertEqual(client.JOB_STATUS_FINALIZED, constants.JOBS_FINALIZED) |
| 118 | 119 |
self.assertEqual(client.JOB_STATUS_ALL, constants.JOB_STATUS_ALL) |
| 119 | 120 |
|
Also available in: Unified diff