Project

General

Profile

« Previous | Next » 

Revision ddce3dc1

Added by Amos Benari about 10 years ago

fixes #4612 show friendly CR names, fix typo in oVirt name

View differences:

app/helpers/compute_resources_helper.rb
rescue
[]
end
def list_providers
ComputeResource.providers.map do |provider|
[ComputeResource.provider_class(provider).constantize.provider_friendly_name, provider]
end
end
end
app/models/compute_resource.rb
"#{name} (#{provider_friendly_name})"
end
# Override this method to specify provider name
def self.provider_friendly_name
self.name.split('::').last()
end
def provider_friendly_name
provider
self.class.provider_friendly_name
end
def image_param_name
......
end
def console uuid = nil
raise ::Foreman::Exception.new(N_("%s console is not supported at this time"), provider)
raise ::Foreman::Exception.new(N_("%s console is not supported at this time"), provider_friendly_name)
end
# by default, our compute providers do not support updating an existing instance
app/models/compute_resources/foreman/model/gce.rb
errors[:base] << e.message
end
def provider_friendly_name
def self.provider_friendly_name
"Google"
end
app/models/compute_resources/foreman/model/openstack.rb
client.flavors.get(flavor_ref).try(:name)
end
def provider_friendly_name
def self.provider_friendly_name
"OpenStack"
end
app/models/compute_resources/foreman/model/ovirt.rb
Host.authorized(:view_hosts, Host).where(:mac => vm.mac).first
end
def provider_friendly_name
def self.provider_friendly_name
"oVirt"
end
app/models/compute_resources/foreman/model/rackspace.rb
false
end
def provider_friendly_name
def self.provider_friendly_name
"Rackspace"
end
app/models/compute_resources/foreman/model/vmware.rb
Host.authorized(:view_hosts, Host).where(:mac => vm.mac).first
end
def provider_friendly_name
def self.provider_friendly_name
"VMWare"
end
app/views/about/index.html.erb
</tr>
<% ComputeResource.supported_providers.each do |provider,klass| %>
<tr>
<td><%= provider %></td>
<td><%= klass.constantize.provider_friendly_name %></td>
<% if ComputeResource.providers.include?(provider) %>
<td><div class="label label-success"><%= _('Installed') %></div></td>
<% else %>
app/views/compute_resources/_form.html.erb
<% end %>
<%= text_f f, :name %>
<%= f.hidden_field(:provider, :id => '') if f.object.uuid.present? %>
<%= selectable_f f, :provider, ComputeResource.providers, { :include_blank => _("Choose a provider")},
<%= selectable_f f, :provider, list_providers, { :include_blank => _("Choose a provider")},
{:label => _("Provider"), :disabled=> f.object.uuid.present?, :'data-url'=> provider_selected_compute_resources_path, :onchange => 'providerSelected(this);'} %>
<%= textarea_f f, :description, :rows => 3 %>
<div id='compute_connection'>
app/views/compute_resources/show.html.erb
<tr>
<td><%= _("Provider") %></td>
<td><%= @compute_resource.provider %></td>
<td><%= @compute_resource.provider_friendly_name %></td>
</tr>
<% unless @compute_resource.description.empty? %>

Also available in: Unified diff