openstack
/
magnum
Code Issues Proposed changes

Add RESUME_FAILED to cluster's status field 

Heat stack may return RESUME_FAILED, sync this status to cluster object.

Closes-Bug: #1646324
Change-Id: If48fc62d91fddeb579048a4ff5c4b238d3c5324c
This commit is contained in:
Eli Qiao 2016-12-01 11:38:57 +08:00
parent 1cf8a5f422
commit 6033d0ef6f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/objects/cluster.py
View File

@ -42,8 +42,9 @@ class Cluster(base.MagnumPersistentObject, base.MagnumObject,
# Rename 'baymodel_id' to 'cluster_template_id'
# Rename 'bay_create_timeout' to 'create_timeout'
# Version 1.10: Added 'keypair' field
# Version 1.11: Added 'RESUME_FAILED' in status field
VERSION = '1.10'
VERSION = '1.11'
dbapi = dbapi.get_instance()

9
magnum/objects/fields.py
View File

@ -26,6 +26,7 @@ class ClusterStatus(fields.Enum):
DELETE_FAILED = 'DELETE_FAILED'
DELETE_COMPLETE = 'DELETE_COMPLETE'
RESUME_COMPLETE = 'RESUME_COMPLETE'
RESUME_FAILED = 'RESUME_FAILED'
RESTORE_COMPLETE = 'RESTORE_COMPLETE'
ROLLBACK_IN_PROGRESS = 'ROLLBACK_IN_PROGRESS'
ROLLBACK_FAILED = 'ROLLBACK_FAILED'
@ -37,12 +38,12 @@ class ClusterStatus(fields.Enum):
ALL = (CREATE_IN_PROGRESS, CREATE_FAILED, CREATE_COMPLETE,
UPDATE_IN_PROGRESS, UPDATE_FAILED, UPDATE_COMPLETE,
DELETE_IN_PROGRESS, DELETE_FAILED, DELETE_COMPLETE,
RESUME_COMPLETE, RESTORE_COMPLETE, ROLLBACK_IN_PROGRESS,
ROLLBACK_FAILED, ROLLBACK_COMPLETE, SNAPSHOT_COMPLETE,
CHECK_COMPLETE, ADOPT_COMPLETE)
RESUME_COMPLETE, RESUME_FAILED, RESTORE_COMPLETE,
ROLLBACK_IN_PROGRESS, ROLLBACK_FAILED, ROLLBACK_COMPLETE,
SNAPSHOT_COMPLETE, CHECK_COMPLETE, ADOPT_COMPLETE)
STATUS_FAILED = (CREATE_FAILED, UPDATE_FAILED,
DELETE_FAILED, ROLLBACK_FAILED)
DELETE_FAILED, ROLLBACK_FAILED, RESUME_FAILED)
def __init__(self):
super(ClusterStatus, self).__init__(valid_values=ClusterStatus.ALL)

2
magnum/tests/unit/objects/test_objects.py
View File

@ -362,7 +362,7 @@ class TestObject(test_base.TestCase, _TestObject):
# For more information on object version testing, read
# http://docs.openstack.org/developer/magnum/objects.html
object_data = {
'Cluster': '1.10-377082b6d7895cd800a39fa004765538',
'Cluster': '1.11-d4566648f0158e45e43b0c0419814d1f',
'ClusterTemplate': '1.17-65a95ef932dd08800a83871eb3cf312b',
'Certificate': '1.1-1924dc077daa844f0f9076332ef96815',
'MyObj': '1.0-34c4b1aadefd177b13f9a2f894cc23cd',