diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 248744ea42..6aca052194 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -614,7 +614,12 @@ module OpenNebula end if !(start_time.nil? || start_time.empty?) - start_time = Time.parse(start_time).to_i + begin + start_time = Time.parse(start_time).to_i + rescue ArgumentError + # TODO error msg + return 0 + end else recurrence = elasticity_pol['recurrence'] diff --git a/flow/models/ServiceTemplate.rb b/flow/models/ServiceTemplate.rb index a73dda5d22..f886cca76a 100644 --- a/flow/models/ServiceTemplate.rb +++ b/flow/models/ServiceTemplate.rb @@ -14,6 +14,8 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +require 'parse-cron' + module OpenNebula class ServiceTemplate < DocumentJSON @@ -26,7 +28,8 @@ module OpenNebula }, 'cardinality' => { :type => :integer, - :default => 1 + :default => 1, + :minimum => 0 }, 'vm_template' => { :type => :integer, @@ -45,24 +48,27 @@ module OpenNebula }, 'min_vms' => { :type => :integer, - :required => false + :required => false, + :minimum => 0 }, 'max_vms' => { :type => :integer, - :required => false + :required => false, + :minimum => 0 }, 'cooldown' => { :type => :integer, - :required => false + :required => false, + :minimum => 0 }, 'elasticity_policies' => { :type => :array, :items => { :type => :object, :properties => { - # CHANGE, CARDINALITY, PERCENTAGE_CHANGE 'type' => { :type => :string, + :enum => %w{CHANGE CARDINALITY PERCENTAGE_CHANGE}, :required => true }, 'adjust' => { @@ -71,24 +77,27 @@ module OpenNebula }, 'min_adjust_step' => { :type => :integer, - :required => false + :required => false, + :minimum => 1 }, - # Elasticity by expression 'period_number' => { :type => :integer, - :default => 1 + :required => false, + :minimum => 0 }, 'period' => { :type => :integer, - :default => 0 + :required => false, + :minimum => 0 }, 'expression' => { :type => :string, - :required => false + :required => true }, 'cooldown' => { :type => :integer, - :required => false + :required => false, + :minimum => 0 } #'statistic' => { # # SampleCount | Average | Sum | Minimum | Maximum @@ -102,9 +111,9 @@ module OpenNebula :items => { :type => :object, :properties => { - # CHANGE, CARDINALITY, PERCENTAGE_CHANGE 'type' => { :type => :string, + :enum => %w{CHANGE CARDINALITY PERCENTAGE_CHANGE}, :required => true }, 'adjust' => { @@ -113,7 +122,8 @@ module OpenNebula }, 'min_adjust_step' => { :type => :integer, - :required => false + :required => false, + :minimum => 1 }, 'start_time' => { :type => :string, @@ -168,6 +178,8 @@ module OpenNebula validator.validate!(template, SCHEMA) + validate_values(template) + super(template.to_json, template['name']) end @@ -188,8 +200,103 @@ module OpenNebula validator.validate!(template, SCHEMA) + validate_values(template) + super(template.to_json) end + private + + def validate_values(template) + parser = ElasticityGrammarParser.new + + template['roles'].each do |role| + + if (!role['min_vms'].nil? && role['min_vms'].to_i > role['cardinality'].to_i) + + raise Validator::ParseException, + "Role '#{role['name']}' 'cardinality' must be greater than "\ + "or equal to 'min_vms'" + end + + if !role['max_vms'].nil? && + role['max_vms'].to_i < role['cardinality'].to_i + + raise Validator::ParseException, + "Role '#{role['name']}' 'cardinality' must be lower than "\ + "or equal to 'max_vms'" + end + + if ((role['elasticity_policies'] && role['elasticity_policies'].size > 0) || + (role['scheduled_policies'] && role['scheduled_policies'].size > 0)) + + if role['min_vms'].nil? || role['max_vms'].nil? + raise Validator::ParseException, + "Role '#{role['name']}' with 'elasticity_policies' or "<< + "'scheduled_policies' must define both 'min_vms'"<< + "and 'max_vms'" + end + end + + if role['elasticity_policies'] + role['elasticity_policies'].each_with_index do |policy, index| + exp = policy['expression'] + + if exp.empty? + raise Validator::ParseException, + "Role '#{role['name']}', elasticity policy "\ + "##{index} 'expression' cannot be empty" + end + + treetop = parser.parse(exp) + if treetop.nil? + raise Validator::ParseException, + "Role '#{role['name']}', elasticity policy "\ + "##{index} 'expression' parse error: #{parser.failure_reason}" + end + end + end + + if role['scheduled_policies'] + role['scheduled_policies'].each_with_index do |policy, index| + + start_time = policy['start_time'] + recurrence = policy['recurrence'] + + if !start_time.nil? + if !policy['recurrence'].nil? + raise Validator::ParseException, + "Role '#{role['name']}', scheduled policy "\ + "##{index} must define "\ + "'start_time' or 'recurrence', but not both" + end + + begin + Time.parse(start_time) + rescue ArgumentError + raise Validator::ParseException, + "Role '#{role['name']}', scheduled policy "\ + "##{index} 'start_time' is not a valid Time. "\ + "Try with YYYY-MM-DD hh:mm:ss or YYYY-MM-DDThh:mm:ssZ" + end + elsif !recurrence.nil? + begin + cron_parser = CronParser.new(recurrence) + start_time = cron_parser.next() + rescue Exception => e + raise Validator::ParseException, + "Role '#{role['name']}', scheduled policy "\ + "##{index} 'recurrence' is not a valid "\ + "cron expression" + end + else + raise Validator::ParseException, + "Role '#{role['name']}', scheduled policy ##{index} needs to define either "<< + "'start_time' or 'recurrence'" + end + end + end + end + end end end