From 7a1371a1992ad57780013efc0909d3eaa0499967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 4 Jun 2013 11:45:59 +0200 Subject: [PATCH] Feature #1852: Save the scaled down VM ids in an array --- flow/models/Role.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 9a71449765..c76332617b 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -56,6 +56,7 @@ module OpenNebula @service = service @body['nodes'] ||= [] + @body['disposed_nodes'] ||= [] end def name @@ -154,7 +155,7 @@ module OpenNebula nodes = @body['nodes'] new_nodes = [] -# disposed_nodes = @body['disposed_nodes'] + disposed_nodes = @body['disposed_nodes'] nodes.each do |node| vm_id = node['deploy_id'] @@ -175,10 +176,12 @@ module OpenNebula lcm_state = node['vm_info']['VM']['LCM_STATE'] if (node['disposed'] == "1" && vm_state == '6') - # TODO: copy to an array of disposed nodes? - Log.debug "ELAS", "Role #{name}, VM disposed: #{vm_id}" + # Store the VM id in the array of disposed nodes + disposed_nodes << vm_id else if (node['scale_up'] == "1" && vm_state == '3' && lcm_state == '3') + # If the VM was a scale-up and it reaches RUNNING, + # clear the flag node.delete('scale_up') end