diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index eb8c6a709f..447e42b3ef 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -513,7 +513,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do Scale a role to the given cardinality EOT - command :'set-cardinality', set_cardinality_desc, :service_id, :role_name, :cardinality do + command :'set-cardinality', set_cardinality_desc, :service_id, :role_name, + :cardinality, :options => [Service::FORCE] do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -527,7 +528,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do exit_code = 0 - json = "{ \"cardinality\" : #{args[2]} }" + json = "{ \"cardinality\" : #{args[2]},\n"<< + " \"force\" : #{options[:force] == true} }" response = client.put("#{RESOURCE_PATH}/#{args[0]}/role/#{args[1]}", json) diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index fac1093b75..85248c7fe3 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -182,6 +182,13 @@ module Service :description => "Number of VMs to apply the action to each period" } + FORCE = { + :name => "force", + :short => "-f", + :large => "--force", + :description => "Force the new cardinality even if it is outside the limits" + } + # Format helpers # def self.rname_to_id(name, poolname, options) diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index d6618c1928..59355195da 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -269,6 +269,10 @@ put '/service/:id/role/:name' do error CloudServer::HTTP_ERROR_CODE[service.errno], service.message end + if OpenNebula.is_error?(rc) + error CloudServer::HTTP_ERROR_CODE[rc.errno], rc.message + end + status 200 end diff --git a/flow/models/Role.rb b/flow/models/Role.rb index c199dad0c4..de5f878ca8 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -116,25 +116,21 @@ module OpenNebula end # Returns the role max cardinality - # @return [Integer] the role cardinality + # @return [Integer,nil] the role cardinality, or nil if it was not defined def max_cardinality max = @body['max_vms'] - if max.nil? - max = cardinality() - end + return nil if max.nil? return max.to_i end # Returns the role min cardinality - # @return [Integer] the role cardinality + # @return [Integer,nil] the role cardinality, or nil if it was not defined def min_cardinality min = @body['min_vms'] - if min.nil? - min = cardinality() - end + return nil if min.nil? return min.to_i end @@ -641,8 +637,8 @@ module OpenNebula type = elasticity_pol['type'] adjust = elasticity_pol['adjust'].to_i - max = [cardinality(), max_cardinality].max() - min = [cardinality(), min_cardinality].min() + max = [cardinality(), max_cardinality.to_i].max() + min = [cardinality(), min_cardinality.to_i].min() case type.upcase when 'CHANGE' @@ -802,8 +798,36 @@ module OpenNebula @@default_shutdown = shutdown_action end + # Updates the role + # @param [Hash] template + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise def update(template) - set_cardinality(template["cardinality"]) + + force = template['force'] == true + new_cardinality = template["cardinality"] + + if new_cardinality.nil? + return nil + end + + new_cardinality = new_cardinality.to_i + + if !force + if new_cardinality < min_cardinality().to_i + return OpenNebula::Error.new( + "Minimum cardinality is #{min_cardinality()}") + + elsif !max_cardinality().nil? && new_cardinality > max_cardinality().to_i + return OpenNebula::Error.new( + "Maximum cardinality is #{max_cardinality()}") + + end + end + + set_cardinality(new_cardinality) + + return nil end ######################################################################## diff --git a/flow/models/Service.rb b/flow/models/Service.rb index a4c2493fa4..cfe91d7456 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -351,6 +351,11 @@ module OpenNebula return nil end + # Updates a role + # @param [String] role_name + # @param [String] template_json + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise def update_role(role_name, template_json) if ![Service::STATE['RUNNING'], Service::STATE['WARNING']].include?(self.state) @@ -364,7 +369,11 @@ module OpenNebula @roles.each do |name, role| if role_name == name - role.update(template) + rc = role.update(template) + + if OpenNebula.is_error?(rc) + return rc + end # TODO: The update may not change the cardinality, only # the max and min vms...