From b1dd9255b5396a3081e9cb8b703bcf5286454e11 Mon Sep 17 00:00:00 2001 From: Peter Razumovsky Date: Thu, 4 Jun 2015 16:44:12 +0300 Subject: [PATCH] Update SupportStatuses for objs where it needed Update SupportStatuses for objects, which don't require translation_rules method. Add for some properties new status HIDDEN with current version 5.0.0 following [1]. [1] https://etherpad.openstack.org/p/YVR-heat-liberty-deprecation bp deprecating-improvements Change-Id: Ifab53f5deec64b59e5c11e24a74a8ca0b9f113e6 --- .../rackspace/resources/cloudnetworks.py | 3 +- .../resources/openstack/heat/cloud_watch.py | 9 ++++-- .../resources/openstack/neutron/router.py | 19 ++++++++---- .../resources/openstack/neutron/vpnservice.py | 3 +- .../engine/resources/openstack/nova/server.py | 29 +++++++++++++------ .../openstack/sahara/sahara_cluster.py | 3 +- .../engine/resources/openstack/zaqar/queue.py | 3 +- heat/tests/test_engine_service.py | 3 +- 8 files changed, 50 insertions(+), 22 deletions(-) diff --git a/contrib/rackspace/rackspace/resources/cloudnetworks.py b/contrib/rackspace/rackspace/resources/cloudnetworks.py index 2598028aaa..0b7015e682 100644 --- a/contrib/rackspace/rackspace/resources/cloudnetworks.py +++ b/contrib/rackspace/rackspace/resources/cloudnetworks.py @@ -49,7 +49,8 @@ class CloudNetwork(resource.Resource): support_status = support.SupportStatus( status=support.DEPRECATED, message=_('Use OS::Neutron::Net instead.'), - version='2015.1' + version='2015.1', + previous_status=support.SupportStatus(version='2014.1') ) PROPERTIES = ( diff --git a/heat/engine/resources/openstack/heat/cloud_watch.py b/heat/engine/resources/openstack/heat/cloud_watch.py index d350a21e4b..59563db541 100644 --- a/heat/engine/resources/openstack/heat/cloud_watch.py +++ b/heat/engine/resources/openstack/heat/cloud_watch.py @@ -141,10 +141,15 @@ class CloudWatchAlarm(resource.Resource): strict_dependency = False support_status = support.SupportStatus( - status=support.DEPRECATED, + status=support.HIDDEN, message=_('OS::Heat::CWLiteAlarm is deprecated, ' 'use OS::Ceilometer::Alarm instead.'), - version='2014.2') + version='5.0.0', + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='2014.2' + ) + ) def handle_create(self): wr = watchrule.WatchRule(context=self.context, diff --git a/heat/engine/resources/openstack/neutron/router.py b/heat/engine/resources/openstack/neutron/router.py index 15ab6a8678..fc56af57d4 100644 --- a/heat/engine/resources/openstack/neutron/router.py +++ b/heat/engine/resources/openstack/neutron/router.py @@ -94,7 +94,8 @@ class Router(neutron.NeutronResource): support_status=support.SupportStatus( status=support.DEPRECATED, version='2015.1', - message=_('Use property %s.') % L3_AGENT_IDS), + message=_('Use property %s.') % L3_AGENT_IDS, + previous_status=support.SupportStatus(version='2014.1')), ), L3_AGENT_IDS: properties.Schema( properties.Schema.LIST, @@ -283,7 +284,9 @@ class RouterInterface(neutron.NeutronResource): support_status=support.SupportStatus( status=support.DEPRECATED, message=_('Use property %s.') % ROUTER, - version='2015.1'), + version='2015.1', + previous_status=support.SupportStatus(version='2013.1') + ), constraints=[ constraints.CustomConstraint('neutron.router') ], @@ -312,7 +315,9 @@ class RouterInterface(neutron.NeutronResource): support_status=support.SupportStatus( status=support.DEPRECATED, message=_('Use property %s.') % PORT, - version='2015.1'), + version='2015.1', + previous_status=support.SupportStatus(version='2014.1') + ), constraints=[ constraints.CustomConstraint('neutron.port') ] @@ -394,10 +399,14 @@ class RouterInterface(neutron.NeutronResource): class RouterGateway(neutron.NeutronResource): support_status = support.SupportStatus( - status=support.DEPRECATED, + status=support.HIDDEN, message=_('Use the `external_gateway_info` property in ' 'the router resource to set up the gateway.'), - version='2014.1' + version='5.0.0', + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='2014.1' + ) ) PROPERTIES = ( diff --git a/heat/engine/resources/openstack/neutron/vpnservice.py b/heat/engine/resources/openstack/neutron/vpnservice.py index 54dcf79861..3f67d81301 100644 --- a/heat/engine/resources/openstack/neutron/vpnservice.py +++ b/heat/engine/resources/openstack/neutron/vpnservice.py @@ -82,7 +82,8 @@ class VPNService(neutron.NeutronResource): support_status=support.SupportStatus( status=support.DEPRECATED, message=_('Use property %s') % ROUTER, - version='2015.1'), + version='2015.1', + previous_status=support.SupportStatus(version='2013.2')), constraints=[ constraints.CustomConstraint('neutron.router') ] diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py index 8f00c7c1aa..a4dabd1fd1 100644 --- a/heat/engine/resources/openstack/nova/server.py +++ b/heat/engine/resources/openstack/nova/server.py @@ -293,13 +293,19 @@ class Server(stack_user.StackUser): ), ADMIN_USER: properties.Schema( properties.Schema.STRING, - _('Name of the administrative user to use on the server. ' - 'The default cloud-init user set up for each image ' - '(e.g. "ubuntu" for Ubuntu 12.04+, "fedora" for Fedora 19+ ' - 'and "cloud-user" for CentOS/RHEL 6.5).'), + _('Name of the administrative user to use on the server.'), support_status=support.SupportStatus( - status=support.DEPRECATED, - version='2014.1') + status=support.HIDDEN, + version='5.0.0', + message=_('The default cloud-init user set up for each image ' + '(e.g. "ubuntu" for Ubuntu 12.04+, "fedora" for ' + 'Fedora 19+ and "cloud-user" for CentOS/RHEL 6.5).'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='2014.1', + previous_status=support.SupportStatus(version='2013.2') + ) + ) ), AVAILABILITY_ZONE: properties.Schema( properties.Schema.STRING, @@ -464,11 +470,16 @@ class Server(stack_user.StackUser): 'this time. Result may not be predictable if the server has ' 'addresses from more than one network.'), support_status=support.SupportStatus( - status=support.DEPRECATED, - version='2014.2', + status=support.HIDDEN, + version='5.0.0', message=_('Use the networks attribute instead of ' 'first_address. For example: "{get_attr: ' - '[, networks, , 0]}"') + '[, networks, , 0]}"'), + previous_status=support.SupportStatus( + status=support.DEPRECATED, + version='2014.2', + previous_status=support.SupportStatus(version='2013.2') + ) ) ), INSTANCE_NAME: attributes.Schema( diff --git a/heat/engine/resources/openstack/sahara/sahara_cluster.py b/heat/engine/resources/openstack/sahara/sahara_cluster.py index 17fb90ff5f..035acf3839 100644 --- a/heat/engine/resources/openstack/sahara/sahara_cluster.py +++ b/heat/engine/resources/openstack/sahara/sahara_cluster.py @@ -82,7 +82,8 @@ class SaharaCluster(resource.Resource): support_status=support.SupportStatus( status=support.DEPRECATED, message=_('Use property %s.') % IMAGE_ID, - version='2015.1'), + version='2015.1', + previous_status=support.SupportStatus(version='2014.2')), constraints=[ constraints.CustomConstraint('glance.image') ], diff --git a/heat/engine/resources/openstack/zaqar/queue.py b/heat/engine/resources/openstack/zaqar/queue.py index 58ecfd6680..86676e2ab7 100644 --- a/heat/engine/resources/openstack/zaqar/queue.py +++ b/heat/engine/resources/openstack/zaqar/queue.py @@ -57,7 +57,8 @@ class ZaqarQueue(resource.Resource): status=support.DEPRECATED, message=_("Use get_resource|Ref command instead. " "For example: { get_resource : }"), - version='2015.1' + version='2015.1', + previous_status=support.SupportStatus(version='2014.1') ) ), HREF: attributes.Schema( diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 9e8e38d5e6..7db2e78ef4 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -2191,8 +2191,7 @@ class StackServiceTest(common.HeatTestCase): mock_is_service_available): mock_is_service_available.return_value = True resources = self.eng.list_resource_types(self.ctx, "DEPRECATED") - self.assertEqual(set(['OS::Neutron::RouterGateway', - 'OS::Heat::HARestarter', + self.assertEqual(set(['OS::Heat::HARestarter', 'OS::Heat::SoftwareDeployments', 'OS::Heat::StructuredDeployments']), set(resources))