Merge pull request #2673 from lgalis/azure_container_disk_size_displa…

…y_fix Disk Name should not display 0 for unavailable Used/Provisioned size
ManageIQ · Nov 8, 2017 · 2faeb15 · 2faeb15
2 parents 310c36a + baf246f
commit 2faeb15
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/app/helpers/textual_mixins/textual_devices.rb b/app/helpers/textual_mixins/textual_devices.rb
@@ -42,11 +42,10 @@ def disks_attributes
       location = disk.location
       size = disk.size
       prov = disk.used_percent_of_provisioned
-      device_name = _("Hard Disk (%{controller_type} %{location}), Size %{size}, " \
-                      "Percent Used Provisioned Space %{space}") % {:controller_type => ctrl_type,
-                                                                    :location        => location,
-                                                                    :size            => size,
-                                                                    :space           => prov}
+      device_name = _("Hard Disk (%{controller_type} %{location}), Size %{size}") % {:controller_type => ctrl_type,
+                                                                                     :location        => location,
+                                                                                     :size            => size}
+      device_name << _(", Percent Used Provisioned Space %{space}") % {:space => prov} unless disk.size_on_disk.nil?
       description = _("%{filename}, Mode: %{mode}") % {:filename => disk.filename, :mode => disk.mode}
       Device.new(device_name, description, nil, :disk)
     end

diff --git a/spec/helpers/textual_mixins/textual_devices_spec.rb b/spec/helpers/textual_mixins/textual_devices_spec.rb
@@ -35,6 +35,18 @@
       end
       it { is_expected.not_to be_empty }
     end
+
+    context "with hdd with no size_on_disk collected (AZURE)" do
+      let(:hw) do
+        FactoryGirl.create(:hardware,
+                           :disks => [FactoryGirl.create(:disk,
+                                                         :device_type     => "disk",
+                                                         :size            => "1072693248",
+                                                         :controller_type => "AZURE")])
+      end
+      it { expect(subject[0][:name]).to include("Hard Disk (AZURE ), Size 1072693248") }
+      it { expect(subject[0][:name]).not_to include("Percent Used Provisioned Space") }
+    end
   end
 
   describe "#network_attributes" do