mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
Backlog #1854: Honor min and max limits in set-cardinality
This commit is contained in:
1 parent
8b77eb6c43
commit
475252a918
5 files changed
+60
-14
No files matched your search
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
+35
-11
@@ -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
|
||||
|
||||
########################################################################
|
||||
|
||||
+10
-1
@@ -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...
|
||||
|
||||
Reference in new issue
Block a user