Merge "Hidden resources in Rocky"

heat/engine/resources/openstack/magnum/bay.py

@@ -29,6 +29,10 @@ class Bay(resource.Resource):
 
     deprecation_msg = _('Please use OS::Magnum::Cluster instead.')
     support_status = support.SupportStatus(
+        status=support.HIDDEN,
+        message=deprecation_msg,
+        version='11.0.0',
+        previous_status=support.SupportStatus(
             status=support.DEPRECATED,
             message=deprecation_msg,
             version='9.0.0',
@@ -36,6 +40,7 @@ class Bay(resource.Resource):
                 status=support.SUPPORTED,
                 version='6.0.0')
         )
+    )
 
     PROPERTIES = (
         NAME, BAYMODEL, NODE_COUNT, MASTER_COUNT, DISCOVERY_URL,

heat/engine/resources/openstack/magnum/baymodel.py

@@ -28,6 +28,10 @@ class BayModel(cluster_template.ClusterTemplate):
 
     deprecate_msg = _('Please use OS::Magnum::ClusterTemplate instead.')
     support_status = support.SupportStatus(
+        status=support.HIDDEN,
+        message=deprecate_msg,
+        version='11.0.0',
+        previous_status=support.SupportStatus(
             status=support.DEPRECATED,
             message=deprecate_msg,
             version='9.0.0',
@@ -36,6 +40,7 @@ class BayModel(cluster_template.ClusterTemplate):
                 version='5.0.0'),
             substitute_class=cluster_template.ClusterTemplate
         )
+    )
 
     def translation_rules(self, props):
         if props.get(self.SSH_AUTHORIZED_KEY):

heat/engine/resources/openstack/nova/floatingip.py

@@ -38,11 +38,16 @@ class NovaFloatingIp(resource.Resource):
 
     deprecation_msg = _('Please use OS::Neutron::FloatingIP instead.')
     support_status = support.SupportStatus(
+        status=support.HIDDEN,
+        message=deprecation_msg,
+        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,11 +137,16 @@ class NovaFloatingIpAssociation(resource.Resource):
     deprecation_msg = _(
         'Please use OS::Neutron::FloatingIPAssociation instead.')
     support_status = support.SupportStatus(
+        status=support.HIDDEN,
+        message=deprecation_msg,
+        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 = (
         SERVER, FLOATING_IP

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::Glance::Image']),
-                              'OS::Magnum::BayModel',
-                              'OS::Glance::Image',
-                              'OS::Nova::FloatingIP',
-                              'OS::Nova::FloatingIPAssociation']),
                          set(resources))
 
     @mock.patch.object(res.Resource, 'is_service_available')

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.