Feature #1852: Show expression evaluation result in CLI

This commit is contained in:
Carlos Martín committed 2013-06-20 12:37:48 +02:00
1 parent dda5860dc7
commit 7b7bbe8b15
4 files changed
+122 -42

No files matched your search

+8 -4
View File
@@ -233,11 +233,15 @@ def show_service(client, args, options)
adjust_str(d)
end
column :EXPRESSION, "", :left, :size=>44 do |d|
d['expression']
column :EXPRESSION, "", :left, :size=>49 do |d|
if !d['expression_evaluated'].nil?
d['expression_evaluated']
else
d['expression']
end
end
column :'EVALUATION', "", :left, :size=>10 do |d|
column :'EVALS', "", :left, :size=>5 do |d|
"#{d['true_evals'].to_i} / #{d['period_number']}"
end
@@ -249,7 +253,7 @@ def show_service(client, args, options)
d['cooldown'] ? "#{d['cooldown']}s" : '-'
end
default :ADJUST, :EXPRESSION, :EVALUATION, :PERIOD, :COOLDOWN
default :ADJUST, :EXPRESSION, :EVALS, :PERIOD, :COOLDOWN
end.show([role['elasticity_policies']].flatten, {})
end
+56 -15
View File
@@ -101,6 +101,10 @@ module ElasticityGrammar
elements[1]
end
def op
elements[2]
end
def space2
elements[3]
end
@@ -112,7 +116,13 @@ module ElasticityGrammar
module BooleanExp1
def result(role)
return left.result(role) && right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
st = "#{l_st} #{op.text_value} #{r_st}"
val = l_val && r_val
return [val, st]
end
end
@@ -125,6 +135,10 @@ module ElasticityGrammar
elements[1]
end
def op
elements[2]
end
def space2
elements[3]
end
@@ -136,7 +150,13 @@ module ElasticityGrammar
module BooleanExp3
def result(role)
return left.result(role) || right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
st = "#{l_st} #{op.text_value} #{r_st}"
val = l_val || r_val
return [val, st]
end
end
@@ -294,17 +314,21 @@ module ElasticityGrammar
module LogicCond1
def result(role)
l_res = left.result(role)
r_res = right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
if l_res.nil? || r_res.nil?
st = "#{l_st} #{comp_op.text_value} #{r_st}"
if l_val.nil? || r_val.nil?
# An attribute was not found, we return false instead
# of assuming a value of 0
return false
val = false
else
comp_op.apply(l_res, r_res)
val = comp_op.apply(l_val, r_val)
end
return [val, st]
end
end
@@ -320,7 +344,12 @@ module ElasticityGrammar
module LogicCond3
def result(role)
return !expression.result(role)
e_val, e_st = expression.result(role)
val = !e_val
st = "!#{e_st}"
return [val, st]
end
end
@@ -341,7 +370,11 @@ module ElasticityGrammar
module LogicCond5
def result(role)
expression.result(role)
e_val, e_st = expression.result(role)
st = "(#{e_st})"
return [e_val, st]
end
end
@@ -681,7 +714,10 @@ module ElasticityGrammar
module Number1
def result(role)
text_value.to_f
val = text_value.to_f
st = val.to_s
return [val, st]
end
end
@@ -690,7 +726,10 @@ module ElasticityGrammar
module Number3
def result(role)
text_value.to_i
val = text_value.to_i
st = val.to_s
return [val, st]
end
end
@@ -889,12 +928,14 @@ module ElasticityGrammar
# The attribute wasn't found for any of the nodes
if n_nodes == 0
return nil
val = nil
st = "#{att}[--]"
else
val = total / n_nodes
st = "#{att}[#{val.to_s}]"
end
Log.debug "ELAS", "Role #{role.name} attribute #{att} avg value of #{total / n_nodes}"
return total / n_nodes
return [val, st]
end
end
+50 -17
View File
@@ -25,15 +25,27 @@ grammar ElasticityGrammar
end
rule boolean_exp
left:logic_cond space ('&&' / '&') space right:expression {
left:logic_cond space op:('&&' / '&') space right:expression {
def result(role)
return left.result(role) && right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
st = "#{l_st} #{op.text_value} #{r_st}"
val = l_val && r_val
return [val, st]
end
}
/
left:logic_cond space ('||' / '|') space right:expression {
left:logic_cond space op:('||' / '|') space right:expression {
def result(role)
return left.result(role) || right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
st = "#{l_st} #{op.text_value} #{r_st}"
val = l_val || r_val
return [val, st]
end
}
end
@@ -53,29 +65,42 @@ grammar ElasticityGrammar
# /
left:operand space comp_op space right:operand {
def result(role)
l_res = left.result(role)
r_res = right.result(role)
l_val, l_st = left.result(role)
r_val, r_st = right.result(role)
if l_res.nil? || r_res.nil?
st = "#{l_st} #{comp_op.text_value} #{r_st}"
if l_val.nil? || r_val.nil?
# An attribute was not found, we return false instead
# of assuming a value of 0
return false
val = false
else
comp_op.apply(l_res, r_res)
val = comp_op.apply(l_val, r_val)
end
return [val, st]
end
}
/
'!' space expression {
def result(role)
return !expression.result(role)
e_val, e_st = expression.result(role)
val = !e_val
st = "!#{e_st}"
return [val, st]
end
}
/
'(' space expression space ')' {
def result(role)
expression.result(role)
e_val, e_st = expression.result(role)
st = "(#{e_st})"
return [e_val, st]
end
}
end
@@ -135,13 +160,19 @@ grammar ElasticityGrammar
rule number
'-'? [0-9]+ '.' [0-9]+ {
def result(role)
text_value.to_f
val = text_value.to_f
st = val.to_s
return [val, st]
end
}
/
'-'? [0-9]+ {
def result(role)
text_value.to_i
val = text_value.to_i
st = val.to_s
return [val, st]
end
}
end
@@ -185,12 +216,14 @@ grammar ElasticityGrammar
# The attribute wasn't found for any of the nodes
if n_nodes == 0
return nil
val = nil
st = "#{att}[--]"
else
val = total / n_nodes
st = "#{att}[#{val.to_s}]"
end
Log.debug "ELAS", "Role #{role.name} attribute #{att} avg value of #{total / n_nodes}"
return total / n_nodes
return [val, st]
end
}
end
+8 -6
View File
@@ -597,7 +597,9 @@ module OpenNebula
new_cardinality = cardinality()
new_evals = 0
if scale_rule(expression)
exp_value, exp_st = scale_rule(expression)
if exp_value
new_evals = true_evals + 1
new_evals = period_number if new_evals > period_number
@@ -611,6 +613,7 @@ module OpenNebula
end
elasticity_pol['true_evals'] = new_evals
elasticity_pol['expression_evaluated'] = exp_st
return [new_cardinality - cardinality(), elasticity_pol['cooldown']]
end
@@ -626,13 +629,12 @@ module OpenNebula
treetop = parser.parse(elas_expr)
if treetop.nil?
# TODO: Add error to service template
Log.debug "ELAS", "Expr parse error. '#{elas_expr}': #{parser.failure_reason}"
return false
return [false, "Parse error. '#{elas_expr}': #{parser.failure_reason}"]
end
return treetop.result(self)
val, st = treetop.result(self)
return [val, st]
end
def calculate_new_cardinality(elasticity_pol)