ovirt_metrics 1.0.0 → 1.0.1

data/lib/models/host_interface_samples_history.rb

@@ -1,29 +1,7 @@
 module OvirtMetrics
   class HostInterfaceSamplesHistory < OvirtHistory
-    belongs_to :host_interface_configuration,   :foreign_key => :host_interface_configuration_version
-
-    KILO                = 1024
-    MEGA                = 1024 * KILO
-    GIGA                = 1024 * MEGA
-    GIGABIT_PER_SECOND  = GIGA
-    GIGABYTE_PER_SECOND = GIGABIT_PER_SECOND / 8
-
-    def self.net_usage_rate_average_in_kilobytes_per_second(nic_metrics)
-      count = 0
-      sum   = 0
-      nic_metrics ||= []
-      nic_metrics.each do |n|
-        sum   += (n.receive_rate_percent.to_f + n.transmit_rate_percent.to_f) / 2
-        count += 1
-      end
-
-      return 0.0 if count == 0
-
-      percentage = sum / 100.0
-      bytes_per_second = percentage * GIGABYTE_PER_SECOND
-
-      (bytes_per_second / count) / 1024
-    end
+    extend NicMetrics
 
+    belongs_to :host_interface_configuration,   :foreign_key => :host_interface_configuration_version
   end
 end

data/lib/models/host_samples_history.rb

@@ -3,6 +3,7 @@ module OvirtMetrics
     belongs_to :host_configuration, :foreign_key => :host_configuration_version
 
     def cpu_usagemhz_rate_average
+      return 0.0 if self.host_configuration.nil?
       speed_of_host = self.host_configuration.speed_in_mhz.to_f * self.host_configuration.number_of_cores.to_i
       return (speed_of_host * (self.cpu_usage_percent.to_f / 100.0))
     end

data/lib/models/vm_interface_samples_history.rb

@@ -1,29 +1,7 @@
 module OvirtMetrics
   class VmInterfaceSamplesHistory < OvirtHistory
-    belongs_to :vm_interface_configuration,   :foreign_key => :vm_interface_configuration_version
-
-    KILO                = 1024
-    MEGA                = 1024 * KILO
-    GIGA                = 1024 * MEGA
-    GIGABIT_PER_SECOND  = GIGA
-    GIGABYTE_PER_SECOND = GIGABIT_PER_SECOND / 8
-
-    def self.net_usage_rate_average_in_kilobytes_per_second(nic_metrics)
-      count = 0
-      sum   = 0
-      nic_metrics ||= []
-      nic_metrics.each do |n|
-        sum   += (n.receive_rate_percent.to_f + n.transmit_rate_percent.to_f) / 2
-        count += 1
-      end
-
-      return 0.0 if count == 0
-
-      percentage = sum / 100.0
-      bytes_per_second = percentage * GIGABYTE_PER_SECOND
-
-      (bytes_per_second / count) / 1024
-    end
+    extend NicMetrics
 
+    belongs_to :vm_interface_configuration,   :foreign_key => :vm_interface_configuration_version
   end
 end

data/lib/ovirt_metrics.rb

@@ -1,12 +1,14 @@
 require "ovirt_metrics/version"
-require "ovirt_metrics/constants"
+require "ovirt_metrics/column_definitions"
+require "ovirt_metrics/nic_metrics"
 
 $:.push File.expand_path(File.dirname(__FILE__))
 require 'models/ovirt_history'
 Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "models", "*.rb"))) { |f| require "models/#{File.basename(f, ".*")}" }
 
 module OvirtMetrics
-  DEFAULT_HISTORY_DATABASE_NAME = "ovirt_engine_history".freeze
+  DEFAULT_HISTORY_DATABASE_NAME     = "ovirt_engine_history".freeze
+  DEFAULT_HISTORY_DATABASE_NAME_3_0 = "rhevm_history".freeze
 
   def self.establish_connection(opts)
     self.connect(opts)

data/lib/ovirt_metrics/nic_metrics.rb

@@ -0,0 +1,30 @@
+module OvirtMetrics
+  module NicMetrics
+    KILO                = 1024
+    MEGA                = 1024 * KILO
+    GIGA                = 1024 * MEGA
+    GIGABIT_PER_SECOND  = GIGA
+    GIGABYTE_PER_SECOND = GIGABIT_PER_SECOND / 8
+
+    def self.net_usage_rate_average_in_kilobytes_per_second(nic_metrics)
+      count = 0
+      sum   = 0
+      nic_metrics ||= []
+      nic_metrics.each do |n|
+        sum   += (n.receive_rate_percent.to_f + n.transmit_rate_percent.to_f) / 2
+        count += 1
+      end
+
+      return 0.0 if count == 0
+
+      percentage = sum / 100.0
+      bytes_per_second = percentage * GIGABYTE_PER_SECOND
+
+      (bytes_per_second / count) / 1024
+    end
+
+    def net_usage_rate_average_in_kilobytes_per_second(nic_metrics)
+      NicMetrics.net_usage_rate_average_in_kilobytes_per_second(nic_metrics)
+    end
+  end
+end

