manageiq-smartstate 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f731538916cc77ead512682c9f59f0973df895c
-  data.tar.gz: c749c7daf28c1e65ae613bfe632ff8c98ba1a0eb
+  metadata.gz: 5f43ae766750f3806637203402e8854fc3a04ecd
+  data.tar.gz: d095b81850e3ac86139c57abf2ded99987a175b8
 SHA512:
-  metadata.gz: b28438c09564c8d3e44cfda1a7c263847578274d231c8ca5423d7e44622cb8cd5b10dedbaa8ef0c2109f0212f6e47a5ff7aa793f687a9d50e23f9feeae1959f1
-  data.tar.gz: 2e55c1e754a8adc088be23da2ca5c0d7b07dffd9ed0a93f39ef41aa904de1f46a5d271a45f406b62399e2752f55fc60e7475435153cb416ace39cdd79bb4bb77
+  metadata.gz: dab2eb64ac72a70bf8cad523f23a19fff4866664965cbb4430f2156005bebbdd7b2958a9e604652a9f4146591a8414350db070384664ccc8f7e3d3f733492b3d
+  data.tar.gz: e98c541ba547c02da75752fe66bfd099f54615159a3cefaba881ef4e485237d20892e1bcd097688b0f5d7be619ad7d0d826cb375bfb4ed9adef77bcd4ba32576

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.1".freeze
   end
 end

data/lib/metadata/VmConfig/VmConfig.rb

@@ -478,10 +478,15 @@ class VmConfig
           end
         elsif miqvm.rhevm
           # First add the VM's active disk files.
-          miqvm.rhevmVm.disks.each { |disk| @files << rhevm_disk_file_entry(disk) }
+          disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
+          disks.each { |disk| @files << rhevm_disk_file_entry(disk) }
           # Then add the files associtaed with inactive snapshots.
-          miqvm.rhevmVm.snapshots.each do |snap|
-            snap.disks.each { |disk| @files << rhevm_disk_file_entry(disk) unless snap[:type] == 'active' }
+          miqvm.rhevm.collect_snapshots(miqvm.rhevmVm).each do |snap|
+            next if snap.snapshot_type == 'active'
+
+            miqvm.rhevm.collect_disks_of_snapshot(snap).each do |disk|
+              @files << rhevm_disk_file_entry(disk)
+            end
           end
         end
       rescue => err
@@ -493,12 +498,10 @@ class VmConfig
   end
 
   def rhevm_disk_file_entry(disk)
-    storage_domain = disk[:storage_domains].first
-    storage_id     = storage_domain && storage_domain[:id]
-    disk_key       = disk[:image_id].blank? ? :id : :image_id
-    fullPath       = storage_id && File.join('/dev', storage_id, disk[disk_key])
-
-    {:path => fullPath, :name => disk[disk_key], :size => disk[:actual_size].to_i}
+    storage_id = disk.storage_domains.first&.id
+    disk_id = disk.image_id || disk.id
+    full_path = storage_id && File.join('/dev', storage_id, disk_id)
+    {:path => full_path, :name => disk_id, :size => disk.actual_size.to_i}
   end
   private :rhevm_disk_file_entry
 
@@ -545,12 +548,12 @@ class VmConfig
             end
           end
         elsif miqvm.rhevmVm
-          miqvm.rhevmVm.disks.each do |disk|
-            storage_domain = disk[:storage_domains].first
-            storage_id = storage_domain && storage_domain[:id]
-            disk_key = disk[:image_id].blank? ? :id : :image_id
-            fullPath = storage_id && File.join('/dev', storage_id, disk[disk_key])
-            d = {:path => fullPath, :name => disk[:name].to_s, :size => disk[:size].to_i}
+          disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
+          disks.each do |disk|
+            storage_id = disk.storage_domains.first&.id
+            disk_id = disk.image_id || disk.id
+            full_path = storage_id && File.join('/dev', storage_id, disk_id)
+            d = {:path => full_path, :name => disk.name.to_s, :size => disk.actual_size.to_i}
             @disk_files << d
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest