openstack
/
deb-gnocchi
Code Issues Proposed changes

resource_type: check that min is not None before comparing with max 

None > int() is not valid in Python 3.

Change-Id: Ifd49eda012ef7a7b60bcf34b72e4df4f9f3d083b
This commit is contained in:
Julien Danjou 2016-09-20 14:53:09 +02:00
parent 30771964ad
commit 39ee5998bd
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnocchi/resource_type.py
View File

@ -127,7 +127,7 @@ class NumberSchema(CommonAttributeSchema):
def __init__(self, min, max, *args, **kwargs):
super(NumberSchema, self).__init__(*args, **kwargs)
if max is not None and min > max:
if max is not None and min is not None and min > max:
raise InvalidResourceAttributeValue(min, max)
self.min = min

29
gnocchi/tests/gabbi/gabbits/resource-type.yaml
View File

@ -113,6 +113,10 @@ tests:
required: false
min: -2
max: 3
intnomin:
type: number
required: false
max: 3
float:
type: number
required: false
@ -143,6 +147,11 @@ tests:
required: False
min: -2
max: 3
intnomin:
type: number
required: False
min:
max: 3
float:
type: number
required: false
@ -189,6 +198,11 @@ tests:
required: False
min: -2
max: 3
intnomin:
type: number
required: False
min:
max: 3
float:
type: number
required: false
@ -353,6 +367,11 @@ tests:
required: False
min: -2
max: 3
intnomin:
type: number
required: False
min:
max: 3
float:
type: number
required: false
@ -385,6 +404,11 @@ tests:
required: False
min: -2
max: 3
intnomin:
type: number
required: False
min:
max: 3
float:
type: number
required: false
@ -434,6 +458,11 @@ tests:
required: False
min: -2
max: 3
intnomin:
type: number
required: False
min:
max: 3
float:
type: number
required: false