From 19f18aa3bbc20f65656bad030e26a7cd3f0b5d92 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sat, 9 Feb 2013 13:41:40 +0100 Subject: [PATCH] feature #1739: EC2 information manager returns information encoded in base64 --- src/im_mad/ec2/one_im_ec2.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/im_mad/ec2/one_im_ec2.rb b/src/im_mad/ec2/one_im_ec2.rb index 6a978f8dae..cbe5b54025 100755 --- a/src/im_mad/ec2/one_im_ec2.rb +++ b/src/im_mad/ec2/one_im_ec2.rb @@ -28,6 +28,7 @@ $: << RUBY_LIB_LOCATION require 'pp' require 'OpenNebulaDriver' +require 'base64' # The EC2 Information Manager Driver class EC2InformationManagerDriver < OpenNebulaDriver @@ -57,15 +58,16 @@ class EC2InformationManagerDriver < OpenNebulaDriver totalmemory = smem + lmem + xlmem totalcpu = scpu + lcpu + xlcpu - @info="HYPERVISOR=ec2,TOTALMEMORY=#{totalmemory},"<< - "TOTALCPU=#{totalcpu},CPUSPEED=1000,FREEMEMORY=#{totalmemory},"<< - "FREECPU=#{totalcpu}" + @info="HYPERVISOR=ec2\nTOTALMEMORY=#{totalmemory}\n"<< + "TOTALCPU=#{totalcpu}\nCPUSPEED=1000\nFREEMEMORY=#{totalmemory}"<< + "\nFREECPU=#{totalcpu}\n" end # The monitor action, just print the capacity info and hostname def action_monitor(num, host, not_used) - send_message("MONITOR", RESULT[:success], num, - "HOSTNAME=#{host},#{@info}") + info = "HOSTNAME=\"#{host}\"\n#{@info}" + info64 = Base64::encode64(info).strip.delete("\n") + send_message("MONITOR", RESULT[:success], num, info64) end end