data/lib/ovirt_metrics/version.rb

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

data/spec/models/host_samples_history_spec.rb

@@ -5,8 +5,14 @@ require 'ovirt_metrics'
 describe OvirtMetrics::HostSamplesHistory do
   shared_examples_for "HostSamplesHistory" do
     context "#cpu_usagemhz_rate_average" do
-      before(:each) { @host_configuration = OvirtMetrics::HostConfiguration.new }
+
+      it "when host_configuration is nil" do
+        host_history = described_class.new(:host_configuration => nil)
+        host_history.cpu_usagemhz_rate_average.should == 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

data/spec/nic_metrics_spec.rb

@@ -0,0 +1,27 @@
+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
+    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)
+      expected = (OvirtMetrics::NicMetrics::GIGABYTE_PER_SECOND / 2) / 1024
+      described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric]).should == 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)
+      nic_metric2 = double("nic_metric")
+      nic_metric2.stub(: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
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,15 +165,15 @@ files:
 - lib/models/vm_interface_samples_history.rb
 - lib/models/vm_samples_history.rb
 - lib/ovirt_metrics.rb
-- lib/ovirt_metrics/constants.rb
+- 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_interface_samples_history_spec.rb
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
-- spec/models/vm_interface_samples_history_spec.rb
 - spec/models/vm_samples_history_spec.rb
+- spec/nic_metrics_spec.rb
 - spec/ovirt_metrics_spec.rb
 - spec/schemas/schema_rhev30.rb
 - spec/schemas/schema_rhev31.rb
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2869768854334440275
+      hash: -568016211607175379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2869768854334440275
+      hash: -568016211607175379
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -213,11 +213,10 @@ specification_version: 3
 summary: OvirtMetrics is an ActiveRecord-based gem for reading the oVirt History database.
 test_files:
 - spec/models/host_configuration_spec.rb
-- spec/models/host_interface_samples_history_spec.rb
 - spec/models/host_samples_history_spec.rb
 - spec/models/vm_disk_samples_history_spec.rb
-- spec/models/vm_interface_samples_history_spec.rb
 - spec/models/vm_samples_history_spec.rb
+- spec/nic_metrics_spec.rb
 - spec/ovirt_metrics_spec.rb
 - spec/schemas/schema_rhev30.rb
 - spec/schemas/schema_rhev31.rb

data/spec/models/host_interface_samples_history_spec.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
-describe OvirtMetrics::HostInterfaceSamplesHistory do
-  shared_examples_for "HostInterfaceSamplesHistory" 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
-      end
-
-      it "when nic_metrics array has one element with 90% receiving and 10% transmitting" do
-        nic_metric = double("nic_metric")
-        nic_metric.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric]).should == (described_class::GIGABYTE_PER_SECOND / 2) / 1024
-      end
-
-      it "when nic_metrics array has two elements with 90% receiving and 10% transmitting each" do
-        nic_metric1 = double("nic_metric")
-        nic_metric1.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        nic_metric2 = double("nic_metric")
-        nic_metric2.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2]).should == (described_class::GIGABYTE_PER_SECOND / 2) / 1024
-      end
-    end
-  end
-
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
-    it_should_behave_like "HostInterfaceSamplesHistory"
-  end
-
-  context "RHEV 3.1" do
-    before(:each) { load_rhev_31 }
-    it_should_behave_like "HostInterfaceSamplesHistory"
-  end
-end

data/spec/models/vm_interface_samples_history_spec.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w{.. spec_helper}))
-
-require 'ovirt_metrics'
-
-describe OvirtMetrics::VmInterfaceSamplesHistory do
-  shared_examples_for "VmInterfaceSamplesHistory" 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
-      end
-
-      it "when nic_metrics array has one element with 90% receiving and 10% transmitting" do
-        nic_metric = double("nic_metric")
-        nic_metric.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric]).should == (described_class::GIGABYTE_PER_SECOND / 2) / 1024
-      end
-
-      it "when nic_metrics array has two elements with 90% receiving and 10% transmitting each" do
-        nic_metric1 = double("nic_metric")
-        nic_metric1.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        nic_metric2 = double("nic_metric")
-        nic_metric2.stub(:receive_rate_percent => 90, :transmit_rate_percent => 10)
-        described_class.net_usage_rate_average_in_kilobytes_per_second([nic_metric1, nic_metric2]).should == (described_class::GIGABYTE_PER_SECOND / 2) / 1024
-      end
-    end
-  end
-
-  context "RHEV 3.0" do
-    before(:each) { load_rhev_30 }
-    it_should_behave_like "VmInterfaceSamplesHistory"
-  end
-
-  context "RHEV 3.1" do
-    before(:each) { load_rhev_31 }
-    it_should_behave_like "VmInterfaceSamplesHistory"
-  end
-end