ovirt_metrics 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e0972797c4ecb7eddabc08532a7890321e856027
+  data.tar.gz: ec1207a571b31f0a97edc69c49f99ce6cbf72910
+SHA512:
+  metadata.gz: 57da84932314838e52e990ffe4c55ec49a8066e1f7d3f1b49b565f66a587aa384f8b7a16e327da8a583a6d74ddb5f69fc277069987103d2fb277aed018887ff4
+  data.tar.gz: 3a1c778df4042d75041f418391d10a9ac13faf685e251f7f5507d264a9a2da7b134b5938907144b8559cd4a94143ddce5d0b2ea67b8991fed1dae76864d132fa

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format documentation
+--warnings
+--require spec_helper

data/README.md

@@ -1,8 +1,10 @@
 # OvirtMetrics
 
-[![Build Status](https://travis-ci.org/ManageIQ/ovirt_metrics.png?branch=master)](https://travis-ci.org/ManageIQ/ovirt_metrics)
-[![Code Climate](https://codeclimate.com/github/ManageIQ/ovirt_metrics.png)](https://codeclimate.com/github/ManageIQ/ovirt_metrics)
-[![Coverage Status](https://coveralls.io/repos/ManageIQ/ovirt_metrics/badge.png?branch=master)](https://coveralls.io/r/ManageIQ/ovirt_metrics)
+[![Gem Version](https://badge.fury.io/rb/ovirt_metrics.svg)](http://badge.fury.io/rb/ovirt_metrics)
+[![Build Status](https://travis-ci.org/ManageIQ/ovirt_metrics.svg?branch=master)](https://travis-ci.org/ManageIQ/ovirt_metrics)
+[![Code Climate](http://img.shields.io/codeclimate/github/ManageIQ/ovirt_metrics.svg)](https://codeclimate.com/github/ManageIQ/ovirt_metrics)
+[![Coverage Status](http://img.shields.io/coveralls/ManageIQ/ovirt_metrics.svg)](https://coveralls.io/r/ManageIQ/ovirt_metrics)
+[![Dependency Status](https://gemnasium.com/ManageIQ/ovirt_metrics.svg)](https://gemnasium.com/ManageIQ/ovirt_metrics)
 
 OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 

data/lib/models/ovirt_history.rb

@@ -14,5 +14,11 @@ module OvirtMetrics
       other.primary_key = :history_id
       other.table_name  = other.name.split('::').last.underscore
     end
+
+    def self.with_time_range(start_time = nil, end_time = nil)
+      return all if start_time.nil?
+      where(:history_datetime => (start_time..(end_time || Time.now.utc)))
+    end
+
   end
-end
+end

data/lib/ovirt_metrics.rb

@@ -9,6 +9,7 @@ Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "models", "*.rb")))
 module OvirtMetrics
   DEFAULT_HISTORY_DATABASE_NAME     = "ovirt_engine_history".freeze
   DEFAULT_HISTORY_DATABASE_NAME_3_0 = "rhevm_history".freeze
+  VM_NOT_RUNNING                    = 0
 
   def self.establish_connection(opts)
     self.connect(opts)
@@ -41,100 +42,79 @@ module OvirtMetrics
     metrics      = query_vm_realtime_metrics(vm_id, start_time, end_time)
     disk_metrics = query_vm_disk_realtime_metrics(vm_id, start_time, end_time)
     nic_metrics  = query_vm_nic_realtime_metrics(vm_id, start_time, end_time)
-    hashes       = vm_realtime_metrics_to_hashes(metrics, disk_metrics, nic_metrics)
+    vm_realtime_metrics_to_hashes(metrics, disk_metrics, nic_metrics)
   end
 
   def self.host_realtime(host_id, start_time = nil, end_time = nil)
     metrics      = query_host_realtime_metrics(host_id, start_time, end_time).all
     nic_metrics  = query_host_nic_realtime_metrics(host_id, start_time, end_time)
-    hashes       = host_realtime_metrics_to_hashes(metrics, nic_metrics)
+    host_realtime_metrics_to_hashes(metrics, nic_metrics)
   end
 
   private
 
   def self.query_host_realtime_metrics(host_id, start_time = nil, end_time = nil)
-    query = HostSamplesHistory.where(:host_id => host_id).includes(:host_configuration)
-    query = query.where(:history_datetime => (start_time..(end_time || Time.now.utc))) unless start_time.nil?
-    query
+    HostSamplesHistory.where(:host_id => host_id).includes(:host_configuration).with_time_range(start_time, end_time)
   end
 
   def self.query_host_nic_realtime_metrics(host_id, start_time = nil, end_time = nil)
     nic_ids = HostInterfaceConfiguration.where(:host_id => host_id).collect(&:host_interface_id)
-    query = HostInterfaceSamplesHistory.where(:host_interface_id => nic_ids)
-    query = query.where(:history_datetime => (start_time..(end_time || Time.now.utc))) unless start_time.nil?
-    query
+    HostInterfaceSamplesHistory.where(:host_interface_id => nic_ids).with_time_range(start_time, end_time)
   end
 
   def self.host_realtime_metrics_to_hashes(metrics, nic_metrics)
-    counters_by_id              = {}
-    counter_values_by_id_and_ts = {}
-
-    nic_metrics = nic_metrics.group_by { |m| m.history_datetime }
-
-    metrics.each do |metric|
-      options = {
-        :metric => metric,
-        :nic    => nic_metrics[metric.history_datetime]
-      }
-
-      href = "/api/hosts/#{metric.host_id}"
-      counters_by_id[href] ||= {}
-      values = {}
-
-      HOST_COLUMN_DEFINITIONS.each do |evm_col, info|
-        counters_by_id[href][info[:ovirt_key]] ||= info[:counter]
-        values[info[:ovirt_key]] = info[:ovirt_method].call(options)
-      end
-
-      # For (temporary) symmetry with VIM API having 20-second intervals
-      counter_values_by_id_and_ts[href] ||= {}
-      [0, 20, 40].each do |t|
-        counter_values_by_id_and_ts[href][(metric.history_datetime + t).utc.iso8601] = values
-      end
-    end
+    related_metrics = { }
+    related_metrics[:nic]  = nic_metrics.group_by  { |m| m.history_datetime }
 
-    return counters_by_id, counter_values_by_id_and_ts
+    metrics_to_hashes(metrics, related_metrics, HOST_COLUMN_DEFINITIONS, :host_metric_to_href)
   end
 
   def self.query_vm_realtime_metrics(vm_id, start_time = nil, end_time = nil)
-    query = VmSamplesHistory.where(:vm_id => vm_id).includes(:host_configuration)
-    query = query.where(:history_datetime => (start_time..(end_time || Time.now.utc))) unless start_time.nil?
-    query
+    VmSamplesHistory.where(:vm_id => vm_id).includes(:host_configuration).with_time_range(start_time, end_time)
   end
 
   def self.query_vm_disk_realtime_metrics(vm_id, start_time = nil, end_time = nil)
     disk_ids = DisksVmMap.where(:vm_id => vm_id).collect(&:vm_disk_id)
-    query = VmDiskSamplesHistory.where(:vm_disk_id => disk_ids)
-    query = query.where(:history_datetime => (start_time..(end_time || Time.now.utc))) unless start_time.nil?
-    query
+    VmDiskSamplesHistory.where(:vm_disk_id => disk_ids).with_time_range(start_time, end_time)
   end
 
   def self.query_vm_nic_realtime_metrics(vm_id, start_time = nil, end_time = nil)
     nic_ids = VmInterfaceConfiguration.where(:vm_id => vm_id).collect(&:vm_interface_id)
-    query = VmInterfaceSamplesHistory.where(:vm_interface_id => nic_ids)
-    query = query.where(:history_datetime => (start_time..(end_time || Time.now.utc))) unless start_time.nil?
-    query
+    VmInterfaceSamplesHistory.where(:vm_interface_id => nic_ids).with_time_range(start_time, end_time)
   end
 
   def self.vm_realtime_metrics_to_hashes(metrics, disk_metrics, nic_metrics)
+    related_metrics = { }
+    related_metrics[:disk] = disk_metrics.group_by { |m| m.history_datetime }
+    related_metrics[:nic]  = nic_metrics.group_by  { |m| m.history_datetime }
+
+    metrics_to_hashes(metrics, related_metrics, VM_COLUMN_DEFINITIONS, :vm_metric_to_href)
+  end
+
+  def self.vm_metric_to_href(metric)
+    "/api/vms/#{metric.vm_id}"
+  end
+
+  def self.host_metric_to_href(metric)
+    "/api/hosts/#{metric.host_id}"
+  end
+
+  def self.metrics_to_hashes(metrics, related_metrics, column_definitions, href_method)
     counters_by_id              = {}
     counter_values_by_id_and_ts = {}
 
-    disk_metrics = disk_metrics.group_by { |m| m.history_datetime }
-    nic_metrics  = nic_metrics.group_by { |m| m.history_datetime }
-
     metrics.each do |metric|
-      options = {
-        :metric => metric,
-        :disk   => disk_metrics[metric.history_datetime],
-        :nic    => nic_metrics[metric.history_datetime]
-      }
+      options = { :metric => metric }
+      related_metrics.each { |key, related_metric| options[key] = related_metric[metric.history_datetime] }
+
+      href = self.send(href_method, metric)
 
-      href = "/api/vms/#{metric.vm_id}"
       counters_by_id[href] ||= {}
       values = {}
 
-      VM_COLUMN_DEFINITIONS.each do |evm_col, info|
+      column_definitions.each do |evm_col, info|
+        next if column_definitions == VM_COLUMN_DEFINITIONS && options[:metric].vm_status.to_i == VM_NOT_RUNNING
+
         counters_by_id[href][info[:ovirt_key]] ||= info[:counter]
         values[info[:ovirt_key]] = info[:ovirt_method].call(options)
       end

data/lib/ovirt_metrics/column_definitions.rb

@@ -1,5 +1,5 @@
 module OvirtMetrics
-  VM_COLUMN_DEFINITIONS = {
+  COMMON_COLUMN_DEFINITIONS = {
     "cpu_usage_rate_average" => {
       :ovirt_key    => :cpu_usage_rate_average,
       :ovirt_method => lambda { |metrics| metrics[:metric].cpu_usage_percent.to_f },
@@ -41,6 +41,12 @@ module OvirtMetrics
         :capture_interval_name => "realtime"
       }
     },
+  }
+
+  VM_COLUMN_DEFINITIONS = {
+    "cpu_usage_rate_average"     => COMMON_COLUMN_DEFINITIONS["cpu_usage_rate_average"],
+    "cpu_usagemhz_rate_average"  => COMMON_COLUMN_DEFINITIONS["cpu_usagemhz_rate_average"],
+    "mem_usage_absolute_average" => COMMON_COLUMN_DEFINITIONS["mem_usage_absolute_average"],
 
     "disk_usage_rate_average" => {
       :ovirt_key    => :disk_usage_rate_average,
@@ -72,47 +78,9 @@ module OvirtMetrics
   }
 
   HOST_COLUMN_DEFINITIONS = {
-    "cpu_usage_rate_average" => {
-      :ovirt_key    => :cpu_usage_rate_average,
-      :ovirt_method => lambda { |metrics| metrics[:metric].cpu_usage_percent.to_f },
-      :counter      => {
-        :counter_key           => "cpu_usage_rate_average",
-        :instance              => "",
-        :capture_interval      => "20",
-        :precision             => 1,
-        :rollup                => "average",
-        :unit_key              => "percent",
-        :capture_interval_name => "realtime"
-      }
-    },
-
-    "cpu_usagemhz_rate_average" => {
-      :ovirt_key    => :cpu_usagemhz_rate_average,
-      :ovirt_method => lambda { |metrics| metrics[:metric].cpu_usagemhz_rate_average },
-      :counter      => {
-        :counter_key           => "cpu_usagemhz_rate_average",
-        :instance              => "",
-        :capture_interval      => "20",
-        :precision             => 2,
-        :rollup                => "average",
-        :unit_key              => "megahertz",
-        :capture_interval_name => "realtime"
-      }
-    },
-
-    "mem_usage_absolute_average" => {
-      :ovirt_key    => :mem_usage_absolute_average,
-      :ovirt_method => lambda { |metrics| metrics[:metric].memory_usage_percent.to_f },
-      :counter      => {
-        :counter_key           => "mem_usage_absolute_average",
-        :instance              => "",
-        :capture_interval      => "20",
-        :precision             => 1,
-        :rollup                => "average",
-        :unit_key              => "percent",
-        :capture_interval_name => "realtime"
-      }
-    },
+    "cpu_usage_rate_average"     => COMMON_COLUMN_DEFINITIONS["cpu_usage_rate_average"],
+    "cpu_usagemhz_rate_average"  => COMMON_COLUMN_DEFINITIONS["cpu_usagemhz_rate_average"],
+    "mem_usage_absolute_average" => COMMON_COLUMN_DEFINITIONS["mem_usage_absolute_average"],
 
     "net_usage_rate_average" => {
       :ovirt_key    => :net_usage_rate_average,

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/models/host_configuration_spec.rb

@@ -1,24 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::HostConfiguration do
   shared_examples_for "HostConfiguration" do
     context "#speed_in_mhz" do
       it "when cpu_model is nil" do
-        described_class.new(:cpu_model => nil).speed_in_mhz.should be_nil
+        expect(described_class.new(:cpu_model => nil).speed_in_mhz).to be_nil
       end
 
       it "when cpu_model is in GHz" do
-        described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00GHz").speed_in_mhz.should == 2048.0
+        expect(described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00GHz").speed_in_mhz).to eq(2048.0)
       end
 
       it "when cpu_model is in MHz" do
-        described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00MHz").speed_in_mhz.should == 2.0
+        expect(described_class.new(:cpu_model => "Intel(R) Xeon(R) CPU E5506 @ 2.00MHz").speed_in_mhz).to eq(2.0)
       end
 
       it "when cpu_model is some other string" do
-        described_class.new(:cpu_model => "XXX").speed_in_mhz.should be_nil
+        expect(described_class.new(:cpu_model => "XXX").speed_in_mhz).to be_nil
       end
     end
   end
@@ -32,4 +28,4 @@ describe OvirtMetrics::HostConfiguration do
     before(:each) { load_rhev_31 }
     it_should_behave_like "HostConfiguration"
   end
-end
+end

data/spec/models/host_samples_history_spec.rb

@@ -1,45 +1,40 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::HostSamplesHistory do
   shared_examples_for "HostSamplesHistory" do
     context "#cpu_usagemhz_rate_average" do
 
       it "when host_configuration is nil" do
         host_history = described_class.new(:host_configuration => nil)
-        host_history.cpu_usagemhz_rate_average.should == 0
+        expect(host_history.cpu_usagemhz_rate_average).to eq(0)
       end
 
       context "when host_configuration exists" do
         before(:each) { @host_configuration = OvirtMetrics::HostConfiguration.new }
         it "and speed_in_mhz and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is nil and number_of_cores is numeric" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          @host_configuration.stub(:number_of_cores => 1)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          allow(@host_configuration).to receive_messages(:number_of_cores => 1)
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is numeric and number_of_cores is nil" do
           host_history = described_class.new(:host_configuration => @host_configuration)
-          @host_configuration.stub(:speed_in_mhz => 2048.0)
-          host_history.cpu_usagemhz_rate_average.should == 0
+          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          expect(host_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is numeric and number_of_cores is numeric" do
-          host_configuration = OvirtMetrics::HostConfiguration.new
-          @host_configuration.stub(:speed_in_mhz => 2048.0)
-          @host_configuration.stub(:number_of_cores => 2)
+          allow(@host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
+          allow(@host_configuration).to receive_messages(:number_of_cores => 2)
 
           host_history = described_class.new(
             :cpu_usage_percent  => 50,
             :host_configuration => @host_configuration
           )
-          host_history.cpu_usagemhz_rate_average.should == 2048.0
+          expect(host_history.cpu_usagemhz_rate_average).to eq(2048.0)
         end
       end
     end
@@ -54,4 +49,4 @@ describe OvirtMetrics::HostSamplesHistory do
     before(:each) { load_rhev_31 }
     it_should_behave_like "HostSamplesHistory"
   end
-end
+end

data/spec/models/vm_disk_samples_history_spec.rb

@@ -1,7 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::VmDiskSamplesHistory do
   KILOBYTE = 1024
   MEGABYTE = KILOBYTE * 1024
@@ -9,27 +5,27 @@ describe OvirtMetrics::VmDiskSamplesHistory do
   shared_examples_for "VmDiskSamplesHistory" do
     context ".disk_usage_rate_average_in_kilobytes_per_second" do
       it "when disk_metrics array is empty" do
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([]).should == 0.0
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([])).to eq(0.0)
       end
 
       it "when disk_metrics array has one element" do
         disk_metric = double("disk_metric")
-        disk_metric.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
+        allow(disk_metric).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
         expected_result = (disk_metric.read_rate_bytes_per_second + disk_metric.write_rate_bytes_per_second) / KILOBYTE
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric]).should == expected_result
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric])).to eq(expected_result)
       end
 
       it "when disk_metrics array has two elements" do
         disk_metric1 = double("disk_metric")
-        disk_metric1.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
+        allow(disk_metric1).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 1.0 * MEGABYTE)
 
         disk_metric2 = double("disk_metric")
-        disk_metric2.stub(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 5.0 * MEGABYTE)
+        allow(disk_metric2).to receive_messages(:read_rate_bytes_per_second => 2.0 * MEGABYTE, :write_rate_bytes_per_second => 5.0 * MEGABYTE)
 
         sum_m1 = disk_metric1.read_rate_bytes_per_second + disk_metric1.write_rate_bytes_per_second
         sum_m2 = disk_metric2.read_rate_bytes_per_second + disk_metric2.write_rate_bytes_per_second
         expected_result = (sum_m1 + sum_m2) / KILOBYTE / 2
-        described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric1, disk_metric2]).should == expected_result
+        expect(described_class.disk_usage_rate_average_in_kilobytes_per_second([disk_metric1, disk_metric2])).to eq(expected_result)
       end
     end
   end
@@ -43,4 +39,4 @@ describe OvirtMetrics::VmDiskSamplesHistory do
     before(:each) { load_rhev_31 }
     it_should_behave_like "VmDiskSamplesHistory"
   end
-end
+end

data/spec/models/vm_samples_history_spec.rb

@@ -1,32 +1,28 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::VmSamplesHistory do
   shared_examples_for "VmSamplesHistory" do
     context "#cpu_usagemhz_rate_average" do
       it "when host_configuration is nil" do
         vm_history = described_class.new
-        vm_history.stub(:host_configuration => nil)
+        allow(vm_history).to receive_messages(:host_configuration => nil)
 
-        vm_history.cpu_usagemhz_rate_average.should == 0
+        expect(vm_history.cpu_usagemhz_rate_average).to eq(0)
       end
 
       context "when host_configuration exists" do
         it "and speed_in_mhz is nil" do
           vm_history = described_class.new(:host_configuration => OvirtMetrics::HostConfiguration.new)
-          vm_history.cpu_usagemhz_rate_average.should == 0
+          expect(vm_history.cpu_usagemhz_rate_average).to eq(0)
         end
 
         it "and speed_in_mhz is not nil" do
           host_configuration = OvirtMetrics::HostConfiguration.new
-          host_configuration.stub(:speed_in_mhz => 2048.0)
+          allow(host_configuration).to receive_messages(:speed_in_mhz => 2048.0)
 
           vm_history = described_class.new(
             :cpu_usage_percent  => 50,
             :host_configuration => host_configuration
           )
-          vm_history.cpu_usagemhz_rate_average.should == 1024.0
+          expect(vm_history.cpu_usagemhz_rate_average).to eq(1024.0)
         end
       end
     end
@@ -41,4 +37,4 @@ describe OvirtMetrics::VmSamplesHistory do
     before(:each) { load_rhev_31 }
     it_should_behave_like "VmSamplesHistory"
   end
-end
+end

data/spec/nic_metrics_spec.rb

@@ -1,27 +1,23 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-
-require 'ovirt_metrics'
-
 describe OvirtMetrics::NicMetrics do
   context ".net_usage_rate_average_in_kilobytes_per_second" do
     it "when nic_metrics array is empty" do
-      described_class.net_usage_rate_average_in_kilobytes_per_second([]).should == 0.0
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([])).to eq(0.0)
     end
 
     it "when nic_metrics array has one element" do
       nic_metric = double("nic_metric")
-      nic_metric.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       expected = (OvirtMetrics::NicMetrics::GIGABYTE_PER_SECOND / 2) / 1024
-      described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric]).should == expected
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric])).to eq(expected)
     end
 
     it "when nic_metrics array has multiple elements" do
       nic_metric1 = double("nic_metric")
-      nic_metric1.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric1).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       nic_metric2 = double("nic_metric")
-      nic_metric2.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
+      allow(nic_metric2).to receive_messages(:receive_rate_percent => 90, :transmit_rate_percent => 10)
       expected = (OvirtMetrics::NicMetrics::GIGABYTE_PER_SECOND / 2) / 1024
-      described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2]).should == expected
+      expect(described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2])).to eq(expected)
     end
   end
