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

Jump to bottom

Use task queue for CRUD operations on auth key pair #136

Merged
merged 1 commit into from Mar 6, 2017
Merged

Use task queue for CRUD operations on auth key pair #136

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 30 additions & 16 deletions app/controllers/auth_key_pair_cloud_controller.rb
View file
Open in desktop
Expand Up @@ -112,21 +112,14 @@ def create
ext_management_system = find_by_id_filtered(ManageIQ::Providers::CloudManager, options[:ems_id])
kls = kls.class_by_ems(ext_management_system)
if kls.is_available?(:create_key_pair, ext_management_system, options)
begin
kls.create_key_pair(ext_management_system, options)
add_flash(_("Creating %{model} %{name}") % {
:model => ui_lookup(:table => 'auth_key_pair_cloud'),
:name => options[:name]})
rescue => ex
add_flash(_("Unable to create %{model} %{name}. %{error}") % {
:model => ui_lookup(:table => 'auth_key_pair_cloud'),
:name => options[:name],
:error => get_error_message_from_fog(ex.to_s)}, :error)
task_id = kls.create_key_pair_queue(session[:userid], ext_management_system, options)

if task_id.kind_of?(Integer)
initiate_wait_for_task(:task_id => task_id, :action => "create_finished")
else
add_flash(_("Key Pair creation failed: Task start failed"), :error)
javascript_flash(:spinner_off => true)
end
@breadcrumbs.pop if @breadcrumbs
session[:edit] = nil
session[:flash_msgs] = @flash_array.dup if @flash_array
javascript_redirect :action => "show_list"
else
@in_a_form = true
add_flash(kls.is_available_now_error_message(:create_key_pair, ext_management_system, kls))
Expand All @@ -149,6 +142,28 @@ def create
end
end

def create_finished
task_id = session[:async][:params][:task_id]
key_pair_name = session[:async][:params][:name]
task = MiqTask.find(task_id)
if MiqTask.status_ok?(task.status)
add_flash(_("Key Pair \"%{name}\" created") % {
:name => key_pair_name
})
else
add_flash(_("Unable to create Key Pair \"%{name}\": %{details}") % {
:name => key_pair_name,
:details => task.message
}, :error)
end

@breadcrumbs.pop if @breadcrumbs
session[:edit] = nil
session[:flash_msgs] = @flash_array.dup if @flash_array

javascript_redirect :action => "show_list"
end

# delete selected auth key pairs
def delete_auth_key_pairs
assert_privileges("auth_key_pair_cloud_delete")
Expand Down Expand Up @@ -205,8 +220,7 @@ def process_deletions(key_pairs)
:userid => session[:userid]
}
AuditEvent.success(audit)
kp.delete_key_pair
kp.destroy
kp.delete_key_pair_queue(session[:userid])
end
add_flash(n_("Delete initiated for %{number} Key Pair",
"Delete initiated for %{number} Key Pairs", key_pairs.length) % {:number => key_pairs.length})
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
View file
Open in desktop
Expand Up @@ -152,6 +152,7 @@
show_list
tagging_edit
tag_edit_form_field_changed
wait_for_task
) + adv_search_post + compare_post + exp_post + save_post
},

Expand Down