Number conversion doesn't work in template

[Mitsuru Kanabuchi]

This bug is similar : https://bugs.launchpad.net/heat/+bug/1226483

I tried to use Number type parameter in template.
But it doesn't work, the following error occurs:

==================================================
$ heat stack-create -f num.template -P "v_ip_version=4" test2
ERROR: Property error : r_subnet: ip_version value is not an integer
==================================================

The template file is:
==================================================
{
  "AWSTemplateFormatVersion" : "2010-09-09",
  "Parameters" : {
    "v_ip_version" : {
      "Type" : "Number"
    }
  },
  "Resources" : {
    "r_net": {
      "Type": "OS::Neutron::Net",
      "Properties": {
        "name": "r_net"
      }
    },
    "r_subnet": {
      "Type": "OS::Neutron::Subnet",
      "Properties": {
        "network_id": { "Ref" : "r_net" },
        "ip_version": { "Ref" : "v_ip_version" },
        "cidr": "192.168.0.0/24"
      }
    }
  }
}
==================================================

I think, Class NumberParam have to return casted value, like follows.

==================================================
class NumberParam(Parameter):
    '''A template parameter of type "Number".'''

    def __int__(self):
        '''Return an integer representation of the parameter'''
        return int(self.value())

    def __float__(self):
        '''Return a float representation of the parameter'''
        return float(self.value())

+ def value(self):
+ return int(self.user_value or self.default())

    def validate(self, val):
        self.schema.validate(self.name, val)
==================================================

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/50910

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/50910
Committed: http://github.com/openstack/heat/commit/ce62192a76a6e01b735a502c70d66d5b6eefe423
Submitter: Jenkins
Branch: master

commit ce62192a76a6e01b735a502c70d66d5b6eefe423
Author: Mitsuru Kanabuchi <email address hidden>
Date: Thu Oct 10 20:42:42 2013 +0900

    Return Integer or Float casted value in NumberParam

    Integer value used in parameter, so failed validation in properties.
    The solution here is return Integer casted value or Float casted value
    as value of NumberParam.

    The method of which type choose for cast is same of Property.str_to_num.

    Fixes bug #1226494

    Change-Id: I9f7d894ffae8a728dce783d5881af3d377268b93

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/51364

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/51364
Committed: http://github.com/openstack/heat/commit/d9efd01f1f75b663485999ce67beeeed9298010d
Submitter: Jenkins
Branch: milestone-proposed

commit d9efd01f1f75b663485999ce67beeeed9298010d
Author: Mitsuru Kanabuchi <email address hidden>
Date: Thu Oct 10 20:42:42 2013 +0900

    Return Integer or Float casted value in NumberParam

    Integer value used in parameter, so failed validation in properties.
    The solution here is return Integer casted value or Float casted value
    as value of NumberParam.

    The method of which type choose for cast is same of Property.str_to_num.

    Fixes bug #1226494

    Change-Id: I9f7d894ffae8a728dce783d5881af3d377268b93