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.

Sign up for GitHub

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 #37689 - Add NVME controllers to hammer help #628

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Fixes #37689 - Add NVME controllers to hammer help #628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 23 additions & 20 deletions lib/hammer_cli_foreman/compute_resource/vmware.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ def name
def compute_attributes
[
['cluster', _('Cluster ID from VMware'), { bold: true }],
['corespersocket', _('Number of cores per socket (applicable to hardware versions < 10 only)'), { bold: true }],
['corespersocket', _('Number of cores per socket (applicable to hardware versions < 10 only)'),
{ bold: true }],
['cpus', _('CPU count'), { bold: true }],
['memory_mb', _('Integer number, amount of memory in MB'), { bold: true }],
['path', _('Path to folder'), { bold: true }],
Expand All @@ -23,10 +24,12 @@ def compute_attributes
['add_cdrom', _('Must be a 1 or 0, Add a CD-ROM drive to the virtual machine')],
['annotation', _('Annotation Notes')],
['scsi_controllers', [_('List with SCSI controllers definitions'),
' type - ' + _('ID of the controller from VMware'),
' key - ' + _('Key of the controller (e.g. 1000)')
].flatten(1).join("\n")],
['boot_order', _('Device names to specify the boot order')]
' type - ' + _('ID of the controller type from VMware'),
' key - ' + _('Key of the controller (e.g. 1000)')].flatten(1).join("\n")],
['nvme_controllers', [_('List with NVME controllers definitions'),
' type - ' + _('ID of the controller type from VMware'),
' key - ' + _('Key of the controller (e.g. 2000)')].flatten(1).join("\n")],
['boot_order', _('Device names to specify the boot order')]
]
end

Expand All @@ -45,7 +48,7 @@ def volume_attributes
['size_gb', _('Integer number, volume size in GB')],
['thin', 'true/false'],
['eager_zero', 'true/false'],
['controller_key', 'Associated SCSI controller key']
['controller_key', 'Associated controller key']
]
end

Expand All @@ -63,25 +66,25 @@ def interface_attributes

def provider_specific_fields
super + [
Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
Fields::Field.new(:label => _('Server'), :path => [:server]),
Fields::Boolean.new(:label => _('Console password set'), :path => [:set_console_password]),
Fields::Boolean.new(:label => _('Caching enabled'), :path => [:caching_enabled])
Fields::Field.new(label: _('Datacenter'), path: [:datacenter]),
Fields::Field.new(label: _('Server'), path: [:server]),
Fields::Boolean.new(label: _('Console password set'), path: [:set_console_password]),
Fields::Boolean.new(label: _('Caching enabled'), path: [:caching_enabled])
]
end

def provider_vm_specific_fields
[
Fields::Field.new(:label => _('CPUs'), :path => [:cpus]),
Fields::Field.new(:label => _('Memory'), :path => [:memory_mb]),
Fields::Field.new(:label => _('Power Status'), :path => [:power_state]),
Fields::Field.new(:label => _('Host Name'), :path => [:hostname]),
Fields::Field.new(:label => _('Connection Status'), :path => [:connection_status]),
Fields::Field.new(:label => _('Hardware Version'), :path => [:hardware_version]),
Fields::Field.new(:label => _('Path'), :path => [:path]),
Fields::Field.new(:label => _('Operating System'), :path => [:operatingsystem]),
Fields::Field.new(:label => _('Mac'), :path => [:mac]),
Fields::List.new(:label => _('Boot order'), :path => [:boot_order])
Fields::Field.new(label: _('CPUs'), path: [:cpus]),
Fields::Field.new(label: _('Memory'), path: [:memory_mb]),
Fields::Field.new(label: _('Power Status'), path: [:power_state]),
Fields::Field.new(label: _('Host Name'), path: [:hostname]),
Fields::Field.new(label: _('Connection Status'), path: [:connection_status]),
Fields::Field.new(label: _('Hardware Version'), path: [:hardware_version]),
Fields::Field.new(label: _('Path'), path: [:path]),
Fields::Field.new(label: _('Operating System'), path: [:operatingsystem]),
Fields::Field.new(label: _('Mac'), path: [:mac]),
Fields::List.new(label: _('Boot order'), path: [:boot_order])
]
end

Expand Down
Loading