diff --git a/contrib/heat_barbican/heat_barbican/resources/order.py b/contrib/heat_barbican/heat_barbican/resources/order.py index 2ddb1c350..8a6f30188 100644 --- a/contrib/heat_barbican/heat_barbican/resources/order.py +++ b/contrib/heat_barbican/heat_barbican/resources/order.py @@ -71,7 +71,7 @@ class Order(resource.Resource): ], ), BIT_LENGTH: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The bit-length of the secret.'), constraints=[ constraints.AllowedValues([ diff --git a/contrib/heat_barbican/heat_barbican/resources/secret.py b/contrib/heat_barbican/heat_barbican/resources/secret.py index 7f974bb68..07663a2c7 100644 --- a/contrib/heat_barbican/heat_barbican/resources/secret.py +++ b/contrib/heat_barbican/heat_barbican/resources/secret.py @@ -77,7 +77,7 @@ class Secret(resource.Resource): _('The algorithm type used to generate the secret.'), ), BIT_LENGTH: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The bit-length of the secret.'), constraints=[ constraints.Range( diff --git a/contrib/rackspace/rackspace/resources/auto_scale.py b/contrib/rackspace/rackspace/resources/auto_scale.py index f9f36938e..57cb47604 100644 --- a/contrib/rackspace/rackspace/resources/auto_scale.py +++ b/contrib/rackspace/rackspace/resources/auto_scale.py @@ -125,7 +125,7 @@ class Group(resource.Resource): required=True ), LAUNCH_CONFIG_ARGS_LOAD_BALANCER_PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Server port to connect the load balancer to.'), required=True ), @@ -210,7 +210,7 @@ class Group(resource.Resource): _('Group configuration.'), schema={ GROUP_CONFIGURATION_MAX_ENTITIES: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Maximum number of entities in this scaling group.'), required=True ), @@ -226,7 +226,7 @@ class Group(resource.Resource): required=True ), GROUP_CONFIGURATION_MIN_ENTITIES: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Minimum number of entities in this scaling group.'), required=True ), @@ -407,7 +407,7 @@ class ScalingPolicy(resource.Resource): update_allowed=True ), CHANGE: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Amount to add to or remove from current number of instances. ' 'Incompatible with changePercent and desiredCapacity.'), update_allowed=True @@ -419,7 +419,7 @@ class ScalingPolicy(resource.Resource): update_allowed=True ), DESIRED_CAPACITY: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Absolute number to set the number of instances to. ' 'Incompatible with change and changePercent.'), update_allowed=True diff --git a/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py b/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py index b8b67b931..ae93b7cf1 100644 --- a/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py +++ b/contrib/rackspace/rackspace/resources/cloud_loadbalancer.py @@ -222,7 +222,7 @@ class CloudLoadBalancer(resource.Resource): ) ), NODE_PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, required=True ), NODE_CONDITION: properties.Schema( @@ -303,7 +303,7 @@ class CloudLoadBalancer(resource.Resource): update_allowed=True ), PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, required=True, update_allowed=True ), @@ -324,13 +324,13 @@ class CloudLoadBalancer(resource.Resource): ] ), CONNECTION_THROTTLE_MIN_CONNECTIONS: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, constraints=[ constraints.Range(1, 1000), ] ), CONNECTION_THROTTLE_MAX_CONNECTIONS: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, constraints=[ constraints.Range(1, 100000), ] @@ -404,7 +404,7 @@ class CloudLoadBalancer(resource.Resource): properties.Schema.MAP, schema={ SSL_TERMINATION_SECURE_PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, default=443 ), SSL_TERMINATION_PRIVATEKEY: properties.Schema( diff --git a/heat/engine/resources/aws/autoscaling/autoscaling_group.py b/heat/engine/resources/aws/autoscaling/autoscaling_group.py index 017e41eb9..7825aa0cd 100644 --- a/heat/engine/resources/aws/autoscaling/autoscaling_group.py +++ b/heat/engine/resources/aws/autoscaling/autoscaling_group.py @@ -147,7 +147,7 @@ class AutoScalingGroup(instgrp.InstanceGroup, cooldown.CooldownMixin): update_allowed=True ), COOLDOWN: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Cooldown period, in seconds.'), update_allowed=True ), diff --git a/heat/engine/resources/aws/autoscaling/scaling_policy.py b/heat/engine/resources/aws/autoscaling/scaling_policy.py index 59b2396ec..c092aa93a 100644 --- a/heat/engine/resources/aws/autoscaling/scaling_policy.py +++ b/heat/engine/resources/aws/autoscaling/scaling_policy.py @@ -52,7 +52,7 @@ class AWSScalingPolicy(signal_responder.SignalResponder, required=True ), SCALING_ADJUSTMENT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Size of adjustment.'), required=True, update_allowed=True @@ -69,7 +69,7 @@ class AWSScalingPolicy(signal_responder.SignalResponder, update_allowed=True ), COOLDOWN: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Cooldown period, in seconds.'), update_allowed=True ), diff --git a/heat/engine/resources/aws/cfn/stack.py b/heat/engine/resources/aws/cfn/stack.py index c1ec83231..2786f8bd4 100644 --- a/heat/engine/resources/aws/cfn/stack.py +++ b/heat/engine/resources/aws/cfn/stack.py @@ -42,7 +42,7 @@ class NestedStack(stack_resource.StackResource): update_allowed=True ), TIMEOUT_IN_MINS: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The length of time, in minutes, to wait for the nested stack ' 'creation.'), update_allowed=True diff --git a/heat/engine/resources/aws/cfn/wait_condition.py b/heat/engine/resources/aws/cfn/wait_condition.py index a7d33f5c9..11493b0a7 100644 --- a/heat/engine/resources/aws/cfn/wait_condition.py +++ b/heat/engine/resources/aws/cfn/wait_condition.py @@ -45,7 +45,7 @@ class WaitCondition(heat_wc.HeatWaitCondition): required=True ), TIMEOUT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The number of seconds to wait for the correct number of ' 'signals to arrive.'), required=True, @@ -54,7 +54,7 @@ class WaitCondition(heat_wc.HeatWaitCondition): ] ), COUNT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The number of success signals that must be received before ' 'the stack creation process continues.'), constraints=[ diff --git a/heat/engine/resources/aws/lb/loadbalancer.py b/heat/engine/resources/aws/lb/loadbalancer.py index 6fb26d421..09c5425be 100644 --- a/heat/engine/resources/aws/lb/loadbalancer.py +++ b/heat/engine/resources/aws/lb/loadbalancer.py @@ -311,14 +311,14 @@ class LoadBalancer(stack_resource.StackResource): _('An application health check for the instances.'), schema={ HEALTH_CHECK_HEALTHY_THRESHOLD: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The number of consecutive health probe successes ' 'required before moving the instance to the ' 'healthy state.'), required=True ), HEALTH_CHECK_INTERVAL: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The approximate interval, in seconds, between ' 'health checks of an individual instance.'), required=True @@ -329,12 +329,12 @@ class LoadBalancer(stack_resource.StackResource): required=True ), HEALTH_CHECK_TIMEOUT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Health probe timeout, in seconds.'), required=True ), HEALTH_CHECK_UNHEALTHY_THRESHOLD: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The number of consecutive health probe failures ' 'required before moving the instance to the ' 'unhealthy state'), @@ -354,13 +354,13 @@ class LoadBalancer(stack_resource.StackResource): properties.Schema.MAP, schema={ LISTENER_INSTANCE_PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('TCP port on which the instance server is ' 'listening.'), required=True ), LISTENER_LOAD_BALANCER_PORT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The external load balancer port number.'), required=True ), diff --git a/heat/engine/resources/openstack/heat/autoscaling_group.py b/heat/engine/resources/openstack/heat/autoscaling_group.py index 006523247..e62ecad97 100644 --- a/heat/engine/resources/openstack/heat/autoscaling_group.py +++ b/heat/engine/resources/openstack/heat/autoscaling_group.py @@ -85,13 +85,13 @@ class AutoScalingResourceGroup(aws_asg.AutoScalingGroup): update_allowed=True, schema={ MIN_IN_SERVICE: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The minimum number of resources in service while ' 'rolling updates are being executed.'), constraints=[constraints.Range(min=0)], default=0), MAX_BATCH_SIZE: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The maximum number of resources to replace at once.'), constraints=[constraints.Range(min=0)], default=1), diff --git a/heat/engine/resources/openstack/heat/instance_group.py b/heat/engine/resources/openstack/heat/instance_group.py index 23791e40d..9574fdc9c 100644 --- a/heat/engine/resources/openstack/heat/instance_group.py +++ b/heat/engine/resources/openstack/heat/instance_group.py @@ -107,9 +107,9 @@ class InstanceGroup(stack_resource.StackResource): ), } rolling_update_schema = { - MIN_INSTANCES_IN_SERVICE: properties.Schema(properties.Schema.NUMBER, + MIN_INSTANCES_IN_SERVICE: properties.Schema(properties.Schema.INTEGER, default=0), - MAX_BATCH_SIZE: properties.Schema(properties.Schema.NUMBER, + MAX_BATCH_SIZE: properties.Schema(properties.Schema.INTEGER, default=1), PAUSE_TIME: properties.Schema(properties.Schema.STRING, default='PT0S') diff --git a/heat/engine/resources/openstack/heat/remote_stack.py b/heat/engine/resources/openstack/heat/remote_stack.py index 23d9f734f..25242e1ce 100644 --- a/heat/engine/resources/openstack/heat/remote_stack.py +++ b/heat/engine/resources/openstack/heat/remote_stack.py @@ -72,7 +72,7 @@ class RemoteStack(resource.Resource): update_allowed=True ), TIMEOUT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('Number of minutes to wait for this stack creation.'), update_allowed=True ), diff --git a/heat/engine/resources/openstack/heat/swiftsignal.py b/heat/engine/resources/openstack/heat/swiftsignal.py index 7ab39960e..7bb860a7d 100644 --- a/heat/engine/resources/openstack/heat/swiftsignal.py +++ b/heat/engine/resources/openstack/heat/swiftsignal.py @@ -163,7 +163,7 @@ class SwiftSignal(resource.Resource): ] ), COUNT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, description=_('The number of success signals that must be ' 'received before the stack creation process ' 'continues.'), diff --git a/heat/engine/resources/openstack/heat/wait_condition.py b/heat/engine/resources/openstack/heat/wait_condition.py index 1634e4665..fad28a33a 100644 --- a/heat/engine/resources/openstack/heat/wait_condition.py +++ b/heat/engine/resources/openstack/heat/wait_condition.py @@ -61,7 +61,7 @@ class HeatWaitCondition(resource.Resource): ] ), COUNT: properties.Schema( - properties.Schema.NUMBER, + properties.Schema.INTEGER, _('The number of success signals that must be received before ' 'the stack creation process continues.'), constraints=[