From 93af270bb0de182d2636ae900d0add487d2f95f0 Mon Sep 17 00:00:00 2001
From: Tina Fitzgerald <tfitzger@redhat.com>
Date: Mon, 1 May 2017 15:58:55 -0400
Subject: [PATCH] Reverting previous changes to add notification to finish
 retirement. Since not all objects have user/tenant information, we're going
 to create a content PR to add notifications to Automate methods where that
 information is available.

https://bugzilla.redhat.com/show_bug.cgi?id=1446466
---
 app/models/mixins/retirement_mixin.rb                         | 1 -
 spec/models/orchestration_stack/retirement_management_spec.rb | 1 -
 spec/models/service/retirement_management_spec.rb             | 1 -
 spec/models/vm/retirement_management_spec.rb                  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app/models/mixins/retirement_mixin.rb b/app/models/mixins/retirement_mixin.rb
index 771d4c98847..e8e27dacbc7 100644
--- a/app/models/mixins/retirement_mixin.rb
+++ b/app/models/mixins/retirement_mixin.rb
@@ -137,7 +137,6 @@ def finish_retirement
     $log.info("Calling audit event for: #{message} ")
     raise_audit_event(retired_event_name, message)
     $log.info("Called audit event for: #{message} ")
-    Notification.create(:type => retired_event_name, :subject => self)
   end
 
   def start_retirement
diff --git a/spec/models/orchestration_stack/retirement_management_spec.rb b/spec/models/orchestration_stack/retirement_management_spec.rb
index 62dd5101974..ecf3bd94af1 100644
--- a/spec/models/orchestration_stack/retirement_management_spec.rb
+++ b/spec/models/orchestration_stack/retirement_management_spec.rb
@@ -72,7 +72,6 @@
   end
 
   it "#finish_retirement" do
-    expect(Notification).to receive(:create)
     expect(@stack.retirement_state).to be_nil
     @stack.finish_retirement
     @stack.reload
diff --git a/spec/models/service/retirement_management_spec.rb b/spec/models/service/retirement_management_spec.rb
index 96620e856d6..281985571f2 100644
--- a/spec/models/service/retirement_management_spec.rb
+++ b/spec/models/service/retirement_management_spec.rb
@@ -102,7 +102,6 @@
 
   it "#finish_retirement" do
     expect(@service.retirement_state).to be_nil
-    expect(Notification).to receive(:create)
     @service.finish_retirement
     @service.reload
     expect(@service.retired).to be_truthy
diff --git a/spec/models/vm/retirement_management_spec.rb b/spec/models/vm/retirement_management_spec.rb
index 685bfe2edcc..a00c6a68b93 100644
--- a/spec/models/vm/retirement_management_spec.rb
+++ b/spec/models/vm/retirement_management_spec.rb
@@ -70,7 +70,6 @@
 
   it "#finish_retirement" do
     expect(@vm.retirement_state).to be_nil
-    expect(Notification).to receive(:create)
     @vm.finish_retirement
     @vm.reload