diff options
| author | Avishay Traeger <avishay@il.ibm.com> | 2013-03-06 12:21:31 +0200 |
|---|---|---|
| committer | Avishay Traeger <avishay@il.ibm.com> | 2013-03-07 18:25:08 +0200 |
| commit | 2e8b5e8446432542901b3c814670a4c67e629137 (patch) | |
| tree | f2ba2b1ca36f18eeeba9301c151a3270e65ac906 /openstack | |
| parent | 2cb8e4557b05f92fbd9f56b7a6a6d4f35c8a883a (diff) | |
| download | oslo-2e8b5e8446432542901b3c814670a4c67e629137.tar.gz oslo-2e8b5e8446432542901b3c814670a4c67e629137.tar.xz oslo-2e8b5e8446432542901b3c814670a4c67e629137.zip | |
Add 'is' operator to extra specs ops.
Boolean values for capabilities don't work because extra_specs are
all converted to unicode. The scheduler will then check, for example,
if the boolean 'True' is equal to the unicode string 'True', and will
always return False. This patch allows admins to specify '<is> True'
in extra_specs, which will compare successfully to boolean True.
Fixes bug: 1146306
Change-Id: Id0e6dcfb71eb0943a16bba551ec23c4d57206550
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/scheduler/filters/extra_specs_ops.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openstack/common/scheduler/filters/extra_specs_ops.py b/openstack/common/scheduler/filters/extra_specs_ops.py index f4d4ff4..9537e28 100644 --- a/openstack/common/scheduler/filters/extra_specs_ops.py +++ b/openstack/common/scheduler/filters/extra_specs_ops.py @@ -15,13 +15,17 @@ import operator +from openstack.common import strutils + # 1. The following operations are supported: -# =, s==, s!=, s>=, s>, s<=, s<, <in>, <or>, ==, !=, >=, <= +# =, s==, s!=, s>=, s>, s<=, s<, <in>, <is>, <or>, ==, !=, >=, <= # 2. Note that <or> is handled in a different way below. # 3. If the first word in the extra_specs is not one of the operators, # it is ignored. _op_methods = {'=': lambda x, y: float(x) >= float(y), '<in>': lambda x, y: y in x, + '<is>': lambda x, y: (strutils.bool_from_string(x) is + strutils.bool_from_string(y)), '==': lambda x, y: float(x) == float(y), '!=': lambda x, y: float(x) != float(y), '>=': lambda x, y: float(x) >= float(y), |