From 976a1c8101fbad8eec178ce1a9bcc0bfb7c91a31 Mon Sep 17 00:00:00 2001 From: kfafel Date: Wed, 18 Dec 2013 23:47:10 -0600 Subject: [PATCH] tighten up agent info mocks --- .../requests/monitoring/get_cpus_info.rb | 29 +++++-------- .../requests/monitoring/get_disks_info.rb | 23 ++++------- .../monitoring/get_filesystems_info.rb | 21 ++++------ .../monitoring/get_logged_in_user_info.rb | 9 +--- .../requests/monitoring/get_memory_info.rb | 31 ++++++-------- .../monitoring/get_network_interfaces_info.rb | 41 ++++++++----------- .../requests/monitoring/get_processes_info.rb | 33 ++++++--------- .../requests/monitoring/get_system_info.rb | 9 +--- 8 files changed, 70 insertions(+), 126 deletions(-) diff --git a/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb b/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb index 9462e4ecc..ac0f61d1c 100644 --- a/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_cpus_info.rb @@ -29,27 +29,20 @@ module Fog "name" => "cpu.0", "vendor" => "AMD", "model" => "Opteron", - "mhz" => Fog::Mock.random_numbers(4).to_s, - "idle" => Fog::Mock.random_numbers(10).to_s, - "irq" => Fog::Mock.random_numbers(5).to_s, - "soft_irq" => Fog::Mock.random_numbers(7).to_s, - "nice" => Fog::Mock.random_numbers(9).to_s, - "stolen" => Fog::Mock.random_numbers(7).to_s, - "sys" => Fog::Mock.random_numbers(7).to_s, - "user" => Fog::Mock.random_numbers(9).to_s, - "wait" => Fog::Mock.random_numbers(7).to_s, - "total" => Fog::Mock.random_numbers(11).to_s, + "mhz" => Fog::Mock.random_numbers(4).to_i, + "idle" => Fog::Mock.random_numbers(10).to_i, + "irq" => Fog::Mock.random_numbers(5).to_i, + "soft_irq" => Fog::Mock.random_numbers(7).to_i, + "nice" => Fog::Mock.random_numbers(9).to_i, + "stolen" => Fog::Mock.random_numbers(7).to_i, + "sys" => Fog::Mock.random_numbers(7).to_i, + "user" => Fog::Mock.random_numbers(9).to_i, + "wait" => Fog::Mock.random_numbers(7).to_i, + "total" => Fog::Mock.random_numbers(11).to_i, "total_cores" => 1, "total_sockets" => 1 } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_disks_info.rb b/lib/fog/rackspace/requests/monitoring/get_disks_info.rb index 3c766893f..8282c90b8 100644 --- a/lib/fog/rackspace/requests/monitoring/get_disks_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_disks_info.rb @@ -26,23 +26,16 @@ module Fog response.body = { "info" => [ { - "read_bytes" => Fog::Mock.random_numbers(10).to_s, - "reads" => Fog::Mock.random_numbers(6).to_s, - "rtime" => Fog::Mock.random_numbers(6).to_s, - "write_bytes" => Fog::Mock.random_numbers(10).to_s, - "writes" => Fog::Mock.random_numbers(8).to_s, - "wtime" => Fog::Mock.random_numbers(9).to_s, - "time" => Fog::Mock.random_numbers(7).to_s, + "read_bytes" => Fog::Mock.random_numbers(10).to_i, + "reads" => Fog::Mock.random_numbers(6).to_i, + "rtime" => Fog::Mock.random_numbers(6).to_i, + "write_bytes" => Fog::Mock.random_numbers(10).to_i, + "writes" => Fog::Mock.random_numbers(8).to_i, + "wtime" => Fog::Mock.random_numbers(9).to_i, + "time" => Fog::Mock.random_numbers(7).to_i, "name" => "/dev/xvda1" } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb b/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb index 85a246981..08c5b825d 100644 --- a/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_filesystems_info.rb @@ -30,12 +30,12 @@ module Fog "dev_name" => "/dev/xvda1", "sys_type_name" => "ext4", "options" => "rw,noatime,acl,errors=remount-ro,barrier=0", - "free" => Fog::Mock.random_numbers(8).to_s, - "used" => Fog::Mock.random_numbers(5).to_s, - "avail" => Fog::Mock.random_numbers(7).to_s, - "total" => Fog::Mock.random_numbers(9).to_s, - "files" => Fog::Mock.random_numbers(6).to_s, - "free_files" => Fog::Mock.random_numbers(6).to_s, + "free" => Fog::Mock.random_numbers(8).to_i, + "used" => Fog::Mock.random_numbers(5).to_i, + "avail" => Fog::Mock.random_numbers(7).to_i, + "total" => Fog::Mock.random_numbers(9).to_i, + "files" => Fog::Mock.random_numbers(6).to_i, + "free_files" => Fog::Mock.random_numbers(6).to_i, }, { "dir_name" => "/proc", @@ -43,14 +43,7 @@ module Fog "sys_type_name" => "ext4", "options" => "rw", } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb b/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb index 3f924338f..98cb11ba5 100644 --- a/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_logged_in_user_info.rb @@ -37,14 +37,7 @@ module Fog "time" => Time.now.to_i - 50, "host" => "somehost2.company.local" } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_memory_info.rb b/lib/fog/rackspace/requests/monitoring/get_memory_info.rb index 68cb4fdb4..07f6f6b3d 100644 --- a/lib/fog/rackspace/requests/monitoring/get_memory_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_memory_info.rb @@ -26,26 +26,19 @@ module Fog response.body = { "info" => [ { - "actual_free" => Fog::Mock.random_numbers(9).to_s, - "actual_used" => Fog::Mock.random_numbers(8).to_s, - "free" => Fog::Mock.random_numbers(7).to_s, - "used" => Fog::Mock.random_numbers(9).to_s, - "total" => Fog::Mock.random_numbers(10).to_s, - "ram" => Fog::Mock.random_numbers(4).to_s, - "swap_total" => Fog::Mock.random_numbers(10).to_s, - "swap_used" => Fog::Mock.random_numbers(8).to_s, - "swap_free" => Fog::Mock.random_numbers(10).to_s, - "swap_page_in" => Fog::Mock.random_numbers(3).to_s, - "swap_page_out" => Fog::Mock.random_numbers(3).to_s, + "actual_free" => Fog::Mock.random_numbers(9).to_i, + "actual_used" => Fog::Mock.random_numbers(8).to_i, + "free" => Fog::Mock.random_numbers(7).to_i, + "used" => Fog::Mock.random_numbers(9).to_i, + "total" => Fog::Mock.random_numbers(10).to_i, + "ram" => Fog::Mock.random_numbers(4).to_i, + "swap_total" => Fog::Mock.random_numbers(10).to_i, + "swap_used" => Fog::Mock.random_numbers(8).to_i, + "swap_free" => Fog::Mock.random_numbers(10).to_i, + "swap_page_in" => Fog::Mock.random_numbers(3).to_i, + "swap_page_out" => Fog::Mock.random_numbers(3).to_i, } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb b/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb index 62eaaade3..8610fa659 100644 --- a/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_network_interfaces_info.rb @@ -33,12 +33,12 @@ module Fog "address6" => "::1", "broadcast" => "0.0.0.0.0", "hwaddr" => "00:00:00:00:00:00", - "mtu" => Fog::Mock.random_numbers(4).to_s, - "rx_packets" => Fog::Mock.random_numbers(3).to_s, - "rx_bytes" => Fog::Mock.random_numbers(4).to_s, - "tx_packets" => Fog::Mock.random_numbers(3).to_s, - "tx_bytes" => Fog::Mock.random_numbers(4).to_s, - "flags" => Fog::Mock.random_numbers(2).to_s, + "mtu" => Fog::Mock.random_numbers(4).to_i, + "rx_packets" => Fog::Mock.random_numbers(3).to_i, + "rx_bytes" => Fog::Mock.random_numbers(4).to_i, + "tx_packets" => Fog::Mock.random_numbers(3).to_i, + "tx_bytes" => Fog::Mock.random_numbers(4).to_i, + "flags" => Fog::Mock.random_numbers(2).to_i, }, { "name" => "eth0", @@ -49,11 +49,11 @@ module Fog "broadcast" => Fog::Mock.random_ip({:version => :v4}), "hwaddr" => "A1:B2:C3:D4:E5:F6", "mtu" => "1500", - "rx_packets" => Fog::Mock.random_numbers(7).to_s, - "rx_bytes" => Fog::Mock.random_numbers(9).to_s, - "tx_packets" => Fog::Mock.random_numbers(7).to_s, - "tx_bytes" => Fog::Mock.random_numbers(9).to_s, - "flags" => Fog::Mock.random_numbers(4).to_s, + "rx_packets" => Fog::Mock.random_numbers(7).to_i, + "rx_bytes" => Fog::Mock.random_numbers(9).to_i, + "tx_packets" => Fog::Mock.random_numbers(7).to_i, + "tx_bytes" => Fog::Mock.random_numbers(9).to_i, + "flags" => Fog::Mock.random_numbers(4).to_i, }, { "name" => "eth1", @@ -64,20 +64,13 @@ module Fog "broadcast" => Fog::Mock.random_ip({:version => :v4}), "hwaddr" => "A2:B3:C4:D5:E6:F7", "mtu" => "1500", - "rx_packets" => Fog::Mock.random_numbers(7).to_s, - "rx_bytes" => Fog::Mock.random_numbers(9).to_s, - "tx_packets" => Fog::Mock.random_numbers(7).to_s, - "tx_bytes" => Fog::Mock.random_numbers(9).to_s, - "flags" => Fog::Mock.random_numbers(4).to_s, + "rx_packets" => Fog::Mock.random_numbers(7).to_i, + "rx_bytes" => Fog::Mock.random_numbers(9).to_i, + "tx_packets" => Fog::Mock.random_numbers(7).to_i, + "tx_bytes" => Fog::Mock.random_numbers(9).to_i, + "flags" => Fog::Mock.random_numbers(4).to_i, } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_processes_info.rb b/lib/fog/rackspace/requests/monitoring/get_processes_info.rb index 3b0e989e0..3e5934182 100644 --- a/lib/fog/rackspace/requests/monitoring/get_processes_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_processes_info.rb @@ -29,35 +29,28 @@ module Fog response.body = { "info" => [ { - "pid" => Fog::Mock.random_numbers(4).to_s, + "pid" => Fog::Mock.random_numbers(4).to_i, "exe_name" => "/usr/share/nova-agent/0.0.1.38/sbin/nova-agent", "exe_cwd" => "/", "exe_root" => "/", - "time_total" => Fog::Mock.random_numbers(3).to_s, - "time_sys" => Fog::Mock.random_numbers(2).to_s, - "time_user" => Fog::Mock.random_numbers(2).to_s, + "time_total" => Fog::Mock.random_numbers(3).to_i, + "time_sys" => Fog::Mock.random_numbers(2).to_i, + "time_user" => Fog::Mock.random_numbers(2).to_i, "time_start_time" => Time.now.utc.to_i - 10000, "state_name" => "nova-agent", - "state_ppid" => Fog::Mock.random_numbers(3).to_s, + "state_ppid" => Fog::Mock.random_numbers(3).to_i, "state_priority" => "15", - "state_threads" => Fog::Mock.random_numbers(1).to_s, - "memory_size" => Fog::Mock.random_numbers(9).to_s, - "memory_resident" => Fog::Mock.random_numbers(7).to_s, - "memory_share" => Fog::Mock.random_numbers(6).to_s, - "memory_major_faults" => memory_major_faults.to_s, - "memory_minor_faults" => memory_minor_faults.to_s, - "memory_page_faults" => memory_page_faults.to_s, + "state_threads" => Fog::Mock.random_numbers(1).to_i, + "memory_size" => Fog::Mock.random_numbers(9).to_i, + "memory_resident" => Fog::Mock.random_numbers(7).to_i, + "memory_share" => Fog::Mock.random_numbers(6).to_i, + "memory_major_faults" => memory_major_faults.to_i, + "memory_minor_faults" => memory_minor_faults.to_i, + "memory_page_faults" => memory_page_faults.to_i, "cred_user" => "root", "cred_group" => "root" } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s, diff --git a/lib/fog/rackspace/requests/monitoring/get_system_info.rb b/lib/fog/rackspace/requests/monitoring/get_system_info.rb index f892fc66f..c3c650f37 100644 --- a/lib/fog/rackspace/requests/monitoring/get_system_info.rb +++ b/lib/fog/rackspace/requests/monitoring/get_system_info.rb @@ -32,14 +32,7 @@ module Fog "vendor" => "CentOS", "vendor_version" => "5.10" } - ], - "metadata" => { - "count" => 1, - "limit" => 100, - "marker" => nil, - "next_marker" => nil, - "next_href" => nil - } + ] } response.headers = { "Date" => Time.now.utc.to_s,