shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #4273: Fix error in Sunstone oned.conf call when only 1 MAD

Browse Source
This commit is contained in:
Daniel Molina 2016-02-26 17:07:47 +01:00
parent 0be11d33c2
commit b41b8cdd30
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/sunstone/sunstone-server.rb
View File

@ -56,12 +56,31 @@ GROUP_ADMIN_DEFAULT_VIEW_XPATH = 'TEMPLATE/SUNSTONE/GROUP_ADMIN_DEFAULT_VIEW'
TABLE_DEFAULT_PAGE_LENGTH_XPATH = 'TEMPLATE/SUNSTONE/TABLE_DEFAULT_PAGE_LENGTH'
LANG_XPATH = 'TEMPLATE/SUNSTONE/LANG'
# If no costs are defined in oned.conf these values will be used
DEFAULT_COST = {
'CPU_COST' => 0,
'MEMORY_COST' => 0,
'DISK_COST' => 0
};
ONED_CONF_OPTS = {
# If no costs are defined in oned.conf these values will be used
'DEFAULT_COST' => {
'CPU_COST' => 0,
'MEMORY_COST' => 0,
'DISK_COST' => 0
},
# Only these values will be shown when retrieving oned.conf from the browser
'ALLOWED_KEYS' => [
'DEFAULT_COST',
'DS_MAD_CONF',
'MARKET_MAD_CONF',
'VM_MAD',
'IM_MAD',
'AUTH_MAD'
],
# Generate an array if there is only 1 element
'ARRAY_KEYS' => [
'DS_MAD_CONF',
'MARKET_MAD_CONF',
'VM_MAD',
'IM_MAD',
'AUTH_MAD'
]
}
##############################################################################
# Required libraries
@ -402,25 +421,21 @@ get '/' do
oned_conf_template = rc.to_hash()['TEMPLATE']
keys = [
:DEFAULT_COST,
:DS_MAD_CONF,
:MARKET_MAD_CONF,
:VM_MAD,
:IM_MAD,
:AUTH_MAD
]
oned_conf = {}
keys.each do |key|
if key == :DEFAULT_COST
if oned_conf_template[key.to_s]
oned_conf[key] = oned_conf_template[key.to_s]
ONED_CONF_OPTS['ALLOWED_KEYS'].each do |key|
value = oned_conf_template[key]
if key == 'DEFAULT_COST'
if value
oned_conf[key] = value
else
oned_conf[key] = DEFAULT_COST
oned_conf[key] = ONED_CONF_OPTS['DEFAULT_COST']
end
else
oned_conf[key] = oned_conf_template[key.to_s]
if ONED_CONF_OPTS['ARRAY_KEYS'].include?(key) && !value.is_a?(Array)
oned_conf[key] = [value]
else
oned_conf[key] = value
end
end
end