Merge pull request #276 from borod108/bug/1598747disk_type

Fix disk_type attribute
ManageIQ · Aug 16, 2018 · 79344a2 · 79344a2
2 parents 5e754c1 + a0002db
commit 79344a2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/parser.rb b/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/parser.rb
@@ -577,7 +577,7 @@ def self.vm_inv_to_disk_hashes(inv, storage_uids)
           :location        => index.to_s,
           :size            => (device[:provisioned_size] || device[:size]).to_i,
           :size_on_disk    => device[:actual_size] ? device[:actual_size].to_i : 0,
-          :disk_type       => device[:sparse] == true ? 'thin' : 'thick',
+          :disk_type       => device[:format] == 'raw' ? 'thick' : 'thin',
           :mode            => 'persistent',
           :bootable        => device[:bootable]
         }

diff --git a/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/strategies/vm_inventory.rb b/app/models/manageiq/providers/redhat/infra_manager/refresh/parse/strategies/vm_inventory.rb
@@ -234,7 +234,7 @@ def vm_inv_to_disk_hashes(inv, storage_uids)
             :location        => index.to_s,
             :size            => device.provisioned_size.to_i,
             :size_on_disk    => device.actual_size.to_i,
-            :disk_type       => device.sparse == true ? 'thin' : 'thick',
+            :disk_type       => device.format == 'raw' ? 'thick' : 'thin',
             :mode            => 'persistent',
             :bootable        => device.try(:bootable)
           }

diff --git a/app/models/manageiq/providers/redhat/inventory/parser/infra_manager.rb b/app/models/manageiq/providers/redhat/inventory/parser/infra_manager.rb
@@ -457,7 +457,7 @@ def hardware_disks(persister_hardware, disks)
           :location        => index.to_s,
           :size            => device.provisioned_size.to_i,
           :size_on_disk    => device.actual_size.to_i,
-          :disk_type       => device.sparse == true ? 'thin' : 'thick',
+          :disk_type       => device.format == 'raw' ? 'thick' : 'thin',
           :mode            => 'persistent',
           :bootable        => device.try(:bootable),
           :storage         => persister.storages.lazy_find(ManageIQ::Providers::Redhat::InfraManager.make_ems_ref(storage_ref))

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_graph_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_graph_spec.rb
@@ -664,7 +664,7 @@ def assert_specific_vm_powered_off
         :size            => 6_442_450_944,
         :size_on_disk    => 0,
         :mode            => "persistent",
-        :disk_type       => "thin",
+        :disk_type       => "thick",
         :start_connected => true
       )
       expect(disk.storage).to eq(@storage) ## CHECK MANUALLY
@@ -777,7 +777,7 @@ def assert_specific_template
         :size            => 6_442_450_944,
         :size_on_disk    => 1_838_448_640,
         :mode            => "persistent",
-        :disk_type       => "thin",
+        :disk_type       => "thick",
         :start_connected => true
       )
       expect(disk.storage).to eq(@storage) ## CHECK MANUALLY

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_4_async_spec.rb
@@ -629,7 +629,7 @@ def assert_specific_vm_powered_off
         :size            => 6_442_450_944,
         :size_on_disk    => 0,
         :mode            => "persistent",
-        :disk_type       => "thin",
+        :disk_type       => "thick",
         :start_connected => true
       )
       expect(disk.storage).to eq(@storage) ## CHECK MANUALLY
@@ -742,7 +742,7 @@ def assert_specific_template
         :size            => 6_442_450_944,
         :size_on_disk    => 1_838_448_640,
         :mode            => "persistent",
-        :disk_type       => "thin",
+        :disk_type       => "thick",
         :start_connected => true
       )
       expect(disk.storage).to eq(@storage) ## CHECK MANUALLY

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_target_vm_4_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/refresh/refresher_target_vm_4_spec.rb
@@ -316,7 +316,7 @@ def assert_vm_rels(vm, hardware, storage)
       :present            => true,
       :start_connected    => true,
       :auto_detect        => nil,
-      :disk_type          => "thin",
+      :disk_type          => "thick",
       :storage_id         => storage.id,
       :backing_id         => nil,
       :backing_type       => nil,