ovirt_metrics 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f6eb0cee5ba8ae32e0f2fa316048a258204db1
-  data.tar.gz: 16b8c4b956bdbf7016483bb4dc225dde3779a6c7
+  metadata.gz: e8531838b19b90017cbbffe7c3b13ab9d412c762
+  data.tar.gz: c85dace0a565248aeac3a80042d392fe22d20667
 SHA512:
-  metadata.gz: ebde982b37176d5d7374792f54508747feda496cc2b4a4166548c6117c3fae3fab73a1a1fc434c39a16ceb727f665c7f85fd7d535acf6474927766137395520e
-  data.tar.gz: b215b596b463b6c07b7230ada719f7f07c1c642ac28c807e7d5c93f0a266393dc17c6614a7306e8b84b227c64d0278c61a1864f588e4baf484378ca5ab5b8164
+  metadata.gz: a8d6b8b0904ff6a76bf561941e22dc860c86c13192710d4e2acb5e782c4cba689ec027d45751b5cd1c043bfde2fad75d5c84f13d2fb5cbe576bc02965588fdbb
+  data.tar.gz: 364b1d58661abb9af90a1971046d06cf98241cd0770c382916be21513773f04255714d50371f641990a52722179df44a085bbde82f4e5044cc118fdcefc8b369

data/lib/ovirt_metrics.rb

@@ -111,8 +111,12 @@ module OvirtMetrics
     VmDeviceHistory.where(:vm_id => vm_id).disks.attached.pluck('DISTINCT device_id')
   end
 
+  def self.vms_nic_ids_for(vm_id)
+    VmDeviceHistory.where(:vm_id => vm_id).nics.attached.pluck("DISTINCT device_id")
+  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)
+    nic_ids = vms_nic_ids_for(vm_id)
     VmInterfaceSamplesHistory.where(:vm_interface_id => nic_ids).with_time_range(start_time, end_time)
   end
 

data/lib/ovirt_metrics/models/vm_device_history.rb

@@ -5,6 +5,7 @@ module OvirtMetrics
     self.inheritance_column = :_type_disabled
 
     scope :disks,    -> { where(:type => "disk") }
+    scope :nics,     -> { where(:type => "interface") }
     scope :attached, -> { where(:delete_date => nil) }
   end
 end

data/lib/ovirt_metrics/version.rb

@@ -1,3 +1,3 @@
 module OvirtMetrics
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/ovirt_metrics_spec.rb

@@ -31,6 +31,36 @@ describe OvirtMetrics do
       it { is_expected.not_to include("device_that_was_deleted") }
     end
 
+    describe ".vms_nic_ids_for" do
+      before(:each) do
+        @vm1_id = 1
+        @device_id1 = "device1"
+        @device_id2 = "device2"
+        generic_params = {
+          :vm_id       => @vm1_id,
+          :device_id   => @device_id1,
+          :type        => "interface",
+          :address     => "address",
+          :create_date => 1.week.ago
+        }
+        OvirtMetrics::VmDeviceHistory.create(generic_params)
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:address => "duplicate_with_same_device_id"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:device_id => @device_id2))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:vm_id => 2, :device_id => "disk_from_other_vm"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:type      => "disk",
+                                                                  :device_id => "device_of_non_nic_type"))
+        OvirtMetrics::VmDeviceHistory.create(generic_params.merge(:device_id   => "device_that_was_deleted",
+                                                                  :delete_date => 2.days.ago))
+      end
+
+      subject { described_class.vms_nic_ids_for(@vm1_id) }
+
+      it { is_expected.to match_array([@device_id1, @device_id2]) }
+      it { is_expected.not_to include("nic_from_other_vm") }
+      it { is_expected.not_to include("device_of_non_nic_type") }
+      it { is_expected.not_to include("device_that_was_deleted") }
+    end
+
     context ".vm_realtime" do
       it "when vm_id finds no matches" do
         expect(described_class.vm_realtime(42)).to eq([{}, {}])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt_metrics
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Oleg Barenboim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler