From 80dfa8c9a719d798d6743fbfcee56ce421c9a577 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Thu, 9 Feb 2017 15:53:37 +0800 Subject: [PATCH] Mark deprecated resources as HIDDEN Change-Id: Ib271b2e51d8c65a2a76f7049d0fe12727869e400 --- .../developing_guides/supportstatus.rst | 2 +- heat/engine/resources/openstack/aodh/alarm.py | 15 ++++--- .../openstack/neutron/loadbalancer.py | 40 ++++++++++++++++--- .../resources/openstack/neutron/port.py | 17 +++++--- .../resources/openstack/neutron/router.py | 9 ++++- .../engine/resources/openstack/nova/server.py | 10 +++-- heat/tests/engine/test_resource_type.py | 7 +--- 7 files changed, 71 insertions(+), 29 deletions(-) diff --git a/doc/source/developing_guides/supportstatus.rst b/doc/source/developing_guides/supportstatus.rst index 1abfb8a8c3..0c084220fe 100644 --- a/doc/source/developing_guides/supportstatus.rst +++ b/doc/source/developing_guides/supportstatus.rst @@ -201,7 +201,7 @@ status should be moved to *previous_status*, e.g.: support.SupportStatus( status=support.HIDDEN, - version='5.0.0', + version='6.0.0', message=_('Some message'), previous_status=support.SupportStatus( status=support.DEPRECATED, diff --git a/heat/engine/resources/openstack/aodh/alarm.py b/heat/engine/resources/openstack/aodh/alarm.py index a2312989a1..42df08c568 100644 --- a/heat/engine/resources/openstack/aodh/alarm.py +++ b/heat/engine/resources/openstack/aodh/alarm.py @@ -242,11 +242,16 @@ class CombinationAlarm(alarm_base.BaseAlarm): entity = 'alarms' support_status = support.SupportStatus( - status=support.DEPRECATED, - version='7.0.0', - message=_('The combination alarm is deprecated and ' - 'disabled by default in Aodh.'), - previous_status=support.SupportStatus(version='2014.1')) + status=support.HIDDEN, + message=_('OS::Aodh::CombinationAlarm is deprecated, ' + 'use OS::Aodh::CompositeAlarm instead.'), + version='9.0.0', + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='7.0.0', + previous_status=support.SupportStatus(version='2014.1') + ) + ) PROPERTIES = ( ALARM_IDS, OPERATOR, diff --git a/heat/engine/resources/openstack/neutron/loadbalancer.py b/heat/engine/resources/openstack/neutron/loadbalancer.py index 18f85ac425..72015c80d0 100644 --- a/heat/engine/resources/openstack/neutron/loadbalancer.py +++ b/heat/engine/resources/openstack/neutron/loadbalancer.py @@ -46,7 +46,14 @@ class HealthMonitor(neutron.NeutronResource): entity = 'health_monitor' support_status = support.SupportStatus( - support.DEPRECATED, DEPR_MSG, version='7.0.0' + status=support.HIDDEN, + version='9.0.0', + message=_('Use LBaaS V2 instead.'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + message=DEPR_MSG, + version='7.0.0' + ) ) PROPERTIES = ( @@ -203,7 +210,14 @@ class Pool(neutron.NeutronResource): entity = 'pool' support_status = support.SupportStatus( - support.DEPRECATED, DEPR_MSG, version='7.0.0' + status=support.HIDDEN, + version='9.0.0', + message=_('Use LBaaS V2 instead.'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + message=DEPR_MSG, + version='7.0.0' + ) ) PROPERTIES = ( @@ -604,8 +618,15 @@ class PoolMember(neutron.NeutronResource): entity = 'member' support_status = support.SupportStatus( - support.DEPRECATED, DEPR_MSG, version='7.0.0', - previous_status=support.SupportStatus(version='2014.1') + status=support.HIDDEN, + version='9.0.0', + message=_('Use LBaaS V2 instead.'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + message=DEPR_MSG, + version='7.0.0', + previous_status=support.SupportStatus(version='2014.1') + ) ) PROPERTIES = ( @@ -733,8 +754,15 @@ class LoadBalancer(resource.Resource): required_service_extension = 'lbaas' support_status = support.SupportStatus( - support.DEPRECATED, DEPR_MSG, version='7.0.0', - previous_status=support.SupportStatus(version='2014.1') + status=support.HIDDEN, + version='9.0.0', + message=_('Use LBaaS V2 instead.'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + message=DEPR_MSG, + version='7.0.0', + previous_status=support.SupportStatus(version='2014.1') + ) ) PROPERTIES = ( diff --git a/heat/engine/resources/openstack/neutron/port.py b/heat/engine/resources/openstack/neutron/port.py index e56d92a9dc..8d40b3b0be 100644 --- a/heat/engine/resources/openstack/neutron/port.py +++ b/heat/engine/resources/openstack/neutron/port.py @@ -189,12 +189,17 @@ class Port(neutron.NeutronResource): ], update_allowed=True, support_status=support.SupportStatus( - status=support.DEPRECATED, - version='6.0.0', - message=_('Replacement policy used to work around flawed ' - 'nova/neutron port interaction which has been ' - 'fixed since Liberty.'), - previous_status=support.SupportStatus(version='2014.2')) + status=support.HIDDEN, + version='9.0.0', + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='6.0.0', + message=_('Replacement policy used to work around flawed ' + 'nova/neutron port interaction which has been ' + 'fixed since Liberty.'), + previous_status=support.SupportStatus(version='2014.2') + ) + ) ), DNS_NAME: properties.Schema( properties.Schema.STRING, diff --git a/heat/engine/resources/openstack/neutron/router.py b/heat/engine/resources/openstack/neutron/router.py index 3c496b8ce9..a05eafcd86 100644 --- a/heat/engine/resources/openstack/neutron/router.py +++ b/heat/engine/resources/openstack/neutron/router.py @@ -551,9 +551,14 @@ class RouterGateway(neutron.NeutronResource): NETWORK_ID: properties.Schema( properties.Schema.STRING, support_status=support.SupportStatus( - status=support.DEPRECATED, + status=support.HIDDEN, message=_('Use property %s.') % NETWORK, - version='2014.2'), + version='9.0.0', + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='2014.2' + ) + ), constraints=[ constraints.CustomConstraint('neutron.network') ], diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 3bdcac4471..ee30b1993a 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -221,12 +221,16 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin, properties.Schema.STRING, _('The ID of the image to create a volume from.'), support_status=support.SupportStatus( - status=support.DEPRECATED, - version='7.0.0', + status=support.HIDDEN, + version='9.0.0', message=_('Use property %s.') % BLOCK_DEVICE_MAPPING_IMAGE, previous_status=support.SupportStatus( - version='5.0.0') + status=support.DEPRECATED, + version='7.0.0', + previous_status=support.SupportStatus( + version='5.0.0') + ) ), constraints=[ constraints.CustomConstraint('glance.image') diff --git a/heat/tests/engine/test_resource_type.py b/heat/tests/engine/test_resource_type.py index 266f1c47ef..b9d6fe6f83 100644 --- a/heat/tests/engine/test_resource_type.py +++ b/heat/tests/engine/test_resource_type.py @@ -46,12 +46,7 @@ class ResourceTypeTest(common.HeatTestCase): self.assertEqual(set(['OS::Designate::Domain', 'OS::Designate::Record', 'OS::Heat::HARestarter', - 'OS::Neutron::HealthMonitor', - 'OS::Neutron::LoadBalancer', - 'OS::Neutron::Pool', - 'OS::Neutron::PoolMember', - 'OS::Glance::Image', - 'OS::Aodh::CombinationAlarm']), + 'OS::Glance::Image']), set(resources)) @mock.patch.object(res.Resource, 'is_service_available')