From e7af944e8bbf94a30f6572f30f472dfed2269d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 31 May 2013 15:52:37 +0200 Subject: [PATCH] Feature #1854: Methods to change a role cardinality --- flow/client/bin/appflow | 31 ++++++++++++++++++++++++++++++ flow/controllers/appflow-server.rb | 24 +++++++++++++++++++++++ flow/models/Role.rb | 6 ++++++ flow/models/Service.rb | 28 +++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index d011d694d9..bd7814c418 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -408,6 +408,37 @@ cmd=CommandParser::CmdParser.new(ARGV) do } end + # + # + # + + set_cardinality_desc = <<-EOT.unindent + TODO + EOT + + command :'set-cardinality', set_cardinality_desc, :serviceid, :role_name, :cardinality do + client = Service::Client.new( + :username => options[:username], + :password => options[:password], + :url => options[:server], + :user_agent => USER_AGENT) + + # TODO: check arguments formats + + exit_code = 0 + + json = "{ \"cardinality\" : #{args[2]} }" + + response = client.put("#{RESOURCE_PATH}/#{args[0]}/role/#{args[1]}", json) + + if CloudClient::is_error?(response) + puts response.to_s + exit_code = response.code.to_i + end + + exit_code + end + chgrp_desc = <<-EOT.unindent Changes the service group EOT diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index 97535ee55a..0b07d6d656 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -245,6 +245,30 @@ post '/service/:id/action' do status 201 end +put '/service/:id/role/:name' do + + service_pool = OpenNebula::ServicePool.new(@client) + + rc = nil + service = service_pool.get(params[:id]) do |service| + begin + rc = service.update_role(params[:name], request.body.read) + rescue Validator::ParseException, JSON::ParserError + return error 400, $!.message + end + end + + if OpenNebula.is_error?(service) + 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 + ############################################################################## # Service Template ############################################################################## diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 0ae734ecd0..9f16bfe637 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -580,5 +580,11 @@ module OpenNebula set_cardinality( get_nodes.size() - n_dispose ) end + + + + def update(template) + set_cardinality(template["cardinality"]) + end end end diff --git a/flow/models/Service.rb b/flow/models/Service.rb index 53c8ea89f8..58449c024c 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -310,6 +310,34 @@ module OpenNebula return nil end + def update_role(role_name, template_json) + + if ![Service::STATE['RUNNING'], Service::STATE['UNKNOWN']].include?(self.state) + return OpenNebula::Error.new("Update role: Wrong state" \ + " #{self.state_str()}") + end + + template = JSON.parse(template_json) + + # TODO: Validate template? + + @roles.each do |name, role| + if role_name == name + role.update(template) + + # TODO: The update may not change the cardinality, only + # the max and min vms... + + role.set_state(Role::STATE['SCALING']) + + self.set_state(Service::STATE['SCALING']) + return self.update + end + end + + return OpenNebula::Error.new("ROLE \"#{role_name}\" does not exist") + end + private # @param [Logger::Severity] severity