Add notifications around security_group_create using the mixin

ManageIQ · Aug 15, 2018 · 9618637 · 9618637
1 parent 6581a32
commit 9618637
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/app/models/manageiq/providers/amazon/network_manager.rb b/app/models/manageiq/providers/amazon/network_manager.rb
@@ -15,6 +15,7 @@ class ManageIQ::Providers::Amazon::NetworkManager < ManageIQ::Providers::Network
   require_nested :SecurityGroup
 
   include ManageIQ::Providers::Amazon::ManagerMixin
+  include NotificationMixin
 
   # Auth and endpoints delegations, editing of this type of manager must be disabled
   delegate :authentication_check,

diff --git a/app/models/manageiq/providers/amazon/network_manager/security_group.rb b/app/models/manageiq/providers/amazon/network_manager/security_group.rb
@@ -6,17 +6,25 @@ def self.display_name(number = 1)
   end
 
   def self.raw_create_security_group(ext_management_system, options, user_id)
-    Ansible::Runner.run(ext_management_system.parent_manager.ansible_env_vars,
-                        {
-                          :vpc_id                      => options["vpc_id"],
-                          :security_group_name         => options["security_group_name"],
-                          :security_group_description  => options["security_group_description"],
-                          :security_group_rules        => options["security_group_rules"],
-                          :security_group_rules_egress => options["security_group_rules_egress"],
-                        },
-                        ext_management_system.parent_manager.ansible_root.join("create_security_group.yml"))
-  rescue => e
-    _log.error("security_group=[#{options[:name]}], error: #{e}")
-    raise MiqException::MiqSecurityGroupCreateError, e.message, e.backtrace
+    ext_management_system.notify_task_start(_('My awesome task is starting.'), user_id)
+    begin
+      task = Ansible::Runner.run(ext_management_system.parent_manager.ansible_env_vars,
+                          {
+                            :vpc_id                      => options["vpc_id"],
+                            :security_group_name         => options["security_group_name"],
+                            :security_group_description  => options["security_group_description"],
+                            :security_group_rules        => options["security_group_rules"],
+                            :security_group_rules_egress => options["security_group_rules_egress"],
+                          },
+                          ext_management_system.parent_manager.ansible_root.join("create_security_group.yml"))
+    rescue => e
+      _log.error("security_group=[#{options[:name]}], error: #{e}")
+      ext_management_system.notify_task_fail(_('My awesome task failed.'), user_id)
+      raise MiqException::MiqSecurityGroupCreateError, e.message, e.backtrace
+    else
+      ext_management_system.notify_task_finish(_('My awesome task finished.'), user_id)
+    end
+
+    task
   end
 end