From ef0ad95f2ee95d0e844ae7d34306f094b6774dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 5 Jul 2013 18:00:24 +0200 Subject: [PATCH] Bug #2157: Role names must be unique to validate --- flow/models/ServiceTemplate.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/flow/models/ServiceTemplate.rb b/flow/models/ServiceTemplate.rb index f886cca76a..b67da73715 100644 --- a/flow/models/ServiceTemplate.rb +++ b/flow/models/ServiceTemplate.rb @@ -210,7 +210,16 @@ module OpenNebula def validate_values(template) parser = ElasticityGrammarParser.new - template['roles'].each do |role| + roles = template['roles'] + + roles.each_with_index do |role, role_index| + + roles[role_index+1..-1].each do |other_role| + if role['name'] == other_role['name'] + raise Validator::ParseException, + "Role name '#{role['name']}' is repeated" + end + end if (!role['min_vms'].nil? && role['min_vms'].to_i > role['cardinality'].to_i)