openstack
/
heat
Code Issues Proposed changes

Merge "Hidden StructuredDeployments and SoftwareDeployments"

This commit is contained in:
Jenkins 2016-07-22 23:04:48 +00:00 committed by Gerrit Code Review
parent 1cf9313e8e e95d912f3f
commit e05632fcd9
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat/engine/resources/openstack/heat/software_deployment.py
View File

@ -686,11 +686,14 @@ class SoftwareDeploymentGroup(resource_group.ResourceGroup):
class SoftwareDeployments(SoftwareDeploymentGroup):
deprecation_msg = _('Use of this resource is discouraged. Please use '
'OS::Heat::SoftwareDeploymentGroup instead.')
support_status = support.SupportStatus(status=support.DEPRECATED,
message=deprecation_msg,
version='2014.2')
hidden_msg = _('Please use OS::Heat::SoftwareDeploymentGroup instead.')
support_status = support.SupportStatus(
status=support.HIDDEN,
message=hidden_msg,
version='7.0.0',
previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='2014.2'))
def resource_mapping():

13
heat/engine/resources/openstack/heat/structured_config.py
View File

@ -235,11 +235,14 @@ class StructuredDeploymentGroup(sd.SoftwareDeploymentGroup):
class StructuredDeployments(StructuredDeploymentGroup):
deprecation_msg = _('Use of this resource is discouraged. Please use '
'OS::Heat::StructuredDeploymentGroup instead.')
support_status = support.SupportStatus(status=support.DEPRECATED,
message=deprecation_msg,
version='2014.2')
hidden_msg = _('Please use OS::Heat::StructuredDeploymentGroup instead.')
support_status = support.SupportStatus(
status=support.HIDDEN,
message=hidden_msg,
version='7.0.0',
previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='2014.2'))
def resource_mapping():

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

@ -44,8 +44,6 @@ 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::Heat::HARestarter',
'OS::Heat::SoftwareDeployments',
'OS::Heat::StructuredDeployments',
'OS::Neutron::HealthMonitor',
'OS::Neutron::LoadBalancer',
'OS::Neutron::Pool',