Feature #1854: Methods to change a role cardinality

This commit is contained in:
Carlos Martín committed 2013-05-31 15:52:37 +02:00
1 parent a99ce42c40
commit e7af944e8b
4 files changed
+89

No files matched your search

+31
View File
@@ -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
+24
View File
@@ -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
##############################################################################
+6
View File
@@ -580,5 +580,11 @@ module OpenNebula
set_cardinality( get_nodes.size() - n_dispose )
end
def update(template)
set_cardinality(template["cardinality"])
end
end
end
+28
View File
@@ -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