openstack/heat
Code Issues Proposed changes

Hidden OS::Designate::Record and OS::Designate::Domain

Browse Source 
We deprecated the resources OS::Designate::Record and
OS::Designate::Domain in ocata, so hidden them now.

Change-Id: I8f0529602f8d2ca50508c4f5ec00d255d078b8a9
This commit is contained in:
huangtianhua 2017-09-28 16:12:10 +08:00
parent a532535b61
commit c0f249d05b
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heat/engine/resources/openstack/designate/domain.py
View File

@ -28,10 +28,13 @@ class DesignateDomain(resource.Resource):
""" """
support_status = support.SupportStatus( support_status = support.SupportStatus(
status=support.DEPRECATED, status=support.HIDDEN,
version='8.0.0', version='10.0.0',
message=_('Use OS::Designate::Zone instead.'), message=_('Use OS::Designate::Zone instead.'),
previous_status=support.SupportStatus(version='5.0.0')) previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='8.0.0',
previous_status=support.SupportStatus(version='5.0.0')))
entity = 'domains' entity = 'domains'

9
heat/engine/resources/openstack/designate/record.py
View File

@ -29,10 +29,13 @@ class DesignateRecord(resource.Resource):
""" """
support_status = support.SupportStatus( support_status = support.SupportStatus(
status=support.DEPRECATED, status=support.HIDDEN,
version='8.0.0', version='10.0.0',
message=_('Use OS::Designate::RecordSet instead.'), message=_('Use OS::Designate::RecordSet instead.'),
previous_status=support.SupportStatus(version='5.0.0')) previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='8.0.0',
previous_status=support.SupportStatus(version='5.0.0')))
entity = 'records' entity = 'records'

10
heat/tests/engine/test_resource_type.py
View File

@ -43,9 +43,7 @@ class ResourceTypeTest(common.HeatTestCase):
mock_is_service_available): mock_is_service_available):
mock_is_service_available.return_value = (True, None) mock_is_service_available.return_value = (True, None)
resources = self.eng.list_resource_types(self.ctx, "DEPRECATED") resources = self.eng.list_resource_types(self.ctx, "DEPRECATED")
self.assertEqual(set(['OS::Designate::Domain', self.assertEqual(set(['OS::Heat::HARestarter',
'OS::Designate::Record',
'OS::Heat::HARestarter',
'OS::Magnum::Bay', 'OS::Magnum::Bay',
'OS::Magnum::BayModel', 'OS::Magnum::BayModel',
'OS::Glance::Image', 'OS::Glance::Image',
@ -77,12 +75,6 @@ class ResourceTypeTest(common.HeatTestCase):
resources = self.eng.list_resource_types(self.ctx, resources = self.eng.list_resource_types(self.ctx,
with_description=True) with_description=True)
self.assertIsInstance(resources, list) self.assertIsInstance(resources, list)
description = ("Heat Template Resource for Designate Domain.\n\n"
"Designate provides DNS-as-a-Service services for "
"OpenStack. So, domain\nis a realm with an "
"identification string, unique in DNS.")
self.assertIn({'resource_type': 'OS::Designate::Domain',
'description': description}, resources)
self.assertIn({'resource_type': 'AWS::RDS::DBInstance', self.assertIn({'resource_type': 'AWS::RDS::DBInstance',
'description': 'Builtin AWS::RDS::DBInstance'}, 'description': 'Builtin AWS::RDS::DBInstance'},
resources) resources)

6
releasenotes/notes/hidden-designate-domain-record-res-d445ca7f1251b63d.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
Hidden Designate resource plugins ``OS::Designate::Domain`` and
``OS::Designate::Record``. To use ``OS::Designate::Zone`` and
``OS::Designate::RecordSet`` instead.