Browse Source

Merge "Update SupportStatuses for objs where it needed"

changes/46/201046/3
Jenkins 7 years ago committed by Gerrit Code Review
parent
commit
f19194d83f
  1. 3
      contrib/rackspace/rackspace/resources/cloudnetworks.py
  2. 9
      heat/engine/resources/openstack/heat/cloud_watch.py
  3. 19
      heat/engine/resources/openstack/neutron/router.py
  4. 3
      heat/engine/resources/openstack/neutron/vpnservice.py
  5. 29
      heat/engine/resources/openstack/nova/server.py
  6. 3
      heat/engine/resources/openstack/sahara/sahara_cluster.py
  7. 3
      heat/engine/resources/openstack/zaqar/queue.py
  8. 3
      heat/tests/test_engine_service.py

3
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 = (

9
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,

19
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 = (

3
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')
]

29
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: '
'[<server name>, networks, <network name>, 0]}"')
'[<server name>, networks, <network name>, 0]}"'),
previous_status=support.SupportStatus(
status=support.DEPRECATED,
version='2014.2',
previous_status=support.SupportStatus(version='2013.2')
)
)
),
INSTANCE_NAME: attributes.Schema(

3
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')
],

3
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 : <resource_name> }"),
version='2015.1'
version='2015.1',
previous_status=support.SupportStatus(version='2014.1')
)
),
HREF: attributes.Schema(

3
heat/tests/test_engine_service.py

@ -1994,8 +1994,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))

Loading…
Cancel
Save