-end
+end

data/spec/ovirt_metrics_spec.rb

@@ -1,6 +1,69 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+describe OvirtMetrics do
+  shared_examples_for "OvirtMetrics" do
+    context ".vm_realtime" do
+      it "when vm_id finds no matches" do
+        expect(described_class.vm_realtime(42)).to eq([{}, {}])
+      end
 
-require 'ovirt_metrics'
+      it "when vm_id finds 1 match" do
+        assert_object_with_empty_samples_data("vm")
+      end
+    end
 
-describe OvirtMetrics do
-end
+    context ".host_realtime" do
+      it "when host_id finds no matches" do
+        expect(described_class.host_realtime(42)).to eq([{}, {}])
+      end
+
+      it "when host_id finds 1 match" do
+        assert_object_with_empty_samples_data("host")
+      end
+    end
+
+    def assert_object_with_empty_samples_data(type)
+      id = 42
+      status = 1
+      history_datetime = Time.now
+      klass = "OvirtMetrics::#{type.capitalize}SamplesHistory".constantize
+      id_key     = "#{type}_id".to_sym
+      status_key = "#{type}_status".to_sym
+      record_attrs = {
+                  id_key            => id,
+                  status_key        => status,
+                  :history_datetime => history_datetime,
+      }
+      record = klass.create!(record_attrs)
+
+      href = "/api/#{type.pluralize}/#{id}"
+      constant = "OvirtMetrics::#{type.upcase}_COLUMN_DEFINITIONS".constantize
+      column_definitions = constant.each_with_object({}) do |(_name, defn), hash|
+        key   = defn[:ovirt_key]
+        value = defn[:counter]
+        hash[key] = value
+      end
+      columns = { href => column_definitions }
+
+      rows_hash = [0, 20, 40].each_with_object({}) do |offset, hash|
+        value = column_definitions.keys.each_with_object({}) { |key, col_hash| col_hash[key] = 0.0 }
+        key   = (record.history_datetime + offset).utc.iso8601.to_s
+        hash[key] = value
+      end
+      rows = { href => rows_hash }
+
+      method = "#{type}_realtime"
+      expect(described_class.send(method, id)).to eq([columns, rows])
+    end
+
+  end
+
+  context "RHEV 3.0" do
+    before(:each) { load_rhev_30 }
+    it_should_behave_like "OvirtMetrics"
+  end
+
+  context "RHEV 3.1" do
+    before(:each) { load_rhev_31 }
+    it_should_behave_like "OvirtMetrics"
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,21 +1,87 @@
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, make a
+# separate helper file that requires this one and then use it only in the specs
+# that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  # config.profile_examples = 10
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
 end
 
 require 'support/active_record'
 
