From b3cc5229d74231c1a751d755fc7ccdf80755fc35 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 29 Jun 2015 13:07:04 +0200 Subject: [PATCH] feature #3718: Updated dummy driver to new monitor names --- src/mad/ruby/VirtualMachineDriver.rb | 1 - src/vmm_mad/dummy/one_vmm_dummy.rb | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mad/ruby/VirtualMachineDriver.rb b/src/mad/ruby/VirtualMachineDriver.rb index 32218a8631..6cba0b1f9a 100644 --- a/src/mad/ruby/VirtualMachineDriver.rb +++ b/src/mad/ruby/VirtualMachineDriver.rb @@ -56,7 +56,6 @@ class VirtualMachineDriver < OpenNebulaDriver :nettx => "NETTX", :netrx => "NETRX", :state => "STATE", - :total_disk_size => "TOTAL_DISK_SIZE", :disk_size => "DISK_SIZE", :snapshot_size => "SNAPSHOT_SIZE" } diff --git a/src/vmm_mad/dummy/one_vmm_dummy.rb b/src/vmm_mad/dummy/one_vmm_dummy.rb index e5b822d4bd..b9bd625934 100755 --- a/src/vmm_mad/dummy/one_vmm_dummy.rb +++ b/src/vmm_mad/dummy/one_vmm_dummy.rb @@ -196,8 +196,9 @@ class DummyDriver < VirtualMachineDriver "#{POLL_ATTRIBUTE[:netrx]}=#{prev_netrx+(100*rand(4))} " \ "#{POLL_ATTRIBUTE[:memory]}=#{max_memory * (rand(80)+20)/100} " \ "#{POLL_ATTRIBUTE[:cpu]}=#{max_cpu * (rand(95)+5)/100} " \ - "#{POLL_ATTRIBUTE[:total_disk_size]}=#{rand(1024)} " \ - "#{POLL_ATTRIBUTE[:disk_size]}=#{rand(1024)}" + "#{POLL_ATTRIBUTE[:disk_size]}=[ID=0, SIZE=#{rand(1024)}] "\ + "#{POLL_ATTRIBUTE[:disk_size]}=[ID=1, SIZE=#{rand(1024)}] "\ + "#{POLL_ATTRIBUTE[:snapshot_size]}=[ID=1, DISK_ID=0, SIZE=#{rand(1024)}] " send_message(ACTION[:poll],result,id,monitor_info) end