From 93ae20badc96c8134819ef7bcdfb044bdaa8d8d7 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Fri, 21 Feb 2020 12:41:37 +0100 Subject: [PATCH] F #4132: fix minor bug (#4240) --- src/cli/one_helper/oneflow_helper.rb | 2 +- src/cli/one_helper/oneflowtemplate_helper.rb | 2 +- src/flow/lib/ServiceAutoScaler.rb | 3 +++ src/flow/lib/models/role.rb | 2 +- src/flow/oneflow-server.rb | 10 ++++++---- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/cli/one_helper/oneflow_helper.rb b/src/cli/one_helper/oneflow_helper.rb index b46041d51b..c75143e549 100644 --- a/src/cli/one_helper/oneflow_helper.rb +++ b/src/cli/one_helper/oneflow_helper.rb @@ -47,7 +47,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper d['GNAME'] end - column :NAME, 'Name', :size => 25, :left => true do |d| + column :NAME, 'Name', :expand => true, :left => true do |d| d['NAME'] end diff --git a/src/cli/one_helper/oneflowtemplate_helper.rb b/src/cli/one_helper/oneflowtemplate_helper.rb index 3ae963eee2..bb24b097ee 100644 --- a/src/cli/one_helper/oneflowtemplate_helper.rb +++ b/src/cli/one_helper/oneflowtemplate_helper.rb @@ -47,7 +47,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper d['GNAME'] end - column :NAME, 'Name', :left, :size => 37 do |d| + column :NAME, 'Name', :left, :expand => true do |d| d['NAME'] end diff --git a/src/flow/lib/ServiceAutoScaler.rb b/src/flow/lib/ServiceAutoScaler.rb index 1d35f857bf..6a08dc552a 100644 --- a/src/flow/lib/ServiceAutoScaler.rb +++ b/src/flow/lib/ServiceAutoScaler.rb @@ -81,6 +81,9 @@ class ServiceAutoScaler policies['elasticity_policies'] = role.elasticity_policies policies['scheduled_policies'] = role.scheduled_policies + # if diff is zero, cooldown doesn't matter + cooldown_duration = nil if diff == 0 + @lcm.update_role_policies(client, service.id, name, diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb index 015593e430..30a918a6dd 100644 --- a/src/flow/lib/models/role.rb +++ b/src/flow/lib/models/role.rb @@ -284,7 +284,7 @@ module OpenNebula end def update_cooldown(new_cooldown) - @body['cooldown'] = new_cooldown + @body['cooldown'] = new_cooldown unless new_cooldown.nil? end # Sets a new state diff --git a/src/flow/oneflow-server.rb b/src/flow/oneflow-server.rb index baaf4055cb..4e5de01b44 100644 --- a/src/flow/oneflow-server.rb +++ b/src/flow/oneflow-server.rb @@ -527,10 +527,12 @@ post '/service_template/:id/action' do end # remove escapes - networks_values.each do |net| - net.map do |_, value| - value.map do |_, value1| - value1.gsub!('\\"', '') + if networks_values + networks_values.each do |net| + net.map do |_, value| + value.map do |_, value1| + value1.gsub!('\\"', '') + end end end end