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

Refs #28135 - Remove URL field from GCE info #466

Merged
merged 1 commit into from
Dec 22, 2019
Merged
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
1 change: 0 additions & 1 deletion lib/hammer_cli_foreman/compute_resource.rb
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ class InfoCommand < HammerCLIForeman::InfoCommand
include ProviderNameLegacy

output ListCommand.output_definition do
field :url, _("Url")
field :description, _("Description")
field :user, _("User")
HammerCLIForeman::References.taxonomies(self)
6 changes: 5 additions & 1 deletion lib/hammer_cli_foreman/compute_resource/base.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,11 @@ def interface_attributes; []; end # all attributes must start with compute_
def volume_attributes; []; end
def interfaces_attrs_name; 'interfaces_attributes'; end
def host_attributes; []; end
def provider_specific_fields; []; end
def provider_specific_fields
[
Fields::Field.new(label: _('Url'), path: [:url])
]
end
def mandatory_resource_options; %i[name provider]; end
end
end
2 changes: 1 addition & 1 deletion lib/hammer_cli_foreman/compute_resource/ec2.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ def compute_attributes
end

def provider_specific_fields
[
super + [
Fields::Field.new(:label => _('Region'), :path => [:region])
]
end
2 changes: 1 addition & 1 deletion lib/hammer_cli_foreman/compute_resource/openstack.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ def compute_attributes
end

def provider_specific_fields
[
super + [
Fields::Field.new(:label => _('Tenant'), :path => [:tenant]),
Fields::Field.new(:label => _('Project domain name'), :path => [:project_domain_name]),
Fields::Field.new(:label => _('Project domain ID'), :path => [:project_domain_id])
2 changes: 1 addition & 1 deletion lib/hammer_cli_foreman/compute_resource/ovirt.rb
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ def volume_attributes
end

def provider_specific_fields
[
super + [
Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter])
]
end
2 changes: 1 addition & 1 deletion lib/hammer_cli_foreman/compute_resource/rackspace.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ def compute_attributes
end

def provider_specific_fields
[
super + [
Fields::Field.new(:label => _('Region'), :path => [:region])
]
end
2 changes: 1 addition & 1 deletion lib/hammer_cli_foreman/compute_resource/vmware.rb
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ def interface_attributes
end

def provider_specific_fields
[
super + [
Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
Fields::Field.new(:label => _('Server'), :path => [:server])
]