-require 'coveralls'
-Coveralls.wear!
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
+
+require 'ovirt_metrics'

data/spec/support/active_record.rb

@@ -34,9 +34,20 @@ end
 def load_rhev_30
   ActiveRecord::Schema.verbose = false
   load File.join(File.dirname(__FILE__), %w{.. schemas schema_rhev30.rb})
+  reset_models
 end
 
 def load_rhev_31
   ActiveRecord::Schema.verbose = false
   load File.join(File.dirname(__FILE__), %w{.. schemas schema_rhev31.rb})
+  reset_models
+end
+
+def reset_models
+  OvirtMetrics.constants.each do |c|
+    o = OvirtMetrics.const_get(c)
+    next if o == OvirtMetrics::OvirtHistory
+    next unless o.respond_to?(:ancestors) && o.ancestors.include?(ActiveRecord::Base)
+    o.reset_column_information
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -10,104 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.3
 description: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History
   database.
 email:
@@ -117,12 +104,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- Gemfile
+- ".rspec"
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/models/calendar.rb
 - lib/models/cluster_configuration.rb
 - lib/models/datacenter_configuration.rb
@@ -168,7 +152,6 @@ files:
 - lib/ovirt_metrics/column_definitions.rb
 - lib/ovirt_metrics/nic_metrics.rb
 - lib/ovirt_metrics/version.rb
-- ovirt_metrics.gemspec
 - spec/models/host_configuration_spec.rb
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
@@ -179,37 +162,29 @@ files:
 - spec/schemas/schema_rhev31.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-- travis.yml
 homepage: http://github.com/ManageIQ/ovirt_metrics
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -568016211607175379
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -568016211607175379
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 test_files:
 - spec/models/host_configuration_spec.rb
@@ -222,3 +197,4 @@ test_files:
 - spec/schemas/schema_rhev31.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- ".rspec"

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ovirt_metrics.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
-task :test => :spec
-task :default => :spec

data/ovirt_metrics.gemspec

@@ -1,28 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ovirt_metrics/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "ovirt_metrics"
-  spec.version       = OvirtMetrics::VERSION
-  spec.authors       = ["Oleg Barenboim", "Jason Frey"]
-  spec.email         = ["chessbyte@gmail.com", "fryguy9@gmail.com"]
-  spec.description   = %q{OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.}
-  spec.summary       = %q{OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.}
-  spec.homepage      = "http://github.com/ManageIQ/ovirt_metrics"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "coveralls"
-
-  spec.add_dependency "activerecord", "~> 3.2.0"
-end

data/travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode