openstack
/
designate
Code Issues Proposed changes

Merge "Add 'DELETED', 'NO_ZONE' and 'SUCCESS' status for objects."

This commit is contained in:
Jenkins 2017-06-09 13:04:14 +00:00 committed by Gerrit Code Review
parent 350433b019 dfa526a5fc
commit 877d7818d6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
designate/objects/record.py
View File

@ -78,7 +78,8 @@ class Record(base.DictObjectMixin, base.PersistentObjectMixin,
'status': {
'schema': {
'type': 'string',
'enum': ['ACTIVE', 'PENDING', 'ERROR'],
'enum': ['ACTIVE', 'PENDING', 'ERROR',
'DELETED', 'SUCCESS', 'NO_ZONE']
},
},
'tenant_id': {

3
designate/objects/zone.py
View File

@ -117,7 +117,8 @@ class Zone(base.DictObjectMixin, base.SoftDeleteObjectMixin,
'status': {
'schema': {
'type': 'string',
'enum': ['ACTIVE', 'PENDING', 'ERROR'],
'enum': ['ACTIVE', 'PENDING', 'ERROR',
'DELETED', 'SUCCESS', 'NO_ZONE']
},
'read_only': True,
},

9
designate/tests/unit/test_objects/test_recordset.py
View File

@ -181,6 +181,15 @@ class RecordSetTest(oslotest.base.BaseTestCase):
)
self.assertEqual('ACTIVE', rs.status)
def test_status_deleted(self):
rs = objects.RecordSet(
name='www.example.org.', type='A',
records=objects.RecordList(objects=[
objects.Record(data='192.0.2.2', status='DELETED'),
])
)
self.assertEqual('DELETED', rs.status)
def test_validate(self):
rs = create_test_recordset()
rs.validate()