Merge "Hidden resources in Rocky"11.0.0.0b3

5 files changed, 46 insertions, 20 deletions

diff --git a/heat/engine/resources/openstack/magnum/bay.py b/heat/engine/resources/openstack/magnum/bay.py
index e7e3faefb..fd2ed643c 100644
--- a/heat/engine/resources/openstack/magnum/bay.py
+++ b/heat/engine/resources/openstack/magnum/bay.py
@@ -29,12 +29,17 @@ class Bay(resource.Resource):
 
     deprecation_msg = _('Please use OS::Magnum::Cluster instead.')
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
+        status=support.HIDDEN,
         message=deprecation_msg,
-        version='9.0.0',
+        version='11.0.0',
         previous_status=support.SupportStatus(
-            status=support.SUPPORTED,
-            version='6.0.0')
+            status=support.DEPRECATED,
+            message=deprecation_msg,
+            version='9.0.0',
+            previous_status=support.SupportStatus(
+                status=support.SUPPORTED,
+                version='6.0.0')
+        )
     )
 
     PROPERTIES = (
diff --git a/heat/engine/resources/openstack/magnum/baymodel.py b/heat/engine/resources/openstack/magnum/baymodel.py
index 751f43517..156907c7d 100644
--- a/heat/engine/resources/openstack/magnum/baymodel.py
+++ b/heat/engine/resources/openstack/magnum/baymodel.py
@@ -28,13 +28,18 @@ class BayModel(cluster_template.ClusterTemplate):
 
     deprecate_msg = _('Please use OS::Magnum::ClusterTemplate instead.')
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
+        status=support.HIDDEN,
         message=deprecate_msg,
-        version='9.0.0',
+        version='11.0.0',
         previous_status=support.SupportStatus(
-            status=support.SUPPORTED,
-            version='5.0.0'),
-        substitute_class=cluster_template.ClusterTemplate
+            status=support.DEPRECATED,
+            message=deprecate_msg,
+            version='9.0.0',
+            previous_status=support.SupportStatus(
+                status=support.SUPPORTED,
+                version='5.0.0'),
+            substitute_class=cluster_template.ClusterTemplate
+        )
     )
 
     def translation_rules(self, props):
diff --git a/heat/engine/resources/openstack/nova/floatingip.py b/heat/engine/resources/openstack/nova/floatingip.py
index 3a2c1d288..83e5e7fca 100644
--- a/heat/engine/resources/openstack/nova/floatingip.py
+++ b/heat/engine/resources/openstack/nova/floatingip.py
@@ -38,10 +38,15 @@ class NovaFloatingIp(resource.Resource):
 
     deprecation_msg = _('Please use OS::Neutron::FloatingIP instead.')
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
+        status=support.HIDDEN,
         message=deprecation_msg,
-        version='9.0.0',
-        previous_status=support.SupportStatus(version='2014.1')
+        version='11.0.0',
+        previous_status=support.SupportStatus(
+            status=support.DEPRECATED,
+            message=deprecation_msg,
+            version='9.0.0',
+            previous_status=support.SupportStatus(version='2014.1')
+        )
     )
 
     required_service_extension = 'os-floating-ips'
@@ -132,10 +137,15 @@ class NovaFloatingIpAssociation(resource.Resource):
     deprecation_msg = _(
         'Please use OS::Neutron::FloatingIPAssociation instead.')
     support_status = support.SupportStatus(
-        status=support.DEPRECATED,
+        status=support.HIDDEN,
         message=deprecation_msg,
-        version='9.0.0',
-        previous_status=support.SupportStatus(version='2014.1')
+        version='11.0.0',
+        previous_status=support.SupportStatus(
+            status=support.DEPRECATED,
+            message=deprecation_msg,
+            version='9.0.0',
+            previous_status=support.SupportStatus(version='2014.1')
+        )
     )
 
     PROPERTIES = (
diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py
index 25bbc05e0..2f67d700d 100644
--- a/heat/tests/engine/test_resource_type.py
+++ b/heat/tests/engine/test_resource_type.py
@@ -44,11 +44,7 @@ class ResourceTypeTest(common.HeatTestCase):
         mock_is_service_available.return_value = (True, None)
         resources = self.eng.list_resource_types(self.ctx, "DEPRECATED")
         self.assertEqual(set(['OS::Aodh::Alarm',
-                              'OS::Magnum::Bay',
-                              'OS::Magnum::BayModel',
-                              'OS::Glance::Image',
-                              'OS::Nova::FloatingIP',
-                              'OS::Nova::FloatingIPAssociation']),
+                              'OS::Glance::Image']),
                          set(resources))
 
     @mock.patch.object(res.Resource, 'is_service_available')
diff --git a/releasenotes/notes/hidden-resources-529934d5eb519c86.yaml b/releasenotes/notes/hidden-resources-529934d5eb519c86.yaml
new file mode 100644
index 000000000..dbc2afd48
--- /dev/null
+++ b/releasenotes/notes/hidden-resources-529934d5eb519c86.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - Resource type ``OS::Magnum::Bay`` is now hidden, please use
+    ``OS::Magnum::Cluster`` instead.
+  - Resource type ``OS::Magnum::BayModele`` is now hidden, please use
+    ``OS::Magnum::ClusterTemplate`` instead.
+  - Resource type ``OS::Nova::FloatingIP`` is now hidden, please use
+    ``OS::Neutron::FloatingIP`` instead.
+  - Resource type ``OS::Nova::FloatingIPAssociation`` is now hidden, please use
+    ``OS::Neutron::FloatingIPAssociation`` instead.