From c0f249d05bdba84b56b5e6370dee405cfc317036 Mon Sep 17 00:00:00 2001
From: huangtianhua <huangtianhua@huawei.com>
Date: Thu, 28 Sep 2017 16:12:10 +0800
Subject: [PATCH] Hidden OS::Designate::Record and OS::Designate::Domain

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

Change-Id: I8f0529602f8d2ca50508c4f5ec00d255d078b8a9
---
 heat/engine/resources/openstack/designate/domain.py    |  9 ++++++---
 heat/engine/resources/openstack/designate/record.py    |  9 ++++++---
 heat/tests/engine/test_resource_type.py                | 10 +---------
 ...n-designate-domain-record-res-d445ca7f1251b63d.yaml |  6 ++++++
 4 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/hidden-designate-domain-record-res-d445ca7f1251b63d.yaml

diff --git a/heat/engine/resources/openstack/designate/domain.py b/heat/engine/resources/openstack/designate/domain.py
index ec3acfc2ad..d2d88bbf6a 100644
--- a/heat/engine/resources/openstack/designate/domain.py
+++ b/heat/engine/resources/openstack/designate/domain.py
@@ -28,10 +28,13 @@ class DesignateDomain(resource.Resource):
     """
 
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
-        version='8.0.0',
+        status=support.HIDDEN,
+        version='10.0.0',
         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'
 
diff --git a/heat/engine/resources/openstack/designate/record.py b/heat/engine/resources/openstack/designate/record.py
index 148bab8377..675e03810a 100644
--- a/heat/engine/resources/openstack/designate/record.py
+++ b/heat/engine/resources/openstack/designate/record.py
@@ -29,10 +29,13 @@ class DesignateRecord(resource.Resource):
     """
 
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
-        version='8.0.0',
+        status=support.HIDDEN,
+        version='10.0.0',
         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'
 
diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py
index e32b057a02..921ed3b96c 100644
--- a/heat/tests/engine/test_resource_type.py
+++ b/heat/tests/engine/test_resource_type.py
@@ -43,9 +43,7 @@ class ResourceTypeTest(common.HeatTestCase):
                                             mock_is_service_available):
         mock_is_service_available.return_value = (True, None)
         resources = self.eng.list_resource_types(self.ctx, "DEPRECATED")
-        self.assertEqual(set(['OS::Designate::Domain',
-                              'OS::Designate::Record',
-                              'OS::Heat::HARestarter',
+        self.assertEqual(set(['OS::Heat::HARestarter',
                               'OS::Magnum::Bay',
                               'OS::Magnum::BayModel',
                               'OS::Glance::Image',
@@ -77,12 +75,6 @@ class ResourceTypeTest(common.HeatTestCase):
         resources = self.eng.list_resource_types(self.ctx,
                                                  with_description=True)
         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',
                        'description': 'Builtin AWS::RDS::DBInstance'},
                       resources)
diff --git a/releasenotes/notes/hidden-designate-domain-record-res-d445ca7f1251b63d.yaml b/releasenotes/notes/hidden-designate-domain-record-res-d445ca7f1251b63d.yaml
new file mode 100644
index 0000000000..c300552e5e
--- /dev/null
+++ b/releasenotes/notes/hidden-designate-domain-record-res-d445ca7f1251b63d.yaml
@@ -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.
\ No newline at end of file