Automate Provisioned Notifications - Use Automate notifications instead of event notifications.

[tinaafitz]

Renamed provisioned notification_types and add notification in task_finished common method.

Notifications are automatically generated for several events, including the vm_provisioned and service_provisioned events.
The event provisioned notifications have a few issues:

• Events are raised when the service/vm is provisioned, not when the provisioning state machine has completed. This could result in a "provisioned successfully" notification on a failed provision if a post provision step were to fail.
• The service provisioned event is raised multiple times which causes duplicate service provisioned notifications.
• The timing also causes the notifications to be out of sync.

Renamed the notification_types for event generated notifications and added the provisioned successfully notification to the common task_finished method.

https://bugzilla.redhat.com/show_bug.cgi?id=1389312
before:

after:

[tinaafitz]

@mkanoor Please review.

[miq-bot]

<pr_mergeability_checker />This pull request is not mergeable. Please rebase and repush.

[tinaafitz]

@billfitzgerald0120 Please review.

[tinaafitz]

@gmcculloug @mkanoor Modified notification to use predefined type and subject. Please review.

[mkanoor]

@tinaafitz when provisioning a service with multiple vms will there be multiple notifications be created by this code?

[tinaafitz]

@mkanoor Yes, there will be one notification for every VM provisioned in a service.

[billfitzgerald0120]

@tinaafitz
I tested this and got the new notifications.
Looks Good 👍

[gmcculloug]

Use the factory to create a NotificationType instance and move the call into the single test that needs it instead of doing a full seeding.

[gmcculloug]

This method can be removed.

[gmcculloug]

Create the Factory here using the type value as the NotificationType name.

notification_type = FactoryGirl.create(:notification_type, :name =>"automate_vm_provisioned")

[gmcculloug]

Can this be a check that Notification.count is 0?

[gmcculloug]

Use expect(Notification.find_by(:notification_type => notification_type)).not_to be_nil

This completely remove the need for the notification_exists method.

[gmcculloug]

@gtanzillo @isimluk Note: These are being renamed so they do not generate notifications from the events. We need more control over when to rise the notification.

[tinaafitz]

@gmcculloug Changes made.

[miq-bot]

Checked commit tinaafitz@89ddb9c with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
4 files checked, 1 offense detected

db/fixtures/ae_datastore/ManageIQ/System/CommonMethods/StateMachineMethods.class/methods/task_finished.rb

• ❕ - Line 12, Col 121 - Metrics/LineLength - Line is too long. [128/120]

[chessbyte]

@simaishi Need Euwe BZ for https://bugzilla.redhat.com/show_bug.cgi?id=1389312

[chessbyte]

Euwe Backport conflict:

$ git cherry-pick -e -x -m 1 638f4d7  
error: could not apply 638f4d7... Merge pull request #12424 from tinaafitz/notification_provisioned
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

$ git status
On branch euwe
Your branch is up-to-date with 'upstream/euwe'.
You are currently cherry-picking commit 638f4d7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

    modified:   db/fixtures/ae_datastore/ManageIQ/System/CommonMethods/StateMachineMethods.class/__methods__/task_finished.rb
    modified:   db/fixtures/notification_types.yml
    modified:   spec/automation/unit/method_validation/task_finished_spec.rb
    modified:   spec/models/notification_spec.rb

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   spec/lib/miq_automation_engine/miq_ae_service_spec.rb

$ git diff

diff --cc spec/lib/miq_automation_engine/miq_ae_service_spec.rb
index 1a3b93d,e4ea8e2..0000000
--- a/spec/lib/miq_automation_engine/miq_ae_service_spec.rb
+++ b/spec/lib/miq_automation_engine/miq_ae_service_spec.rb
@@@ -169,9 -173,7 +169,13 @@@ module MiqAeServiceSpe
          end

          it "invalid subject" do
++<<<<<<< HEAD
 +          allow(workspace).to receive(:persist_state_hash).and_return({})
 +          allow(workspace).to receive(:ae_user).and_return(user)
 +          expect { miq_ae_service.create_notification!(:type => :vm_provisioned, :subject => 'fred') }
++=======
+           expect { miq_ae_service.create_notification!(:type => :vm_retired, :subject => 'fred') }
++>>>>>>> 638f4d7... Merge pull request #12424 from tinaafitz/notification_provisioned
              .to raise_error(ArgumentError, "Subject must be a valid Active Record object")
          end

@@@ -211,9 -206,7 +215,13 @@@
          end

          it "invalid subject" do
++<<<<<<< HEAD
 +          allow(workspace).to receive(:persist_state_hash).and_return({})
 +          allow(workspace).to receive(:ae_user).and_return(user)
 +          expect { miq_ae_service.create_notification(:type => :vm_provisioned, :subject => 'fred') }
++=======
+           expect { miq_ae_service.create_notification(:type => :vm_retired, :subject => 'fred') }
++>>>>>>> 638f4d7... Merge pull request #12424 from tinaafitz/notification_provisioned
              .not_to raise_error
          end

[simaishi]

Euwe BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1397076

[gmcculloug]

Refactored tests in PR #12368 will resolve merge conflicts.

[chessbyte]

Euwe Backport details:

$ git log -1
commit c636534e682a2690e0aed4ad777ec30aa4f1c14a
Author: Greg McCullough <gmccullo@redhat.com>
Date:   Sat Nov 19 08:57:08 2016 -0500

    Merge pull request #12424 from tinaafitz/notification_provisioned
    
    Automate Provisioned Notifications - Use Automate notifications instead of event notifications.
    (cherry picked from commit 638f4d79956b8b80b540146f203d716e8df5955b)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1397076