Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #36518 - show disk/partitions of vsphere host #9740

Merged
merged 1 commit into from
Jul 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/views/compute_resources_vms/show/_vmware.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
<%= prop :datacenter %>
<%= prop :cluster %>
<%= prop :memory %>
<% @vm.disks.each do |vol| %>
<tr>
<td><%= _("Disk '%s'") % vol[:label] %></td>
<td><%= _("%{capacity}") % { :capacity => number_to_human_size(vol[:capacity])} %></td>
</tr>
<% end %>
<% @vm.partitions.each do |part| %>
<tr>
<td><%= _("Partition '%s'") % part[:path] %></td>
<td><%= _("using %{allocation} out of %{capacity}") % { :allocation => number_to_human_size(part[:capacity]-part[:free]), :capacity => number_to_human_size(part[:capacity])} %></td>
</tr>
<% end %>
<%= prop :public_ip_address %>
<%= prop :mac %>
<%= prop :cpus %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,38 @@ const VirtVmware = ({ vm }) => (
{vm.corespersocket}
</DescriptionListDescription>
</DescriptionListGroup>
{Object.values(vm.disks).map((disk, index) => (
sbernhard marked this conversation as resolved.
Show resolved Hide resolved
<DescriptionListGroup key={`disk-${index}`}>
<DescriptionListTerm>{__('Disk label')}</DescriptionListTerm>
<DescriptionListDescription>{disk.label}</DescriptionListDescription>
<DescriptionListTerm>{__('Disk capacity')}</DescriptionListTerm>
<DescriptionListDescription>
{NumberToHumanSize(disk.capacity, {
strip_insignificant_zeros: true,
})}
</DescriptionListDescription>
</DescriptionListGroup>
))}
{Object.values(vm.partitions).map((partition, index) => (
<DescriptionListGroup key={`partition-${index}`}>
<DescriptionListTerm>{__('Partition path')}</DescriptionListTerm>
<DescriptionListDescription>
{partition.path}
</DescriptionListDescription>
<DescriptionListTerm>{__('Partition capacity')}</DescriptionListTerm>
<DescriptionListDescription>
{NumberToHumanSize(partition.capacity, {
strip_insignificant_zeros: true,
})}
</DescriptionListDescription>
<DescriptionListTerm>{__('Partition allocation')}</DescriptionListTerm>
<DescriptionListDescription>
{NumberToHumanSize(partition.capacity - partition.free, {
strip_insignificant_zeros: true,
})}
</DescriptionListDescription>
</DescriptionListGroup>
))}
<DescriptionListGroup>
<DescriptionListTerm>{__('Firmware')}</DescriptionListTerm>
<DescriptionListDescription>{vm.firmware}</DescriptionListDescription>
Expand Down