Merge "Fix DriverFilter string evaluations"

This commit is contained in:
Zuul 2020-03-10 21:33:51 +00:00 committed by Gerrit Code Review
commit c29285e7dc
2 changed files with 16 additions and 15 deletions

View File

@ -45,21 +45,21 @@ class EvalConstant(object):
(which_dict, entry) = result.split('.')
try:
result = _vars[which_dict][entry]
except KeyError as e:
except KeyError:
raise exception.EvaluatorParseException(
_("KeyError: %s") % e)
except TypeError as e:
_("KeyError evaluating string"))
except TypeError:
raise exception.EvaluatorParseException(
_("TypeError: %s") % e)
_("TypeError evaluating string"))
try:
result = int(result)
except ValueError:
try:
result = float(result)
except ValueError as e:
raise exception.EvaluatorParseException(
_("ValueError: %s") % e)
except ValueError:
if isinstance(result, str):
result = result.replace('"', '').replace('\'', '')
return result
@ -232,8 +232,9 @@ def _def_parser():
alphas = pyparsing.alphas
Combine = pyparsing.Combine
Forward = pyparsing.Forward
nums = pyparsing.nums
quoted_string = pyparsing.quotedString
oneOf = pyparsing.oneOf
opAssoc = pyparsing.opAssoc
operatorPrecedence = pyparsing.operatorPrecedence
@ -243,9 +244,8 @@ def _def_parser():
real = Combine(Word(nums) + '.' + Word(nums))
variable = Word(alphas + '_' + '.')
number = real | integer
expr = Forward()
fn = Word(alphas + '_' + '.')
operand = number | variable | fn
operand = number | variable | fn | quoted_string
signop = oneOf('+ -')
addop = oneOf('+ -')

View File

@ -127,11 +127,12 @@ class EvaluatorTestCase(test.TestCase):
def test_nonnumber_comparison(self):
nonnumber = {'test': 'foo'}
request = {'test': 'bar'}
self.assertRaises(
exception.EvaluatorParseException,
evaluator.evaluate,
"nonnumber.test != request.test",
nonnumber=nonnumber, request=request)
self.assertTrue(
evaluator.evaluate("nonnumber.test != request.test",
nonnumber=nonnumber, request=request))
self.assertFalse(
evaluator.evaluate("nonnumber.test == request.test",
nonnumber=nonnumber, request=request))
def test_div_zero(self):
self.assertRaises(exception.EvaluatorParseException,