openstack/heat
Code Issues Proposed changes

Merge "All resources to use Schema update_allowed"

Browse Source
This commit is contained in:
Jenkins 2014-05-28 09:49:47 +00:00 committed by Gerrit Code Review
commit 57fac39bc4
1 changed files with 22 additions and 22 deletions

44
contrib/rackspace/rackspace/resources/auto_scale.py

@ -223,7 +223,8 @@ class Group(resource.Resource):
'this group.') 'this group.')
), ),
}, },
required=True required=True,
update_allowed=True
), ),
LAUNCH_CONFIGURATION: properties.Schema( LAUNCH_CONFIGURATION: properties.Schema(
properties.Schema.MAP, properties.Schema.MAP,
@ -245,16 +246,14 @@ class Group(resource.Resource):
] ]
), ),
}, },
required=True required=True,
update_allowed=True
), ),
# We don't allow scaling policies to be specified here, despite the # We don't allow scaling policies to be specified here, despite the
# fact that the API supports it. Users should use the ScalingPolicy # fact that the API supports it. Users should use the ScalingPolicy
# resource. # resource.
} }
# Everything can be changed.
update_allowed_properties = (GROUP_CONFIGURATION, LAUNCH_CONFIGURATION)
def _get_group_config_args(self, groupconf): def _get_group_config_args(self, groupconf):
"""Get the groupConfiguration-related pyrax arguments.""" """Get the groupConfiguration-related pyrax arguments."""
return dict( return dict(
@ -376,27 +375,32 @@ class ScalingPolicy(resource.Resource):
NAME: properties.Schema( NAME: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('Name of this scaling policy.'), _('Name of this scaling policy.'),
required=True required=True,
update_allowed=True
), ),
CHANGE: properties.Schema( CHANGE: properties.Schema(
properties.Schema.NUMBER, properties.Schema.NUMBER,
_('Amount to add to or remove from current number of instances. ' _('Amount to add to or remove from current number of instances. '
'Incompatible with changePercent and desiredCapacity.') 'Incompatible with changePercent and desiredCapacity.'),
update_allowed=True
), ),
CHANGE_PERCENT: properties.Schema( CHANGE_PERCENT: properties.Schema(
properties.Schema.NUMBER, properties.Schema.NUMBER,
_('Percentage-based change to add or remove from current number ' _('Percentage-based change to add or remove from current number '
'of instances. Incompatible with change and desiredCapacity.') 'of instances. Incompatible with change and desiredCapacity.'),
update_allowed=True
), ),
DESIRED_CAPACITY: properties.Schema( DESIRED_CAPACITY: properties.Schema(
properties.Schema.NUMBER, properties.Schema.NUMBER,
_('Absolute number to set the number of instances to. ' _('Absolute number to set the number of instances to. '
'Incompatible with change and changePercent.') 'Incompatible with change and changePercent.'),
update_allowed=True
), ),
COOLDOWN: properties.Schema( COOLDOWN: properties.Schema(
properties.Schema.NUMBER, properties.Schema.NUMBER,
_('Number of seconds after a policy execution during which ' _('Number of seconds after a policy execution during which '
'further executions are disabled.') 'further executions are disabled.'),
update_allowed=True
), ),
TYPE: properties.Schema( TYPE: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
@ -406,19 +410,16 @@ class ScalingPolicy(resource.Resource):
constraints=[ constraints=[
constraints.AllowedValues(['webhook', 'schedule', constraints.AllowedValues(['webhook', 'schedule',
'cloud_monitoring']), 'cloud_monitoring']),
] ],
update_allowed=True
), ),
ARGS: properties.Schema( ARGS: properties.Schema(
properties.Schema.MAP, properties.Schema.MAP,
_('Type-specific arguments for the policy.') _('Type-specific arguments for the policy.'),
update_allowed=True
), ),
} }
# Everything other than group can be changed.
update_allowed_properties = (
NAME, CHANGE, CHANGE_PERCENT, DESIRED_CAPACITY, COOLDOWN, TYPE, ARGS,
)
def _get_args(self, properties): def _get_args(self, properties):
"""Get pyrax-style create arguments for scaling policies.""" """Get pyrax-style create arguments for scaling policies."""
args = dict( args = dict(
@ -500,17 +501,16 @@ class WebHook(resource.Resource):
NAME: properties.Schema( NAME: properties.Schema(
properties.Schema.STRING, properties.Schema.STRING,
_('The name of this webhook.'), _('The name of this webhook.'),
required=True required=True,
update_allowed=True
), ),
METADATA: properties.Schema( METADATA: properties.Schema(
properties.Schema.MAP, properties.Schema.MAP,
_('Arbitrary key/value metadata for this webhook.') _('Arbitrary key/value metadata for this webhook.'),
update_allowed=True
), ),
} }
# Everything other than policy can be changed.
update_allowed_properties = (NAME, METADATA)
attributes_schema = { attributes_schema = {
EXECUTE_URL: attributes.Schema( EXECUTE_URL: attributes.Schema(
_("The url for executing the webhook (requires auth).") _("The url for executing the webhook (requires auth).")